![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
178 lines
4.3 KiB
C
178 lines
4.3 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/drmP.h>
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_of.h>
|
|
#include <drm/drm_panel.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 sun4i_tcon *tcon;
|
|
};
|
|
|
|
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);
|
|
struct sun4i_tcon *tcon = lvds->tcon;
|
|
|
|
return drm_panel_get_modes(tcon->panel);
|
|
}
|
|
|
|
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);
|
|
struct sun4i_tcon *tcon = lvds->tcon;
|
|
|
|
drm_panel_detach(tcon->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);
|
|
struct sun4i_tcon *tcon = lvds->tcon;
|
|
|
|
DRM_DEBUG_DRIVER("Enabling LVDS output\n");
|
|
|
|
if (tcon->panel) {
|
|
drm_panel_prepare(tcon->panel);
|
|
drm_panel_enable(tcon->panel);
|
|
}
|
|
}
|
|
|
|
static void sun4i_lvds_encoder_disable(struct drm_encoder *encoder)
|
|
{
|
|
struct sun4i_lvds *lvds = drm_encoder_to_sun4i_lvds(encoder);
|
|
struct sun4i_tcon *tcon = lvds->tcon;
|
|
|
|
DRM_DEBUG_DRIVER("Disabling LVDS output\n");
|
|
|
|
if (tcon->panel) {
|
|
drm_panel_disable(tcon->panel);
|
|
drm_panel_unprepare(tcon->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;
|
|
lvds->tcon = tcon;
|
|
encoder = &lvds->encoder;
|
|
|
|
ret = drm_of_find_panel_or_bridge(tcon->dev->of_node, 1, 0,
|
|
&tcon->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 (tcon->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(tcon->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);
|