aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/imx/imx-ldb.c
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-12-02 11:51:36 -0500
committerPhilipp Zabel <p.zabel@pengutronix.de>2015-03-31 05:59:34 -0400
commita7c6e76feeb19de1a5cefa50ea6c0fc5ad45bbe1 (patch)
tree347d8ffa3959f23cf55ab06773feff0b36fd8975 /drivers/gpu/drm/imx/imx-ldb.c
parent203508ef52e3fee93b71262928541ecea82c735d (diff)
drm/imx: switch to use media bus formats
imx-drm internally misused the V4L2_PIX_FMT constants, which are supposed to describe the pixel format of frame buffers in memory, to describe the pixel format on the bus between the display controller and the encoder hardware. Now that MEDIA_BUS_FMT constants are available to drm drivers, use those instead. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Tested-by: Emil Renner Berthing <kernel@esmil.dk>
Diffstat (limited to 'drivers/gpu/drm/imx/imx-ldb.c')
-rw-r--r--drivers/gpu/drm/imx/imx-ldb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 2d6dc94e1e64..f9ec17a43458 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -168,16 +168,16 @@ static void imx_ldb_encoder_prepare(struct drm_encoder *encoder)
168 switch (imx_ldb_ch->chno) { 168 switch (imx_ldb_ch->chno) {
169 case 0: 169 case 0:
170 pixel_fmt = (ldb->ldb_ctrl & LDB_DATA_WIDTH_CH0_24) ? 170 pixel_fmt = (ldb->ldb_ctrl & LDB_DATA_WIDTH_CH0_24) ?
171 V4L2_PIX_FMT_RGB24 : V4L2_PIX_FMT_BGR666; 171 MEDIA_BUS_FMT_RGB888_1X24 : MEDIA_BUS_FMT_RGB666_1X18;
172 break; 172 break;
173 case 1: 173 case 1:
174 pixel_fmt = (ldb->ldb_ctrl & LDB_DATA_WIDTH_CH1_24) ? 174 pixel_fmt = (ldb->ldb_ctrl & LDB_DATA_WIDTH_CH1_24) ?
175 V4L2_PIX_FMT_RGB24 : V4L2_PIX_FMT_BGR666; 175 MEDIA_BUS_FMT_RGB888_1X24 : MEDIA_BUS_FMT_RGB666_1X18;
176 break; 176 break;
177 default: 177 default:
178 dev_err(ldb->dev, "unable to config di%d panel format\n", 178 dev_err(ldb->dev, "unable to config di%d panel format\n",
179 imx_ldb_ch->chno); 179 imx_ldb_ch->chno);
180 pixel_fmt = V4L2_PIX_FMT_RGB24; 180 pixel_fmt = MEDIA_BUS_FMT_RGB888_1X24;
181 } 181 }
182 182
183 imx_drm_panel_format(encoder, pixel_fmt); 183 imx_drm_panel_format(encoder, pixel_fmt);