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
184 lines
5.0 KiB
C
184 lines
5.0 KiB
C
/*
|
|
* Copyright (C) 2016 Noralf Trønnes
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_drv.h>
|
|
#include <drm/drm_gem_framebuffer_helper.h>
|
|
#include <drm/drm_modes.h>
|
|
#include <drm/drm_probe_helper.h>
|
|
#include <drm/drm_print.h>
|
|
#include <drm/tinydrm/tinydrm.h>
|
|
|
|
struct tinydrm_connector {
|
|
struct drm_connector base;
|
|
struct drm_display_mode mode;
|
|
};
|
|
|
|
static inline struct tinydrm_connector *
|
|
to_tinydrm_connector(struct drm_connector *connector)
|
|
{
|
|
return container_of(connector, struct tinydrm_connector, base);
|
|
}
|
|
|
|
static int tinydrm_connector_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct tinydrm_connector *tconn = to_tinydrm_connector(connector);
|
|
struct drm_display_mode *mode;
|
|
|
|
mode = drm_mode_duplicate(connector->dev, &tconn->mode);
|
|
if (!mode) {
|
|
DRM_ERROR("Failed to duplicate mode\n");
|
|
return 0;
|
|
}
|
|
|
|
if (mode->name[0] == '\0')
|
|
drm_mode_set_name(mode);
|
|
|
|
mode->type |= DRM_MODE_TYPE_PREFERRED;
|
|
drm_mode_probed_add(connector, mode);
|
|
|
|
if (mode->width_mm) {
|
|
connector->display_info.width_mm = mode->width_mm;
|
|
connector->display_info.height_mm = mode->height_mm;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static const struct drm_connector_helper_funcs tinydrm_connector_hfuncs = {
|
|
.get_modes = tinydrm_connector_get_modes,
|
|
};
|
|
|
|
static enum drm_connector_status
|
|
tinydrm_connector_detect(struct drm_connector *connector, bool force)
|
|
{
|
|
if (drm_dev_is_unplugged(connector->dev))
|
|
return connector_status_disconnected;
|
|
|
|
return connector->status;
|
|
}
|
|
|
|
static void tinydrm_connector_destroy(struct drm_connector *connector)
|
|
{
|
|
struct tinydrm_connector *tconn = to_tinydrm_connector(connector);
|
|
|
|
drm_connector_cleanup(connector);
|
|
kfree(tconn);
|
|
}
|
|
|
|
static const struct drm_connector_funcs tinydrm_connector_funcs = {
|
|
.reset = drm_atomic_helper_connector_reset,
|
|
.detect = tinydrm_connector_detect,
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.destroy = tinydrm_connector_destroy,
|
|
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
|
};
|
|
|
|
struct drm_connector *
|
|
tinydrm_connector_create(struct drm_device *drm,
|
|
const struct drm_display_mode *mode,
|
|
int connector_type)
|
|
{
|
|
struct tinydrm_connector *tconn;
|
|
struct drm_connector *connector;
|
|
int ret;
|
|
|
|
tconn = kzalloc(sizeof(*tconn), GFP_KERNEL);
|
|
if (!tconn)
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
drm_mode_copy(&tconn->mode, mode);
|
|
connector = &tconn->base;
|
|
|
|
drm_connector_helper_add(connector, &tinydrm_connector_hfuncs);
|
|
ret = drm_connector_init(drm, connector, &tinydrm_connector_funcs,
|
|
connector_type);
|
|
if (ret) {
|
|
kfree(tconn);
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
connector->status = connector_status_connected;
|
|
|
|
return connector;
|
|
}
|
|
|
|
static int tinydrm_rotate_mode(struct drm_display_mode *mode,
|
|
unsigned int rotation)
|
|
{
|
|
if (rotation == 0 || rotation == 180) {
|
|
return 0;
|
|
} else if (rotation == 90 || rotation == 270) {
|
|
swap(mode->hdisplay, mode->vdisplay);
|
|
swap(mode->hsync_start, mode->vsync_start);
|
|
swap(mode->hsync_end, mode->vsync_end);
|
|
swap(mode->htotal, mode->vtotal);
|
|
swap(mode->width_mm, mode->height_mm);
|
|
return 0;
|
|
} else {
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* tinydrm_display_pipe_init - Initialize display pipe
|
|
* @tdev: tinydrm device
|
|
* @funcs: Display pipe functions
|
|
* @connector_type: Connector type
|
|
* @formats: Array of supported formats (DRM_FORMAT\_\*)
|
|
* @format_count: Number of elements in @formats
|
|
* @mode: Supported mode
|
|
* @rotation: Initial @mode rotation in degrees Counter Clock Wise
|
|
*
|
|
* This function sets up a &drm_simple_display_pipe with a &drm_connector that
|
|
* has one fixed &drm_display_mode which is rotated according to @rotation.
|
|
*
|
|
* Returns:
|
|
* Zero on success, negative error code on failure.
|
|
*/
|
|
int
|
|
tinydrm_display_pipe_init(struct tinydrm_device *tdev,
|
|
const struct drm_simple_display_pipe_funcs *funcs,
|
|
int connector_type,
|
|
const uint32_t *formats,
|
|
unsigned int format_count,
|
|
const struct drm_display_mode *mode,
|
|
unsigned int rotation)
|
|
{
|
|
struct drm_device *drm = tdev->drm;
|
|
struct drm_display_mode mode_copy;
|
|
struct drm_connector *connector;
|
|
int ret;
|
|
static const uint64_t modifiers[] = {
|
|
DRM_FORMAT_MOD_LINEAR,
|
|
DRM_FORMAT_MOD_INVALID
|
|
};
|
|
|
|
drm_mode_copy(&mode_copy, mode);
|
|
ret = tinydrm_rotate_mode(&mode_copy, rotation);
|
|
if (ret) {
|
|
DRM_ERROR("Illegal rotation value %u\n", rotation);
|
|
return -EINVAL;
|
|
}
|
|
|
|
drm->mode_config.min_width = mode_copy.hdisplay;
|
|
drm->mode_config.max_width = mode_copy.hdisplay;
|
|
drm->mode_config.min_height = mode_copy.vdisplay;
|
|
drm->mode_config.max_height = mode_copy.vdisplay;
|
|
|
|
connector = tinydrm_connector_create(drm, &mode_copy, connector_type);
|
|
if (IS_ERR(connector))
|
|
return PTR_ERR(connector);
|
|
|
|
return drm_simple_display_pipe_init(drm, &tdev->pipe, funcs, formats,
|
|
format_count, modifiers, connector);
|
|
}
|
|
EXPORT_SYMBOL(tinydrm_display_pipe_init);
|