Skip to content

Commit cc3e8a2

Browse files
committed
drm/imx: add internal bridge handling display-timings DT node
i.MX DRM DT bindings allow using either a proper panel / bridge graph to provide information about connected panels, or just a display-timings DT node, describing just the timings and the flags. Add helper bridge driver supporting the latter usecase. It will be used by both LDB and parallel-display drivers. Reviewed-by: Philipp Zabel <[email protected]> Tested-by: Chris Healy <[email protected]> Tested-by: Philipp Zabel <[email protected]> # on imx6q-nitrogen6x Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent 5f6e56d commit cc3e8a2

File tree

4 files changed

+111
-0
lines changed

4 files changed

+111
-0
lines changed

drivers/gpu/drm/bridge/imx/Kconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ if ARCH_MXC || COMPILE_TEST
33
config DRM_IMX_LDB_HELPER
44
tristate
55

6+
config DRM_IMX_LEGACY_BRIDGE
7+
tristate
8+
depends on DRM_IMX
9+
help
10+
This is a DRM bridge implementation for the DRM i.MX IPUv3 driver,
11+
that uses of_get_drm_display_mode to acquire display mode.
12+
13+
Newer designs should not use this bridge and should use proper panel
14+
driver instead.
15+
616
config DRM_IMX8MP_DW_HDMI_BRIDGE
717
tristate "Freescale i.MX8MP HDMI-TX bridge support"
818
depends on OF

drivers/gpu/drm/bridge/imx/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
obj-$(CONFIG_DRM_IMX_LDB_HELPER) += imx-ldb-helper.o
2+
obj-$(CONFIG_DRM_IMX_LEGACY_BRIDGE) += imx-legacy-bridge.o
23
obj-$(CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE) += imx8mp-hdmi-tx.o
34
obj-$(CONFIG_DRM_IMX8MP_HDMI_PVI) += imx8mp-hdmi-pvi.o
45
obj-$(CONFIG_DRM_IMX8QM_LDB) += imx8qm-ldb.o
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
// SPDX-License-Identifier: GPL-2.0+
2+
/*
3+
* Freescale i.MX drm driver
4+
*
5+
* bridge driver for legacy DT bindings, utilizing display-timings node
6+
*/
7+
8+
#include <drm/drm_bridge.h>
9+
#include <drm/drm_modes.h>
10+
#include <drm/drm_probe_helper.h>
11+
#include <drm/bridge/imx.h>
12+
13+
#include <video/of_display_timing.h>
14+
#include <video/of_videomode.h>
15+
16+
struct imx_legacy_bridge {
17+
struct drm_bridge base;
18+
19+
struct drm_display_mode mode;
20+
u32 bus_flags;
21+
};
22+
23+
#define to_imx_legacy_bridge(bridge) container_of(bridge, struct imx_legacy_bridge, base)
24+
25+
static int imx_legacy_bridge_attach(struct drm_bridge *bridge,
26+
enum drm_bridge_attach_flags flags)
27+
{
28+
if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR))
29+
return -EINVAL;
30+
31+
return 0;
32+
}
33+
34+
static int imx_legacy_bridge_get_modes(struct drm_bridge *bridge,
35+
struct drm_connector *connector)
36+
{
37+
struct imx_legacy_bridge *imx_bridge = to_imx_legacy_bridge(bridge);
38+
int ret;
39+
40+
ret = drm_connector_helper_get_modes_fixed(connector, &imx_bridge->mode);
41+
if (ret)
42+
return ret;
43+
44+
connector->display_info.bus_flags = imx_bridge->bus_flags;
45+
46+
return 0;
47+
}
48+
49+
struct drm_bridge_funcs imx_legacy_bridge_funcs = {
50+
.attach = imx_legacy_bridge_attach,
51+
.get_modes = imx_legacy_bridge_get_modes,
52+
};
53+
54+
struct drm_bridge *devm_imx_drm_legacy_bridge(struct device *dev,
55+
struct device_node *np,
56+
int type)
57+
{
58+
struct imx_legacy_bridge *imx_bridge;
59+
int ret;
60+
61+
imx_bridge = devm_kzalloc(dev, sizeof(*imx_bridge), GFP_KERNEL);
62+
if (!imx_bridge)
63+
return ERR_PTR(-ENOMEM);
64+
65+
ret = of_get_drm_display_mode(np,
66+
&imx_bridge->mode,
67+
&imx_bridge->bus_flags,
68+
OF_USE_NATIVE_MODE);
69+
if (ret)
70+
return ERR_PTR(ret);
71+
72+
imx_bridge->mode.type |= DRM_MODE_TYPE_DRIVER;
73+
74+
imx_bridge->base.funcs = &imx_legacy_bridge_funcs;
75+
imx_bridge->base.of_node = np;
76+
imx_bridge->base.ops = DRM_BRIDGE_OP_MODES;
77+
imx_bridge->base.type = type;
78+
79+
ret = devm_drm_bridge_add(dev, &imx_bridge->base);
80+
if (ret)
81+
return ERR_PTR(ret);
82+
83+
return &imx_bridge->base;
84+
}
85+
EXPORT_SYMBOL_GPL(devm_imx_drm_legacy_bridge);
86+
87+
MODULE_LICENSE("GPL");

include/drm/bridge/imx.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// SPDX-License-Identifier: GPL-2.0+
2+
/*
3+
* Copyright (C) 2012 Sascha Hauer, Pengutronix
4+
*/
5+
6+
#ifndef DRM_IMX_BRIDGE_H
7+
#define DRM_IMX_BRIDGE_H
8+
9+
struct drm_bridge *devm_imx_drm_legacy_bridge(struct device *dev,
10+
struct device_node *np,
11+
int type);
12+
13+
#endif

0 commit comments

Comments
 (0)