aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/imx/parallel-display.c
diff options
context:
space:
mode:
authorLothar Waßmann <LW@KARO-electronics.de>2016-07-12 09:30:03 -0400
committerPhilipp Zabel <p.zabel@pengutronix.de>2016-08-08 05:44:20 -0400
commitfafc79ef2e9148d0085585b6b71bc7154c14ebb6 (patch)
treefc10a39232083944ec0727f71ac6c16a8e647fcd /drivers/gpu/drm/imx/parallel-display.c
parentd72daa0d75e8fe71368113350254b9da2c64b235 (diff)
drm/imx: convey the pixelclk-active and de-active flags from DT to the ipu-di driver
The 'de-active' and 'pixelclk-active' DT properties are evaluated by of_parse_display_timing() called from of_get_drm_display_mode(), but later lost in the conversion from videomode.flags to drm_display_mode.flags. Enhance of_get_drm_display_mode() to also return the bus flags in a separate variable, so that they can be passed on to the ipu-di driver. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/imx/parallel-display.c')
-rw-r--r--drivers/gpu/drm/imx/parallel-display.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 1dad297b01fd..74b0ac06fdab 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -33,6 +33,7 @@ struct imx_parallel_display {
33 void *edid; 33 void *edid;
34 int edid_len; 34 int edid_len;
35 u32 bus_format; 35 u32 bus_format;
36 u32 bus_flags;
36 struct drm_display_mode mode; 37 struct drm_display_mode mode;
37 struct drm_panel *panel; 38 struct drm_panel *panel;
38 struct drm_bridge *bridge; 39 struct drm_bridge *bridge;
@@ -80,6 +81,7 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
80 return -EINVAL; 81 return -EINVAL;
81 82
82 ret = of_get_drm_display_mode(np, &imxpd->mode, 83 ret = of_get_drm_display_mode(np, &imxpd->mode,
84 &imxpd->bus_flags,
83 OF_USE_NATIVE_MODE); 85 OF_USE_NATIVE_MODE);
84 if (ret) 86 if (ret)
85 return ret; 87 return ret;
@@ -125,11 +127,13 @@ static int imx_pd_encoder_atomic_check(struct drm_encoder *encoder,
125 struct drm_display_info *di = &conn_state->connector->display_info; 127 struct drm_display_info *di = &conn_state->connector->display_info;
126 struct imx_parallel_display *imxpd = enc_to_imxpd(encoder); 128 struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
127 129
128 imx_crtc_state->bus_flags = di->bus_flags; 130 if (!imxpd->bus_format && di->num_bus_formats) {
129 if (!imxpd->bus_format && di->num_bus_formats) 131 imx_crtc_state->bus_flags = di->bus_flags;
130 imx_crtc_state->bus_format = di->bus_formats[0]; 132 imx_crtc_state->bus_format = di->bus_formats[0];
131 else 133 } else {
134 imx_crtc_state->bus_flags = imxpd->bus_flags;
132 imx_crtc_state->bus_format = imxpd->bus_format; 135 imx_crtc_state->bus_format = imxpd->bus_format;
136 }
133 imx_crtc_state->di_hsync_pin = 2; 137 imx_crtc_state->di_hsync_pin = 2;
134 imx_crtc_state->di_vsync_pin = 3; 138 imx_crtc_state->di_vsync_pin = 3;
135 139