Skip to content

Commit fae6f81

Browse files
AngeloGioacchino Del RegnoChun-Kuang Hu
authored andcommitted
drm/mediatek: dsi: Fix DSI RGB666 formats and definitions
The register bits definitions for RGB666 formats are wrong in multiple ways: first, in the DSI_PS_SEL bits region, the Packed 18-bits RGB666 format is selected with bit 1, while the Loosely Packed one is bit 2, and second - the definition name "LOOSELY_PS_18BIT_RGB666" is wrong because the loosely packed format is 24 bits instead! Either way, functions mtk_dsi_ps_control_vact() and mtk_dsi_ps_control() do not even agree on the DSI_PS_SEL bit to set in DSI_PSCTRL: one sets loosely packed (24) on RGB666, the other sets packed (18), and the other way around for RGB666_PACKED. Fixing this entire stack of issues is done in one go: - Use the correct bit for the Loosely Packed RGB666 definition - Rename LOOSELY_PS_18BIT_RGB666 to LOOSELY_PS_24BIT_RGB666 - Change ps_bpp_mode in mtk_dsi_ps_control_vact() to set: - Loosely Packed, 24-bits for MIPI_DSI_FMT_RGB666 - Packed, 18-bits for MIPI_DSI_FMT_RGB666_PACKED Fixes: 2e54c14 ("drm/mediatek: Add DSI sub driver") Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> Reviewed-by: CK Hu <ck.hu@mediatek.com> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://patchwork.kernel.org/project/dri-devel/patch/20240215085316.56835-3-angelogioacchino.delregno@collabora.com/ Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
1 parent 3b09cc7 commit fae6f81

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/gpu/drm/mediatek/mtk_dsi.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
#define DSI_PS_WC GENMASK(13, 0)
7272
#define DSI_PS_SEL GENMASK(17, 16)
7373
#define PACKED_PS_16BIT_RGB565 (0 << 16)
74-
#define LOOSELY_PS_18BIT_RGB666 (1 << 16)
75-
#define PACKED_PS_18BIT_RGB666 (2 << 16)
74+
#define PACKED_PS_18BIT_RGB666 (1 << 16)
75+
#define LOOSELY_PS_24BIT_RGB666 (2 << 16)
7676
#define PACKED_PS_24BIT_RGB888 (3 << 16)
7777

7878
#define DSI_VSA_NL 0x20
@@ -370,10 +370,10 @@ static void mtk_dsi_ps_control_vact(struct mtk_dsi *dsi)
370370
ps_bpp_mode |= PACKED_PS_24BIT_RGB888;
371371
break;
372372
case MIPI_DSI_FMT_RGB666:
373-
ps_bpp_mode |= PACKED_PS_18BIT_RGB666;
373+
ps_bpp_mode |= LOOSELY_PS_24BIT_RGB666;
374374
break;
375375
case MIPI_DSI_FMT_RGB666_PACKED:
376-
ps_bpp_mode |= LOOSELY_PS_18BIT_RGB666;
376+
ps_bpp_mode |= PACKED_PS_18BIT_RGB666;
377377
break;
378378
case MIPI_DSI_FMT_RGB565:
379379
ps_bpp_mode |= PACKED_PS_16BIT_RGB565;
@@ -427,7 +427,7 @@ static void mtk_dsi_ps_control(struct mtk_dsi *dsi)
427427
dsi_tmp_buf_bpp = 3;
428428
break;
429429
case MIPI_DSI_FMT_RGB666:
430-
tmp_reg = LOOSELY_PS_18BIT_RGB666;
430+
tmp_reg = LOOSELY_PS_24BIT_RGB666;
431431
dsi_tmp_buf_bpp = 3;
432432
break;
433433
case MIPI_DSI_FMT_RGB666_PACKED:

0 commit comments

Comments
 (0)