fcd70cd36b
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
107 lines
3 KiB
C
107 lines
3 KiB
C
/*
|
|
* Copyright (C) 2016 Marek Vasut <marex@denx.de>
|
|
*
|
|
* 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.
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#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 <drm/drmP.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, 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 mxsfb->panel->funcs->get_modes(mxsfb->panel);
|
|
|
|
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;
|
|
struct drm_panel *panel;
|
|
int ret;
|
|
|
|
ret = drm_of_find_panel_or_bridge(drm->dev->of_node, 0, 0, &panel, NULL);
|
|
if (ret)
|
|
return ret;
|
|
|
|
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);
|
|
if (!ret)
|
|
mxsfb->panel = panel;
|
|
|
|
return ret;
|
|
}
|