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
156 lines
3.9 KiB
C
156 lines
3.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright 2015 Freescale Semiconductor, Inc.
|
|
*
|
|
* Freescale DCU drm device driver
|
|
*/
|
|
|
|
#include <linux/backlight.h>
|
|
#include <linux/of_graph.h>
|
|
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_bridge.h>
|
|
#include <drm/drm_of.h>
|
|
#include <drm/drm_panel.h>
|
|
#include <drm/drm_probe_helper.h>
|
|
|
|
#include "fsl_dcu_drm_drv.h"
|
|
#include "fsl_tcon.h"
|
|
|
|
static void fsl_dcu_drm_encoder_destroy(struct drm_encoder *encoder)
|
|
{
|
|
drm_encoder_cleanup(encoder);
|
|
}
|
|
|
|
static const struct drm_encoder_funcs encoder_funcs = {
|
|
.destroy = fsl_dcu_drm_encoder_destroy,
|
|
};
|
|
|
|
int fsl_dcu_drm_encoder_create(struct fsl_dcu_drm_device *fsl_dev,
|
|
struct drm_crtc *crtc)
|
|
{
|
|
struct drm_encoder *encoder = &fsl_dev->encoder;
|
|
int ret;
|
|
|
|
encoder->possible_crtcs = 1;
|
|
|
|
/* Use bypass mode for parallel RGB/LVDS encoder */
|
|
if (fsl_dev->tcon)
|
|
fsl_tcon_bypass_enable(fsl_dev->tcon);
|
|
|
|
ret = drm_encoder_init(fsl_dev->drm, encoder, &encoder_funcs,
|
|
DRM_MODE_ENCODER_LVDS, NULL);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void fsl_dcu_drm_connector_destroy(struct drm_connector *connector)
|
|
{
|
|
struct fsl_dcu_drm_connector *fsl_con = to_fsl_dcu_connector(connector);
|
|
|
|
drm_connector_unregister(connector);
|
|
drm_panel_detach(fsl_con->panel);
|
|
drm_connector_cleanup(connector);
|
|
}
|
|
|
|
static const struct drm_connector_funcs fsl_dcu_drm_connector_funcs = {
|
|
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
|
|
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
|
|
.destroy = fsl_dcu_drm_connector_destroy,
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.reset = drm_atomic_helper_connector_reset,
|
|
};
|
|
|
|
static int fsl_dcu_drm_connector_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct fsl_dcu_drm_connector *fsl_connector;
|
|
|
|
fsl_connector = to_fsl_dcu_connector(connector);
|
|
return drm_panel_get_modes(fsl_connector->panel, connector);
|
|
}
|
|
|
|
static int fsl_dcu_drm_connector_mode_valid(struct drm_connector *connector,
|
|
struct drm_display_mode *mode)
|
|
{
|
|
if (mode->hdisplay & 0xf)
|
|
return MODE_ERROR;
|
|
|
|
return MODE_OK;
|
|
}
|
|
|
|
static const struct drm_connector_helper_funcs connector_helper_funcs = {
|
|
.get_modes = fsl_dcu_drm_connector_get_modes,
|
|
.mode_valid = fsl_dcu_drm_connector_mode_valid,
|
|
};
|
|
|
|
static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,
|
|
struct drm_panel *panel)
|
|
{
|
|
struct drm_encoder *encoder = &fsl_dev->encoder;
|
|
struct drm_connector *connector = &fsl_dev->connector.base;
|
|
int ret;
|
|
|
|
fsl_dev->connector.encoder = encoder;
|
|
|
|
ret = drm_connector_init(fsl_dev->drm, connector,
|
|
&fsl_dcu_drm_connector_funcs,
|
|
DRM_MODE_CONNECTOR_LVDS);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
drm_connector_helper_add(connector, &connector_helper_funcs);
|
|
ret = drm_connector_register(connector);
|
|
if (ret < 0)
|
|
goto err_cleanup;
|
|
|
|
ret = drm_connector_attach_encoder(connector, encoder);
|
|
if (ret < 0)
|
|
goto err_sysfs;
|
|
|
|
ret = drm_panel_attach(panel, connector);
|
|
if (ret) {
|
|
dev_err(fsl_dev->dev, "failed to attach panel\n");
|
|
goto err_sysfs;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_sysfs:
|
|
drm_connector_unregister(connector);
|
|
err_cleanup:
|
|
drm_connector_cleanup(connector);
|
|
return ret;
|
|
}
|
|
|
|
int fsl_dcu_create_outputs(struct fsl_dcu_drm_device *fsl_dev)
|
|
{
|
|
struct device_node *panel_node;
|
|
struct drm_panel *panel;
|
|
struct drm_bridge *bridge;
|
|
int ret;
|
|
|
|
/* This is for backward compatibility */
|
|
panel_node = of_parse_phandle(fsl_dev->np, "fsl,panel", 0);
|
|
if (panel_node) {
|
|
fsl_dev->connector.panel = of_drm_find_panel(panel_node);
|
|
of_node_put(panel_node);
|
|
if (IS_ERR(fsl_dev->connector.panel))
|
|
return PTR_ERR(fsl_dev->connector.panel);
|
|
|
|
return fsl_dcu_attach_panel(fsl_dev, fsl_dev->connector.panel);
|
|
}
|
|
|
|
ret = drm_of_find_panel_or_bridge(fsl_dev->np, 0, 0, &panel, &bridge);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (panel) {
|
|
fsl_dev->connector.panel = panel;
|
|
return fsl_dcu_attach_panel(fsl_dev, panel);
|
|
}
|
|
|
|
return drm_bridge_attach(&fsl_dev->encoder, bridge, NULL);
|
|
}
|