diff options
Diffstat (limited to 'drivers/gpu/drm/imx/parallel-display.c')
-rw-r--r-- | drivers/gpu/drm/imx/parallel-display.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index 900dda6a8e71..74a9ce40ddc4 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c | |||
@@ -33,7 +33,7 @@ struct imx_parallel_display { | |||
33 | struct device *dev; | 33 | struct device *dev; |
34 | void *edid; | 34 | void *edid; |
35 | int edid_len; | 35 | int edid_len; |
36 | u32 interface_pix_fmt; | 36 | u32 bus_format; |
37 | int mode_valid; | 37 | int mode_valid; |
38 | struct drm_display_mode mode; | 38 | struct drm_display_mode mode; |
39 | struct drm_panel *panel; | 39 | struct drm_panel *panel; |
@@ -118,7 +118,7 @@ static void imx_pd_encoder_prepare(struct drm_encoder *encoder) | |||
118 | { | 118 | { |
119 | struct imx_parallel_display *imxpd = enc_to_imxpd(encoder); | 119 | struct imx_parallel_display *imxpd = enc_to_imxpd(encoder); |
120 | 120 | ||
121 | imx_drm_panel_format(encoder, imxpd->interface_pix_fmt); | 121 | imx_drm_set_bus_format(encoder, imxpd->bus_format); |
122 | } | 122 | } |
123 | 123 | ||
124 | static void imx_pd_encoder_commit(struct drm_encoder *encoder) | 124 | static void imx_pd_encoder_commit(struct drm_encoder *encoder) |
@@ -225,14 +225,13 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) | |||
225 | ret = of_property_read_string(np, "interface-pix-fmt", &fmt); | 225 | ret = of_property_read_string(np, "interface-pix-fmt", &fmt); |
226 | if (!ret) { | 226 | if (!ret) { |
227 | if (!strcmp(fmt, "rgb24")) | 227 | if (!strcmp(fmt, "rgb24")) |
228 | imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB24; | 228 | imxpd->bus_format = MEDIA_BUS_FMT_RGB888_1X24; |
229 | else if (!strcmp(fmt, "rgb565")) | 229 | else if (!strcmp(fmt, "rgb565")) |
230 | imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB565; | 230 | imxpd->bus_format = MEDIA_BUS_FMT_RGB565_1X16; |
231 | else if (!strcmp(fmt, "bgr666")) | 231 | else if (!strcmp(fmt, "bgr666")) |
232 | imxpd->interface_pix_fmt = V4L2_PIX_FMT_BGR666; | 232 | imxpd->bus_format = MEDIA_BUS_FMT_RGB666_1X18; |
233 | else if (!strcmp(fmt, "lvds666")) | 233 | else if (!strcmp(fmt, "lvds666")) |
234 | imxpd->interface_pix_fmt = | 234 | imxpd->bus_format = MEDIA_BUS_FMT_RGB666_1X24_CPADHI; |
235 | v4l2_fourcc('L', 'V', 'D', '6'); | ||
236 | } | 235 | } |
237 | 236 | ||
238 | panel_node = of_parse_phandle(np, "fsl,panel", 0); | 237 | panel_node = of_parse_phandle(np, "fsl,panel", 0); |