Skip to content

Commit

Permalink
drm/rockchip: vop2: remove the unsupported format of cluster window
Browse files Browse the repository at this point in the history
The cluster window on vop2 doesn't support linear yuv
format(NV12/16/24), it only support afbc based yuv
format(DRM_FORMAT_YUV420_8BIT/10BIT), which will be
added in next patch.

Fixes: 604be85 ("drm/rockchip: Add VOP2 driver")
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231018094239.2475851-1-andyshrk@163.com
  • Loading branch information
Andy Yan authored and Heiko Stuebner committed Oct 24, 2023
1 parent 45ad07c commit 01d5a75
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 26 deletions.
24 changes: 1 addition & 23 deletions drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,6 @@ static enum vop2_afbc_format vop2_convert_afbc_format(u32 format)
case DRM_FORMAT_RGB565:
case DRM_FORMAT_BGR565:
return VOP2_AFBC_FMT_RGB565;
case DRM_FORMAT_NV12:
return VOP2_AFBC_FMT_YUV420;
case DRM_FORMAT_NV16:
return VOP2_AFBC_FMT_YUV422;
default:
return VOP2_AFBC_FMT_INVALID;
}
Expand All @@ -366,25 +362,9 @@ static bool vop2_win_rb_swap(u32 format)
}
}

static bool vop2_afbc_rb_swap(u32 format)
{
switch (format) {
case DRM_FORMAT_NV24:
return true;
default:
return false;
}
}

static bool vop2_afbc_uv_swap(u32 format)
{
switch (format) {
case DRM_FORMAT_NV12:
case DRM_FORMAT_NV16:
return true;
default:
return false;
}
return false;
}

static bool vop2_win_uv_swap(u32 format)
Expand Down Expand Up @@ -1232,7 +1212,6 @@ static void vop2_plane_atomic_update(struct drm_plane *plane,
drm_err(vop2->drm, "vp%d %s stride[%d] not 64 pixel aligned\n",
vp->id, win->data->name, stride);

rb_swap = vop2_afbc_rb_swap(fb->format->format);
uv_swap = vop2_afbc_uv_swap(fb->format->format);
/*
* This is a workaround for crazy IC design, Cluster
Expand All @@ -1249,7 +1228,6 @@ static void vop2_plane_atomic_update(struct drm_plane *plane,
if (vop2_cluster_window(win))
vop2_win_write(win, VOP2_WIN_AFBC_ENABLE, 1);
vop2_win_write(win, VOP2_WIN_AFBC_FORMAT, afbc_format);
vop2_win_write(win, VOP2_WIN_AFBC_RB_SWAP, rb_swap);
vop2_win_write(win, VOP2_WIN_AFBC_UV_SWAP, uv_swap);
vop2_win_write(win, VOP2_WIN_AFBC_AUTO_GATING_EN, 0);
vop2_win_write(win, VOP2_WIN_AFBC_BLOCK_SPLIT_EN, 0);
Expand Down
3 changes: 0 additions & 3 deletions drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ static const uint32_t formats_win_full_10bit[] = {
DRM_FORMAT_BGR888,
DRM_FORMAT_RGB565,
DRM_FORMAT_BGR565,
DRM_FORMAT_NV12,
DRM_FORMAT_NV16,
DRM_FORMAT_NV24,
};

static const uint32_t formats_win_full_10bit_yuyv[] = {
Expand Down

0 comments on commit 01d5a75

Please sign in to comment.