a25b988ff8
Most bridge drivers create a DRM connector to model the connector at the
output of the bridge. This model is historical and has worked pretty
well so far, but causes several issues:
- It prevents supporting more complex display pipelines where DRM
connector operations are split over multiple components. For instance a
pipeline with a bridge connected to the DDC signals to read EDID data,
and another one connected to the HPD signal to detect connection and
disconnection, will not be possible to support through this model.
- It requires every bridge driver to implement similar connector
handling code, resulting in code duplication.
- It assumes that a bridge will either be wired to a connector or to
another bridge, but doesn't support bridges that can be used in both
positions very well (although there is some ad-hoc support for this in
the analogix_dp bridge driver).
In order to solve these issues, ownership of the connector should be
moved to the display controller driver (where it can be implemented
using helpers provided by the core).
Extend the bridge API to allow disabling connector creation in bridge
drivers as a first step towards the new model. The new flags argument to
the bridge .attach() operation allows instructing the bridge driver to
skip creating a connector. Unconditionally set the new flags argument to
0 for now to keep the existing behaviour, and modify all existing bridge
drivers to return an error when connector creation is not requested as
they don't support this feature yet.
The change is based on the following semantic patch, with manual review
and edits.
@ rule1 @
identifier funcs;
identifier fn;
@@
struct drm_bridge_funcs funcs = {
...,
.attach = fn
};
@ depends on rule1 @
identifier rule1.fn;
identifier bridge;
statement S, S1;
@@
int fn(
struct drm_bridge *bridge
+ , enum drm_bridge_attach_flags flags
)
{
... when != S
+ if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) {
+ DRM_ERROR("Fix bridge driver to make connector optional!");
+ return -EINVAL;
+ }
+
S1
...
}
@ depends on rule1 @
identifier rule1.fn;
identifier bridge, flags;
expression E1, E2, E3;
@@
int fn(
struct drm_bridge *bridge,
enum drm_bridge_attach_flags flags
) {
<...
drm_bridge_attach(E1, E2, E3
+ , flags
)
...>
}
@@
expression E1, E2, E3;
@@
drm_bridge_attach(E1, E2, E3
+ , 0
)
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200226112514.12455-10-laurent.pinchart@ideasonboard.com
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, 0);
|
|
}
|