![Daniel Vetter](/assets/img/avatar_default.png)
Having the probe helper stuff (which pretty much everyone needs) in the drm_crtc_helper.h file (which atomic drivers should never need) is confusing. Split them out. To make sure I actually achieved the goal here I went through all drivers. And indeed, all atomic drivers are now free of drm_crtc_helper.h includes. v2: Make it compile. There was so much compile fail on arm drivers that I figured I'll better not include any of the acks on v1. v3: Massive rebase because i915 has lost a lot of drmP.h includes, but not all: Through drm_crtc_helper.h > drm_modeset_helper.h -> drmP.h there was still one, which this patch largely removes. Which means rolling out lots more includes all over. This will also conflict with ongoing drmP.h cleanup by others I expect. v3: Rebase on top of atomic bochs. v4: Review from Laurent for bridge/rcar/omap/shmob/core bits: - (re)move some of the added includes, use the better include files in other places (all suggested from Laurent adopted unchanged). - sort alphabetically v5: Actually try to sort them, and while at it, sort all the ones I touch. v6: Rebase onto i915 changes. v7: Rebase once more. Acked-by: Harry Wentland <harry.wentland@amd.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Acked-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> Acked-by: CK Hu <ck.hu@mediatek.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Liviu Dudau <liviu.dudau@arm.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: linux-arm-kernel@lists.infradead.org Cc: virtualization@lists.linux-foundation.org Cc: etnaviv@lists.freedesktop.org Cc: linux-samsung-soc@vger.kernel.org Cc: intel-gfx@lists.freedesktop.org Cc: linux-mediatek@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Cc: spice-devel@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org Cc: linux-rockchip@lists.infradead.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-tegra@vger.kernel.org Cc: xen-devel@lists.xen.org Link: https://patchwork.freedesktop.org/patch/msgid/20190117210334.13234-1-daniel.vetter@ffwll.ch
115 lines
3.1 KiB
C
115 lines
3.1 KiB
C
// SPDX-License-Identifier: GPL-2.0 OR MIT
|
|
|
|
/*
|
|
* Xen para-virtual DRM device
|
|
*
|
|
* Copyright (C) 2016-2018 EPAM Systems Inc.
|
|
*
|
|
* Author: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
|
|
*/
|
|
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_probe_helper.h>
|
|
|
|
#include <video/videomode.h>
|
|
|
|
#include "xen_drm_front.h"
|
|
#include "xen_drm_front_conn.h"
|
|
#include "xen_drm_front_kms.h"
|
|
|
|
static struct xen_drm_front_drm_pipeline *
|
|
to_xen_drm_pipeline(struct drm_connector *connector)
|
|
{
|
|
return container_of(connector, struct xen_drm_front_drm_pipeline, conn);
|
|
}
|
|
|
|
static const u32 plane_formats[] = {
|
|
DRM_FORMAT_RGB565,
|
|
DRM_FORMAT_RGB888,
|
|
DRM_FORMAT_XRGB8888,
|
|
DRM_FORMAT_ARGB8888,
|
|
DRM_FORMAT_XRGB4444,
|
|
DRM_FORMAT_ARGB4444,
|
|
DRM_FORMAT_XRGB1555,
|
|
DRM_FORMAT_ARGB1555,
|
|
};
|
|
|
|
const u32 *xen_drm_front_conn_get_formats(int *format_count)
|
|
{
|
|
*format_count = ARRAY_SIZE(plane_formats);
|
|
return plane_formats;
|
|
}
|
|
|
|
static int connector_detect(struct drm_connector *connector,
|
|
struct drm_modeset_acquire_ctx *ctx,
|
|
bool force)
|
|
{
|
|
struct xen_drm_front_drm_pipeline *pipeline =
|
|
to_xen_drm_pipeline(connector);
|
|
|
|
if (drm_dev_is_unplugged(connector->dev))
|
|
pipeline->conn_connected = false;
|
|
|
|
return pipeline->conn_connected ? connector_status_connected :
|
|
connector_status_disconnected;
|
|
}
|
|
|
|
#define XEN_DRM_CRTC_VREFRESH_HZ 60
|
|
|
|
static int connector_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct xen_drm_front_drm_pipeline *pipeline =
|
|
to_xen_drm_pipeline(connector);
|
|
struct drm_display_mode *mode;
|
|
struct videomode videomode;
|
|
int width, height;
|
|
|
|
mode = drm_mode_create(connector->dev);
|
|
if (!mode)
|
|
return 0;
|
|
|
|
memset(&videomode, 0, sizeof(videomode));
|
|
videomode.hactive = pipeline->width;
|
|
videomode.vactive = pipeline->height;
|
|
width = videomode.hactive + videomode.hfront_porch +
|
|
videomode.hback_porch + videomode.hsync_len;
|
|
height = videomode.vactive + videomode.vfront_porch +
|
|
videomode.vback_porch + videomode.vsync_len;
|
|
videomode.pixelclock = width * height * XEN_DRM_CRTC_VREFRESH_HZ;
|
|
mode->type = DRM_MODE_TYPE_PREFERRED | DRM_MODE_TYPE_DRIVER;
|
|
|
|
drm_display_mode_from_videomode(&videomode, mode);
|
|
drm_mode_probed_add(connector, mode);
|
|
return 1;
|
|
}
|
|
|
|
static const struct drm_connector_helper_funcs connector_helper_funcs = {
|
|
.get_modes = connector_get_modes,
|
|
.detect_ctx = connector_detect,
|
|
};
|
|
|
|
static const struct drm_connector_funcs connector_funcs = {
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.destroy = drm_connector_cleanup,
|
|
.reset = drm_atomic_helper_connector_reset,
|
|
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
|
};
|
|
|
|
int xen_drm_front_conn_init(struct xen_drm_front_drm_info *drm_info,
|
|
struct drm_connector *connector)
|
|
{
|
|
struct xen_drm_front_drm_pipeline *pipeline =
|
|
to_xen_drm_pipeline(connector);
|
|
|
|
drm_connector_helper_add(connector, &connector_helper_funcs);
|
|
|
|
pipeline->conn_connected = true;
|
|
|
|
connector->polled = DRM_CONNECTOR_POLL_CONNECT |
|
|
DRM_CONNECTOR_POLL_DISCONNECT;
|
|
|
|
return drm_connector_init(drm_info->drm_dev, connector,
|
|
&connector_funcs, DRM_MODE_CONNECTOR_VIRTUAL);
|
|
}
|