Commit 5fc6aa7d authored by Jonas Karlman's avatar Jonas Karlman Committed by Heiko Stuebner

drm/rockchip: vop2: Add NV20 and NV30 support

Add support for the 10-bit 4:2:2 and 4:4:4 formats NV20 and NV30.

These formats can be tested using modetest [1]:

  modetest -P <plane_id>@<crtc_id>:1920x1080@<format>

e.g. on a ROCK 3 Model A (rk3568):

  modetest -P 43@67:1920x1080@NV20 -F tiles,tiles
  modetest -P 43@67:1920x1080@NV30 -F smpte,smpte

[1] https://gitlab.freedesktop.org/mesa/drm/-/merge_requests/329Signed-off-by: default avatarJonas Karlman <jonas@kwiboo.se>
Reviewed-by: default avatarChristopher Obbard <chris.obbard@collabora.com>
Tested-by: default avatarChristopher Obbard <chris.obbard@collabora.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231025213248.2641962-1-jonas@kwiboo.se
parent a3232428
...@@ -325,11 +325,14 @@ static enum vop2_data_format vop2_convert_format(u32 format) ...@@ -325,11 +325,14 @@ static enum vop2_data_format vop2_convert_format(u32 format)
case DRM_FORMAT_NV16: case DRM_FORMAT_NV16:
case DRM_FORMAT_NV61: case DRM_FORMAT_NV61:
return VOP2_FMT_YUV422SP; return VOP2_FMT_YUV422SP;
case DRM_FORMAT_NV20:
case DRM_FORMAT_Y210: case DRM_FORMAT_Y210:
return VOP2_FMT_YUV422SP_10; return VOP2_FMT_YUV422SP_10;
case DRM_FORMAT_NV24: case DRM_FORMAT_NV24:
case DRM_FORMAT_NV42: case DRM_FORMAT_NV42:
return VOP2_FMT_YUV444SP; return VOP2_FMT_YUV444SP;
case DRM_FORMAT_NV30:
return VOP2_FMT_YUV444SP_10;
case DRM_FORMAT_YUYV: case DRM_FORMAT_YUYV:
case DRM_FORMAT_YVYU: case DRM_FORMAT_YVYU:
return VOP2_FMT_VYUY422; return VOP2_FMT_VYUY422;
...@@ -414,6 +417,8 @@ static bool vop2_win_uv_swap(u32 format) ...@@ -414,6 +417,8 @@ static bool vop2_win_uv_swap(u32 format)
case DRM_FORMAT_NV16: case DRM_FORMAT_NV16:
case DRM_FORMAT_NV24: case DRM_FORMAT_NV24:
case DRM_FORMAT_NV15: case DRM_FORMAT_NV15:
case DRM_FORMAT_NV20:
case DRM_FORMAT_NV30:
case DRM_FORMAT_YUYV: case DRM_FORMAT_YUYV:
case DRM_FORMAT_UYVY: case DRM_FORMAT_UYVY:
return true; return true;
......
...@@ -48,8 +48,10 @@ static const uint32_t formats_rk356x_esmart[] = { ...@@ -48,8 +48,10 @@ static const uint32_t formats_rk356x_esmart[] = {
DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding */ DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding */
DRM_FORMAT_NV16, /* yuv422_8bit linear mode, 2 plane */ DRM_FORMAT_NV16, /* yuv422_8bit linear mode, 2 plane */
DRM_FORMAT_NV61, /* yuv422_8bit linear mode, 2 plane */ DRM_FORMAT_NV61, /* yuv422_8bit linear mode, 2 plane */
DRM_FORMAT_NV20, /* yuv422_10bit linear mode, 2 plane, no padding */
DRM_FORMAT_NV24, /* yuv444_8bit linear mode, 2 plane */ DRM_FORMAT_NV24, /* yuv444_8bit linear mode, 2 plane */
DRM_FORMAT_NV42, /* yuv444_8bit linear mode, 2 plane */ DRM_FORMAT_NV42, /* yuv444_8bit linear mode, 2 plane */
DRM_FORMAT_NV30, /* yuv444_10bit linear mode, 2 plane, no padding */
DRM_FORMAT_YVYU, /* yuv422_8bit[YVYU] linear mode */ DRM_FORMAT_YVYU, /* yuv422_8bit[YVYU] linear mode */
DRM_FORMAT_VYUY, /* yuv422_8bit[VYUY] linear mode */ DRM_FORMAT_VYUY, /* yuv422_8bit[VYUY] linear mode */
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment