mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
06c4a9c2ae
To facilitate moving connector creation to display drivers, decouple the drm_connector from drm_panel. This patch adds a connector argument to drm_panel_get_modes(). All users of drm_panel_get_modes() already had the connector available, so updating users was trivial. With this patch drm_panel no longer keeps a reference to the drm_connector. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Andrzej Hajda <a.hajda@samsung.com> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: Jonas Karlman <jonas@kwiboo.se> Cc: Jernej Skrabec <jernej.skrabec@siol.net> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Inki Dae <inki.dae@samsung.com> Cc: Joonyoung Shim <jy0922.shim@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Kukjin Kim <kgene@kernel.org> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Stefan Agner <stefan@agner.ch> Cc: Alison Wang <alison.wang@nxp.com> Cc: Philipp Zabel <p.zabel@pengutronix.de> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: NXP Linux Team <linux-imx@nxp.com> Cc: CK Hu <ck.hu@mediatek.com> Cc: Matthias Brugger <matthias.bgg@gmail.com> Cc: Marek Vasut <marex@denx.de> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Cc: Sandy Huang <hjc@rock-chips.com> Cc: "Heiko Stübner" <heiko@sntech.de> Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> Cc: Vincent Abriou <vincent.abriou@st.com> Cc: Chen-Yu Tsai <wens@csie.org> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: Torsten Duwe <duwe@lst.de> Cc: Vasily Khoruzhick <anarsoul@gmail.com> Cc: Icenowy Zheng <icenowy@aosc.io> Cc: Sean Paul <seanpaul@chromium.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Boris Brezillon <boris.brezillon@collabora.com> Cc: Hariprasad Kelam <hariprasad.kelam@gmail.com> Cc: Alexios Zavras <alexios.zavras@intel.com> Cc: Brian Masney <masneyb@onstation.org> Cc: Rob Clark <robdclark@chromium.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Allison Randal <allison@lohutok.net> Cc: Shayenne Moura <shayenneluzmoura@gmail.com> Cc: Abhinav Kumar <abhinavk@codeaurora.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-mediatek@lists.infradead.org Cc: linux-renesas-soc@vger.kernel.org Cc: linux-rockchip@lists.infradead.org Cc: linux-tegra@vger.kernel.org Link: https://patchwork.freedesktop.org/patch/msgid/20191207140353.23967-7-sam@ravnborg.org
99 lines
2.6 KiB
C
99 lines
2.6 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright (C) 2016 Marek Vasut <marex@denx.de>
|
|
*/
|
|
|
|
#include <linux/of_graph.h>
|
|
|
|
#include <drm/drm_atomic.h>
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_crtc.h>
|
|
#include <drm/drm_fb_cma_helper.h>
|
|
#include <drm/drm_gem_cma_helper.h>
|
|
#include <drm/drm_of.h>
|
|
#include <drm/drm_panel.h>
|
|
#include <drm/drm_plane_helper.h>
|
|
#include <drm/drm_probe_helper.h>
|
|
#include <drm/drm_simple_kms_helper.h>
|
|
|
|
#include "mxsfb_drv.h"
|
|
|
|
static struct mxsfb_drm_private *
|
|
drm_connector_to_mxsfb_drm_private(struct drm_connector *connector)
|
|
{
|
|
return container_of(connector, struct mxsfb_drm_private,
|
|
panel_connector);
|
|
}
|
|
|
|
static int mxsfb_panel_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct mxsfb_drm_private *mxsfb =
|
|
drm_connector_to_mxsfb_drm_private(connector);
|
|
|
|
if (mxsfb->panel)
|
|
return drm_panel_get_modes(mxsfb->panel, connector);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct
|
|
drm_connector_helper_funcs mxsfb_panel_connector_helper_funcs = {
|
|
.get_modes = mxsfb_panel_get_modes,
|
|
};
|
|
|
|
static enum drm_connector_status
|
|
mxsfb_panel_connector_detect(struct drm_connector *connector, bool force)
|
|
{
|
|
struct mxsfb_drm_private *mxsfb =
|
|
drm_connector_to_mxsfb_drm_private(connector);
|
|
|
|
if (mxsfb->panel)
|
|
return connector_status_connected;
|
|
|
|
return connector_status_disconnected;
|
|
}
|
|
|
|
static void mxsfb_panel_connector_destroy(struct drm_connector *connector)
|
|
{
|
|
struct mxsfb_drm_private *mxsfb =
|
|
drm_connector_to_mxsfb_drm_private(connector);
|
|
|
|
if (mxsfb->panel)
|
|
drm_panel_detach(mxsfb->panel);
|
|
|
|
drm_connector_unregister(connector);
|
|
drm_connector_cleanup(connector);
|
|
}
|
|
|
|
static const struct drm_connector_funcs mxsfb_panel_connector_funcs = {
|
|
.detect = mxsfb_panel_connector_detect,
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.destroy = mxsfb_panel_connector_destroy,
|
|
.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 mxsfb_create_output(struct drm_device *drm)
|
|
{
|
|
struct mxsfb_drm_private *mxsfb = drm->dev_private;
|
|
int ret;
|
|
|
|
ret = drm_of_find_panel_or_bridge(drm->dev->of_node, 0, 0,
|
|
&mxsfb->panel, &mxsfb->bridge);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (mxsfb->panel) {
|
|
mxsfb->connector = &mxsfb->panel_connector;
|
|
mxsfb->connector->dpms = DRM_MODE_DPMS_OFF;
|
|
mxsfb->connector->polled = 0;
|
|
drm_connector_helper_add(mxsfb->connector,
|
|
&mxsfb_panel_connector_helper_funcs);
|
|
ret = drm_connector_init(drm, mxsfb->connector,
|
|
&mxsfb_panel_connector_funcs,
|
|
DRM_MODE_CONNECTOR_Unknown);
|
|
}
|
|
|
|
return ret;
|
|
}
|