Skip to content

Commit bb0a05a

Browse files
Kwiboommind
authored andcommitted
drm/rockchip: vop: Fix color for RGB888/BGR888 format on VOP full
Use of DRM_FORMAT_RGB888 and DRM_FORMAT_BGR888 on e.g. RK3288, RK3328 and RK3399 result in wrong colors being displayed. The issue can be observed using modetest: modetest -s <connector_id>@<crtc_id>:1920x1080-60@RG24 modetest -s <connector_id>@<crtc_id>:1920x1080-60@BG24 Vendor 4.4 kernel apply an inverted rb swap for these formats on VOP full framework (IP version 3.x) compared to VOP little framework (2.x). Fix colors by applying different rb swap for VOP full framework (3.x) and VOP little framework (2.x) similar to vendor 4.4 kernel. Fixes: 85a359f ("drm/rockchip: Add BGR formats to VOP") Signed-off-by: Jonas Karlman <[email protected]> Tested-by: Diederik de Haas <[email protected]> Reviewed-by: Christopher Obbard <[email protected]> Tested-by: Christopher Obbard <[email protected]> Signed-off-by: Heiko Stuebner <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 3f9a91b commit bb0a05a

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,22 @@ static inline void vop_cfg_done(struct vop *vop)
247247
VOP_REG_SET(vop, common, cfg_done, 1);
248248
}
249249

250-
static bool has_rb_swapped(uint32_t format)
250+
static bool has_rb_swapped(uint32_t version, uint32_t format)
251251
{
252252
switch (format) {
253253
case DRM_FORMAT_XBGR8888:
254254
case DRM_FORMAT_ABGR8888:
255-
case DRM_FORMAT_BGR888:
256255
case DRM_FORMAT_BGR565:
257256
return true;
257+
/*
258+
* full framework (IP version 3.x) only need rb swapped for RGB888 and
259+
* little framework (IP version 2.x) only need rb swapped for BGR888,
260+
* check for 3.x to also only rb swap BGR888 for unknown vop version
261+
*/
262+
case DRM_FORMAT_RGB888:
263+
return VOP_MAJOR(version) == 3;
264+
case DRM_FORMAT_BGR888:
265+
return VOP_MAJOR(version) != 3;
258266
default:
259267
return false;
260268
}
@@ -1030,7 +1038,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
10301038
VOP_WIN_SET(vop, win, dsp_info, dsp_info);
10311039
VOP_WIN_SET(vop, win, dsp_st, dsp_st);
10321040

1033-
rb_swap = has_rb_swapped(fb->format->format);
1041+
rb_swap = has_rb_swapped(vop->data->version, fb->format->format);
10341042
VOP_WIN_SET(vop, win, rb_swap, rb_swap);
10351043

10361044
/*

0 commit comments

Comments
 (0)