All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
@ 2023-10-25 21:32 ` Jonas Karlman
  0 siblings, 0 replies; 12+ messages in thread
From: Jonas Karlman @ 2023-10-25 21:32 UTC (permalink / raw)
  To: Heiko Stuebner, Sandy Huang, David Airlie, Daniel Vetter
  Cc: Andy Yan, Christopher Obbard, Jonas Karlman, dri-devel,
	linux-arm-kernel, linux-rockchip, linux-kernel

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/329

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +++++
 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index ab944010fe14..592f9d726f2e 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -326,11 +326,14 @@ static enum vop2_data_format vop2_convert_format(u32 format)
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV61:
 		return VOP2_FMT_YUV422SP;
+	case DRM_FORMAT_NV20:
 	case DRM_FORMAT_Y210:
 		return VOP2_FMT_YUV422SP_10;
 	case DRM_FORMAT_NV24:
 	case DRM_FORMAT_NV42:
 		return VOP2_FMT_YUV444SP;
+	case DRM_FORMAT_NV30:
+		return VOP2_FMT_YUV444SP_10;
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_YVYU:
 		return VOP2_FMT_VYUY422;
@@ -415,6 +418,8 @@ static bool vop2_win_uv_swap(u32 format)
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV24:
 	case DRM_FORMAT_NV15:
+	case DRM_FORMAT_NV20:
+	case DRM_FORMAT_NV30:
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_UYVY:
 		return true;
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
index fdb48571efce..0b4280218a59 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
@@ -48,8 +48,10 @@ static const uint32_t formats_rk356x_esmart[] = {
 	DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding */
 	DRM_FORMAT_NV16, /* 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_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_VYUY, /* yuv422_8bit[VYUY] linear mode */
 };
-- 
2.42.0


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
@ 2023-10-25 21:32 ` Jonas Karlman
  0 siblings, 0 replies; 12+ messages in thread
From: Jonas Karlman @ 2023-10-25 21:32 UTC (permalink / raw)
  To: Heiko Stuebner, Sandy Huang, David Airlie, Daniel Vetter
  Cc: Andy Yan, Christopher Obbard, Jonas Karlman, dri-devel,
	linux-arm-kernel, linux-rockchip, linux-kernel

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/329

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +++++
 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index ab944010fe14..592f9d726f2e 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -326,11 +326,14 @@ static enum vop2_data_format vop2_convert_format(u32 format)
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV61:
 		return VOP2_FMT_YUV422SP;
+	case DRM_FORMAT_NV20:
 	case DRM_FORMAT_Y210:
 		return VOP2_FMT_YUV422SP_10;
 	case DRM_FORMAT_NV24:
 	case DRM_FORMAT_NV42:
 		return VOP2_FMT_YUV444SP;
+	case DRM_FORMAT_NV30:
+		return VOP2_FMT_YUV444SP_10;
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_YVYU:
 		return VOP2_FMT_VYUY422;
@@ -415,6 +418,8 @@ static bool vop2_win_uv_swap(u32 format)
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV24:
 	case DRM_FORMAT_NV15:
+	case DRM_FORMAT_NV20:
+	case DRM_FORMAT_NV30:
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_UYVY:
 		return true;
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
index fdb48571efce..0b4280218a59 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
@@ -48,8 +48,10 @@ static const uint32_t formats_rk356x_esmart[] = {
 	DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding */
 	DRM_FORMAT_NV16, /* 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_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_VYUY, /* yuv422_8bit[VYUY] linear mode */
 };
-- 
2.42.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
@ 2023-10-25 21:32 ` Jonas Karlman
  0 siblings, 0 replies; 12+ messages in thread
From: Jonas Karlman @ 2023-10-25 21:32 UTC (permalink / raw)
  To: Heiko Stuebner, Sandy Huang, David Airlie, Daniel Vetter
  Cc: Andy Yan, Christopher Obbard, Jonas Karlman, dri-devel,
	linux-arm-kernel, linux-rockchip, linux-kernel

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/329

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +++++
 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index ab944010fe14..592f9d726f2e 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -326,11 +326,14 @@ static enum vop2_data_format vop2_convert_format(u32 format)
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV61:
 		return VOP2_FMT_YUV422SP;
+	case DRM_FORMAT_NV20:
 	case DRM_FORMAT_Y210:
 		return VOP2_FMT_YUV422SP_10;
 	case DRM_FORMAT_NV24:
 	case DRM_FORMAT_NV42:
 		return VOP2_FMT_YUV444SP;
+	case DRM_FORMAT_NV30:
+		return VOP2_FMT_YUV444SP_10;
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_YVYU:
 		return VOP2_FMT_VYUY422;
@@ -415,6 +418,8 @@ static bool vop2_win_uv_swap(u32 format)
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV24:
 	case DRM_FORMAT_NV15:
+	case DRM_FORMAT_NV20:
+	case DRM_FORMAT_NV30:
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_UYVY:
 		return true;
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
index fdb48571efce..0b4280218a59 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
@@ -48,8 +48,10 @@ static const uint32_t formats_rk356x_esmart[] = {
 	DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding */
 	DRM_FORMAT_NV16, /* 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_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_VYUY, /* yuv422_8bit[VYUY] linear mode */
 };
-- 
2.42.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
@ 2023-10-25 21:32 ` Jonas Karlman
  0 siblings, 0 replies; 12+ messages in thread
From: Jonas Karlman @ 2023-10-25 21:32 UTC (permalink / raw)
  To: Heiko Stuebner, Sandy Huang, David Airlie, Daniel Vetter
  Cc: Jonas Karlman, linux-kernel, dri-devel, linux-rockchip, Andy Yan,
	Christopher Obbard, linux-arm-kernel

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/329

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +++++
 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index ab944010fe14..592f9d726f2e 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -326,11 +326,14 @@ static enum vop2_data_format vop2_convert_format(u32 format)
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV61:
 		return VOP2_FMT_YUV422SP;
+	case DRM_FORMAT_NV20:
 	case DRM_FORMAT_Y210:
 		return VOP2_FMT_YUV422SP_10;
 	case DRM_FORMAT_NV24:
 	case DRM_FORMAT_NV42:
 		return VOP2_FMT_YUV444SP;
+	case DRM_FORMAT_NV30:
+		return VOP2_FMT_YUV444SP_10;
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_YVYU:
 		return VOP2_FMT_VYUY422;
@@ -415,6 +418,8 @@ static bool vop2_win_uv_swap(u32 format)
 	case DRM_FORMAT_NV16:
 	case DRM_FORMAT_NV24:
 	case DRM_FORMAT_NV15:
+	case DRM_FORMAT_NV20:
+	case DRM_FORMAT_NV30:
 	case DRM_FORMAT_YUYV:
 	case DRM_FORMAT_UYVY:
 		return true;
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
index fdb48571efce..0b4280218a59 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
@@ -48,8 +48,10 @@ static const uint32_t formats_rk356x_esmart[] = {
 	DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding */
 	DRM_FORMAT_NV16, /* 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_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_VYUY, /* yuv422_8bit[VYUY] linear mode */
 };
-- 
2.42.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
  2023-10-25 21:32 ` Jonas Karlman
  (?)
  (?)
@ 2023-10-26  9:02   ` Christopher Obbard
  -1 siblings, 0 replies; 12+ messages in thread
From: Christopher Obbard @ 2023-10-26  9:02 UTC (permalink / raw)
  To: Jonas Karlman, Heiko Stuebner, Sandy Huang, David Airlie, Daniel Vetter
  Cc: Andy Yan, dri-devel, linux-arm-kernel, linux-rockchip,
	linux-kernel, kernel

Hi Jonas,

On Wed, 2023-10-25 at 21:32 +0000, Jonas Karlman wrote:
> 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/329
> 
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>

Reviewed-by: Christopher Obbard <chris.obbard@collabora.com>
Tested-by: Christopher Obbard <chris.obbard@collabora.com>

> ---
>  drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +++++
>  drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 ++
>  2 files changed, 7 insertions(+)
> 
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> index ab944010fe14..592f9d726f2e 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> @@ -326,11 +326,14 @@ static enum vop2_data_format vop2_convert_format(u32
> format)
>  	case DRM_FORMAT_NV16:
>  	case DRM_FORMAT_NV61:
>  		return VOP2_FMT_YUV422SP;
> +	case DRM_FORMAT_NV20:
>  	case DRM_FORMAT_Y210:
>  		return VOP2_FMT_YUV422SP_10;
>  	case DRM_FORMAT_NV24:
>  	case DRM_FORMAT_NV42:
>  		return VOP2_FMT_YUV444SP;
> +	case DRM_FORMAT_NV30:
> +		return VOP2_FMT_YUV444SP_10;
>  	case DRM_FORMAT_YUYV:
>  	case DRM_FORMAT_YVYU:
>  		return VOP2_FMT_VYUY422;
> @@ -415,6 +418,8 @@ static bool vop2_win_uv_swap(u32 format)
>  	case DRM_FORMAT_NV16:
>  	case DRM_FORMAT_NV24:
>  	case DRM_FORMAT_NV15:
> +	case DRM_FORMAT_NV20:
> +	case DRM_FORMAT_NV30:
>  	case DRM_FORMAT_YUYV:
>  	case DRM_FORMAT_UYVY:
>  		return true;
> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> index fdb48571efce..0b4280218a59 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> @@ -48,8 +48,10 @@ static const uint32_t formats_rk356x_esmart[] = {
>  	DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding
> */
>  	DRM_FORMAT_NV16, /* 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_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_VYUY, /* yuv422_8bit[VYUY] linear mode */
>  };

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
@ 2023-10-26  9:02   ` Christopher Obbard
  0 siblings, 0 replies; 12+ messages in thread
From: Christopher Obbard @ 2023-10-26  9:02 UTC (permalink / raw)
  To: Jonas Karlman, Heiko Stuebner, Sandy Huang, David Airlie, Daniel Vetter
  Cc: linux-kernel, dri-devel, linux-rockchip, Andy Yan, kernel,
	linux-arm-kernel

Hi Jonas,

On Wed, 2023-10-25 at 21:32 +0000, Jonas Karlman wrote:
> 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/329
> 
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>

Reviewed-by: Christopher Obbard <chris.obbard@collabora.com>
Tested-by: Christopher Obbard <chris.obbard@collabora.com>

> ---
>  drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +++++
>  drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 ++
>  2 files changed, 7 insertions(+)
> 
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> index ab944010fe14..592f9d726f2e 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> @@ -326,11 +326,14 @@ static enum vop2_data_format vop2_convert_format(u32
> format)
>  	case DRM_FORMAT_NV16:
>  	case DRM_FORMAT_NV61:
>  		return VOP2_FMT_YUV422SP;
> +	case DRM_FORMAT_NV20:
>  	case DRM_FORMAT_Y210:
>  		return VOP2_FMT_YUV422SP_10;
>  	case DRM_FORMAT_NV24:
>  	case DRM_FORMAT_NV42:
>  		return VOP2_FMT_YUV444SP;
> +	case DRM_FORMAT_NV30:
> +		return VOP2_FMT_YUV444SP_10;
>  	case DRM_FORMAT_YUYV:
>  	case DRM_FORMAT_YVYU:
>  		return VOP2_FMT_VYUY422;
> @@ -415,6 +418,8 @@ static bool vop2_win_uv_swap(u32 format)
>  	case DRM_FORMAT_NV16:
>  	case DRM_FORMAT_NV24:
>  	case DRM_FORMAT_NV15:
> +	case DRM_FORMAT_NV20:
> +	case DRM_FORMAT_NV30:
>  	case DRM_FORMAT_YUYV:
>  	case DRM_FORMAT_UYVY:
>  		return true;
> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> index fdb48571efce..0b4280218a59 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> @@ -48,8 +48,10 @@ static const uint32_t formats_rk356x_esmart[] = {
>  	DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding
> */
>  	DRM_FORMAT_NV16, /* 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_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_VYUY, /* yuv422_8bit[VYUY] linear mode */
>  };

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
@ 2023-10-26  9:02   ` Christopher Obbard
  0 siblings, 0 replies; 12+ messages in thread
From: Christopher Obbard @ 2023-10-26  9:02 UTC (permalink / raw)
  To: Jonas Karlman, Heiko Stuebner, Sandy Huang, David Airlie, Daniel Vetter
  Cc: Andy Yan, dri-devel, linux-arm-kernel, linux-rockchip,
	linux-kernel, kernel

Hi Jonas,

On Wed, 2023-10-25 at 21:32 +0000, Jonas Karlman wrote:
> 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/329
> 
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>

Reviewed-by: Christopher Obbard <chris.obbard@collabora.com>
Tested-by: Christopher Obbard <chris.obbard@collabora.com>

> ---
>  drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +++++
>  drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 ++
>  2 files changed, 7 insertions(+)
> 
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> index ab944010fe14..592f9d726f2e 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> @@ -326,11 +326,14 @@ static enum vop2_data_format vop2_convert_format(u32
> format)
>  	case DRM_FORMAT_NV16:
>  	case DRM_FORMAT_NV61:
>  		return VOP2_FMT_YUV422SP;
> +	case DRM_FORMAT_NV20:
>  	case DRM_FORMAT_Y210:
>  		return VOP2_FMT_YUV422SP_10;
>  	case DRM_FORMAT_NV24:
>  	case DRM_FORMAT_NV42:
>  		return VOP2_FMT_YUV444SP;
> +	case DRM_FORMAT_NV30:
> +		return VOP2_FMT_YUV444SP_10;
>  	case DRM_FORMAT_YUYV:
>  	case DRM_FORMAT_YVYU:
>  		return VOP2_FMT_VYUY422;
> @@ -415,6 +418,8 @@ static bool vop2_win_uv_swap(u32 format)
>  	case DRM_FORMAT_NV16:
>  	case DRM_FORMAT_NV24:
>  	case DRM_FORMAT_NV15:
> +	case DRM_FORMAT_NV20:
> +	case DRM_FORMAT_NV30:
>  	case DRM_FORMAT_YUYV:
>  	case DRM_FORMAT_UYVY:
>  		return true;
> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> index fdb48571efce..0b4280218a59 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> @@ -48,8 +48,10 @@ static const uint32_t formats_rk356x_esmart[] = {
>  	DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding
> */
>  	DRM_FORMAT_NV16, /* 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_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_VYUY, /* yuv422_8bit[VYUY] linear mode */
>  };

_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
@ 2023-10-26  9:02   ` Christopher Obbard
  0 siblings, 0 replies; 12+ messages in thread
From: Christopher Obbard @ 2023-10-26  9:02 UTC (permalink / raw)
  To: Jonas Karlman, Heiko Stuebner, Sandy Huang, David Airlie, Daniel Vetter
  Cc: Andy Yan, dri-devel, linux-arm-kernel, linux-rockchip,
	linux-kernel, kernel

Hi Jonas,

On Wed, 2023-10-25 at 21:32 +0000, Jonas Karlman wrote:
> 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/329
> 
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>

Reviewed-by: Christopher Obbard <chris.obbard@collabora.com>
Tested-by: Christopher Obbard <chris.obbard@collabora.com>

> ---
>  drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 5 +++++
>  drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 ++
>  2 files changed, 7 insertions(+)
> 
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> index ab944010fe14..592f9d726f2e 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> @@ -326,11 +326,14 @@ static enum vop2_data_format vop2_convert_format(u32
> format)
>  	case DRM_FORMAT_NV16:
>  	case DRM_FORMAT_NV61:
>  		return VOP2_FMT_YUV422SP;
> +	case DRM_FORMAT_NV20:
>  	case DRM_FORMAT_Y210:
>  		return VOP2_FMT_YUV422SP_10;
>  	case DRM_FORMAT_NV24:
>  	case DRM_FORMAT_NV42:
>  		return VOP2_FMT_YUV444SP;
> +	case DRM_FORMAT_NV30:
> +		return VOP2_FMT_YUV444SP_10;
>  	case DRM_FORMAT_YUYV:
>  	case DRM_FORMAT_YVYU:
>  		return VOP2_FMT_VYUY422;
> @@ -415,6 +418,8 @@ static bool vop2_win_uv_swap(u32 format)
>  	case DRM_FORMAT_NV16:
>  	case DRM_FORMAT_NV24:
>  	case DRM_FORMAT_NV15:
> +	case DRM_FORMAT_NV20:
> +	case DRM_FORMAT_NV30:
>  	case DRM_FORMAT_YUYV:
>  	case DRM_FORMAT_UYVY:
>  		return true;
> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> index fdb48571efce..0b4280218a59 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> @@ -48,8 +48,10 @@ static const uint32_t formats_rk356x_esmart[] = {
>  	DRM_FORMAT_NV15, /* yuv420_10bit linear mode, 2 plane, no padding
> */
>  	DRM_FORMAT_NV16, /* 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_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_VYUY, /* yuv422_8bit[VYUY] linear mode */
>  };

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
  2023-10-25 21:32 ` Jonas Karlman
  (?)
  (?)
@ 2023-11-20 17:02   ` Heiko Stuebner
  -1 siblings, 0 replies; 12+ messages in thread
From: Heiko Stuebner @ 2023-11-20 17:02 UTC (permalink / raw)
  To: Sandy Huang, David Airlie, Jonas Karlman, Daniel Vetter
  Cc: Heiko Stuebner, linux-arm-kernel, linux-rockchip, dri-devel,
	Christopher Obbard, Andy Yan, linux-kernel

On Wed, 25 Oct 2023 21:32:46 +0000, Jonas Karlman wrote:
> 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):
> 
> [...]

Applied, thanks!

[1/1] drm/rockchip: vop2: Add NV20 and NV30 support
      commit: 5fc6aa7db080fd90ef00846aac04e8a211088132

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
@ 2023-11-20 17:02   ` Heiko Stuebner
  0 siblings, 0 replies; 12+ messages in thread
From: Heiko Stuebner @ 2023-11-20 17:02 UTC (permalink / raw)
  To: Sandy Huang, David Airlie, Jonas Karlman, Daniel Vetter
  Cc: Heiko Stuebner, linux-arm-kernel, linux-rockchip, dri-devel,
	Christopher Obbard, Andy Yan, linux-kernel

On Wed, 25 Oct 2023 21:32:46 +0000, Jonas Karlman wrote:
> 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):
> 
> [...]

Applied, thanks!

[1/1] drm/rockchip: vop2: Add NV20 and NV30 support
      commit: 5fc6aa7db080fd90ef00846aac04e8a211088132

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
@ 2023-11-20 17:02   ` Heiko Stuebner
  0 siblings, 0 replies; 12+ messages in thread
From: Heiko Stuebner @ 2023-11-20 17:02 UTC (permalink / raw)
  To: Sandy Huang, David Airlie, Jonas Karlman, Daniel Vetter
  Cc: linux-kernel, dri-devel, linux-rockchip, Andy Yan,
	Christopher Obbard, linux-arm-kernel

On Wed, 25 Oct 2023 21:32:46 +0000, Jonas Karlman wrote:
> 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):
> 
> [...]

Applied, thanks!

[1/1] drm/rockchip: vop2: Add NV20 and NV30 support
      commit: 5fc6aa7db080fd90ef00846aac04e8a211088132

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support
@ 2023-11-20 17:02   ` Heiko Stuebner
  0 siblings, 0 replies; 12+ messages in thread
From: Heiko Stuebner @ 2023-11-20 17:02 UTC (permalink / raw)
  To: Sandy Huang, David Airlie, Jonas Karlman, Daniel Vetter
  Cc: Heiko Stuebner, linux-arm-kernel, linux-rockchip, dri-devel,
	Christopher Obbard, Andy Yan, linux-kernel

On Wed, 25 Oct 2023 21:32:46 +0000, Jonas Karlman wrote:
> 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):
> 
> [...]

Applied, thanks!

[1/1] drm/rockchip: vop2: Add NV20 and NV30 support
      commit: 5fc6aa7db080fd90ef00846aac04e8a211088132

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2023-11-20 17:03 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-25 21:32 [PATCH] drm/rockchip: vop2: Add NV20 and NV30 support Jonas Karlman
2023-10-25 21:32 ` Jonas Karlman
2023-10-25 21:32 ` Jonas Karlman
2023-10-25 21:32 ` Jonas Karlman
2023-10-26  9:02 ` Christopher Obbard
2023-10-26  9:02   ` Christopher Obbard
2023-10-26  9:02   ` Christopher Obbard
2023-10-26  9:02   ` Christopher Obbard
2023-11-20 17:02 ` Heiko Stuebner
2023-11-20 17:02   ` Heiko Stuebner
2023-11-20 17:02   ` Heiko Stuebner
2023-11-20 17:02   ` Heiko Stuebner

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.