forked from Minki/linux
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
174 lines
4.2 KiB
C
174 lines
4.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2017 Free Electrons
|
|
* Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
*/
|
|
|
|
#include <linux/clk.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_print.h>
|
|
#include <drm/drm_probe_helper.h>
|
|
|
|
#include "sun4i_crtc.h"
|
|
#include "sun4i_tcon.h"
|
|
#include "sun4i_lvds.h"
|
|
|
|
struct sun4i_lvds {
|
|
struct drm_connector connector;
|
|
struct drm_encoder encoder;
|
|
|
|
struct drm_panel *panel;
|
|
};
|
|
|
|
static inline struct sun4i_lvds *
|
|
drm_connector_to_sun4i_lvds(struct drm_connector *connector)
|
|
{
|
|
return container_of(connector, struct sun4i_lvds,
|
|
connector);
|
|
}
|
|
|
|
static inline struct sun4i_lvds *
|
|
drm_encoder_to_sun4i_lvds(struct drm_encoder *encoder)
|
|
{
|
|
return container_of(encoder, struct sun4i_lvds,
|
|
encoder);
|
|
}
|
|
|
|
static int sun4i_lvds_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct sun4i_lvds *lvds =
|
|
drm_connector_to_sun4i_lvds(connector);
|
|
|
|
return drm_panel_get_modes(lvds->panel, connector);
|
|
}
|
|
|
|
static struct drm_connector_helper_funcs sun4i_lvds_con_helper_funcs = {
|
|
.get_modes = sun4i_lvds_get_modes,
|
|
};
|
|
|
|
static void
|
|
sun4i_lvds_connector_destroy(struct drm_connector *connector)
|
|
{
|
|
struct sun4i_lvds *lvds = drm_connector_to_sun4i_lvds(connector);
|
|
|
|
drm_panel_detach(lvds->panel);
|
|
drm_connector_cleanup(connector);
|
|
}
|
|
|
|
static const struct drm_connector_funcs sun4i_lvds_con_funcs = {
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
.destroy = sun4i_lvds_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,
|
|
};
|
|
|
|
static void sun4i_lvds_encoder_enable(struct drm_encoder *encoder)
|
|
{
|
|
struct sun4i_lvds *lvds = drm_encoder_to_sun4i_lvds(encoder);
|
|
|
|
DRM_DEBUG_DRIVER("Enabling LVDS output\n");
|
|
|
|
if (lvds->panel) {
|
|
drm_panel_prepare(lvds->panel);
|
|
drm_panel_enable(lvds->panel);
|
|
}
|
|
}
|
|
|
|
static void sun4i_lvds_encoder_disable(struct drm_encoder *encoder)
|
|
{
|
|
struct sun4i_lvds *lvds = drm_encoder_to_sun4i_lvds(encoder);
|
|
|
|
DRM_DEBUG_DRIVER("Disabling LVDS output\n");
|
|
|
|
if (lvds->panel) {
|
|
drm_panel_disable(lvds->panel);
|
|
drm_panel_unprepare(lvds->panel);
|
|
}
|
|
}
|
|
|
|
static const struct drm_encoder_helper_funcs sun4i_lvds_enc_helper_funcs = {
|
|
.disable = sun4i_lvds_encoder_disable,
|
|
.enable = sun4i_lvds_encoder_enable,
|
|
};
|
|
|
|
static const struct drm_encoder_funcs sun4i_lvds_enc_funcs = {
|
|
.destroy = drm_encoder_cleanup,
|
|
};
|
|
|
|
int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)
|
|
{
|
|
struct drm_encoder *encoder;
|
|
struct drm_bridge *bridge;
|
|
struct sun4i_lvds *lvds;
|
|
int ret;
|
|
|
|
lvds = devm_kzalloc(drm->dev, sizeof(*lvds), GFP_KERNEL);
|
|
if (!lvds)
|
|
return -ENOMEM;
|
|
encoder = &lvds->encoder;
|
|
|
|
ret = drm_of_find_panel_or_bridge(tcon->dev->of_node, 1, 0,
|
|
&lvds->panel, &bridge);
|
|
if (ret) {
|
|
dev_info(drm->dev, "No panel or bridge found... LVDS output disabled\n");
|
|
return 0;
|
|
}
|
|
|
|
drm_encoder_helper_add(&lvds->encoder,
|
|
&sun4i_lvds_enc_helper_funcs);
|
|
ret = drm_encoder_init(drm,
|
|
&lvds->encoder,
|
|
&sun4i_lvds_enc_funcs,
|
|
DRM_MODE_ENCODER_LVDS,
|
|
NULL);
|
|
if (ret) {
|
|
dev_err(drm->dev, "Couldn't initialise the lvds encoder\n");
|
|
goto err_out;
|
|
}
|
|
|
|
/* The LVDS encoder can only work with the TCON channel 0 */
|
|
lvds->encoder.possible_crtcs = drm_crtc_mask(&tcon->crtc->crtc);
|
|
|
|
if (lvds->panel) {
|
|
drm_connector_helper_add(&lvds->connector,
|
|
&sun4i_lvds_con_helper_funcs);
|
|
ret = drm_connector_init(drm, &lvds->connector,
|
|
&sun4i_lvds_con_funcs,
|
|
DRM_MODE_CONNECTOR_LVDS);
|
|
if (ret) {
|
|
dev_err(drm->dev, "Couldn't initialise the lvds connector\n");
|
|
goto err_cleanup_connector;
|
|
}
|
|
|
|
drm_connector_attach_encoder(&lvds->connector,
|
|
&lvds->encoder);
|
|
|
|
ret = drm_panel_attach(lvds->panel, &lvds->connector);
|
|
if (ret) {
|
|
dev_err(drm->dev, "Couldn't attach our panel\n");
|
|
goto err_cleanup_connector;
|
|
}
|
|
}
|
|
|
|
if (bridge) {
|
|
ret = drm_bridge_attach(encoder, bridge, NULL);
|
|
if (ret) {
|
|
dev_err(drm->dev, "Couldn't attach our bridge\n");
|
|
goto err_cleanup_connector;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_cleanup_connector:
|
|
drm_encoder_cleanup(&lvds->encoder);
|
|
err_out:
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(sun4i_lvds_init);
|