Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Jan Claußen" <jan.claussen10@web.de>
To: "Sandy Huang" <hjc@rock-chips.com>,
	"Heiko Stübner" <heiko@sntech.de>,
	"Andy Yan" <andy.yan@rock-chips.com>,
	"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
	"Maxime Ripard" <mripard@kernel.org>,
	"Thomas Zimmermann" <tzimmermann@suse.de>,
	"David Airlie" <airlied@gmail.com>,
	"Simona Vetter" <simona@ffwll.ch>
Cc: "Jan Claußen" <jan.claussen10@web.de>,
	dri-devel@lists.freedesktop.org,
	linux-rockchip@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v6 6/8] drm/rockchip: vop2: Select the CSC matrix from the DRM colorimetry
Date: Sat, 21 Nov 2026 17:06:58 +0100	[thread overview]
Message-ID: <20261121160725.6344-7-jan.claussen10@web.de> (raw)
In-Reply-To: <20261121160725.6344-1-jan.claussen10@web.de>

The color_space field in struct rockchip_crtc_state holds V4L2 colorspace
values, a leftover from the vendor kernel. The DP and DSI2 encoders only
ever set V4L2_COLORSPACE_DEFAULT, so VOP2 always ends up with BT.709.
An HDMI encoder that wants to honour the connector colorspace property
would have to translate DRM colorimetry into V4L2 values, only for VOP2
to map them back to a CSC matrix.

Store the connector's enum drm_colorspace in the CRTC state instead and
pick the CSC matrix from DRM_MODE_COLORIMETRY_* directly. Since
DRM_MODE_COLORIMETRY_DEFAULT is 0, the zero-initialised state keeps the
current BT.709 behaviour and the encoder assignments can go.

No functional change.

Signed-off-by: Jan Claußen <jan.claussen10@web.de>
---
 .../gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c  |  3 --
 drivers/gpu/drm/rockchip/dw_dp-rockchip.c     |  2 -
 drivers/gpu/drm/rockchip/rockchip_drm_drv.h   |  2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c  | 41 +++++++++----------
 4 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c
index 6db88665060d..87bab11d6f8a 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c
@@ -23,8 +23,6 @@
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_of.h>
 
-#include <uapi/linux/videodev2.h>
-
 #include "rockchip_drm_drv.h"
 
 #define PSEC_PER_SEC			1000000000000LL
@@ -268,7 +266,6 @@ dw_mipi_dsi2_encoder_atomic_check(struct drm_encoder *encoder,
 
 	s->output_type = DRM_MODE_CONNECTOR_DSI;
 	s->bus_flags = info->bus_flags;
-	s->color_space = V4L2_COLORSPACE_DEFAULT;
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/rockchip/dw_dp-rockchip.c b/drivers/gpu/drm/rockchip/dw_dp-rockchip.c
index b23efb153c9e..412796435af6 100644
--- a/drivers/gpu/drm/rockchip/dw_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_dp-rockchip.c
@@ -10,7 +10,6 @@
 #include <linux/media-bus-format.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
-#include <linux/videodev2.h>
 
 #include <drm/bridge/dw_dp.h>
 #include <drm/drm_atomic_helper.h>
@@ -62,7 +61,6 @@ static int dw_dp_encoder_atomic_check(struct drm_encoder *encoder,
 	s->output_type = DRM_MODE_CONNECTOR_DisplayPort;
 	s->bus_format = bus_format;
 	s->bus_flags = di->bus_flags;
-	s->color_space = V4L2_COLORSPACE_DEFAULT;
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
index 4705dc6b8bd7..9c0d744ed95b 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
@@ -56,7 +56,7 @@ struct rockchip_crtc_state {
 	bool yuv_overlay;
 	u32 bus_format;
 	u32 bus_flags;
-	int color_space;
+	enum drm_colorspace colorspace;
 };
 #define to_rockchip_crtc_state(s) \
 		container_of(s, struct rockchip_crtc_state, base)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index bfb384142568..91453621546a 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -33,8 +33,6 @@
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_vblank.h>
 
-#include <uapi/linux/videodev2.h>
-
 #include "rockchip_drm_gem.h"
 #include "rockchip_drm_vop2.h"
 #include "rockchip_rgb.h"
@@ -647,20 +645,19 @@ static void vop2_setup_scale(struct vop2 *vop2, const struct vop2_win *win,
 	}
 }
 
-static int vop2_convert_csc_mode(int csc_mode)
+static enum vop_csc_format
+vop2_convert_csc_mode(enum drm_colorspace colorspace)
 {
-	switch (csc_mode) {
-	case V4L2_COLORSPACE_SMPTE170M:
-	case V4L2_COLORSPACE_470_SYSTEM_M:
-	case V4L2_COLORSPACE_470_SYSTEM_BG:
+	switch (colorspace) {
+	case DRM_MODE_COLORIMETRY_SMPTE_170M_YCC:
+	case DRM_MODE_COLORIMETRY_XVYCC_601:
+	case DRM_MODE_COLORIMETRY_SYCC_601:
+	case DRM_MODE_COLORIMETRY_OPYCC_601:
+	case DRM_MODE_COLORIMETRY_BT601_YCC:
 		return CSC_BT601L;
-	case V4L2_COLORSPACE_REC709:
-	case V4L2_COLORSPACE_SMPTE240M:
-	case V4L2_COLORSPACE_DEFAULT:
-		return CSC_BT709L;
-	case V4L2_COLORSPACE_JPEG:
-		return CSC_BT601F;
-	case V4L2_COLORSPACE_BT2020:
+	case DRM_MODE_COLORIMETRY_BT2020_RGB:
+	case DRM_MODE_COLORIMETRY_BT2020_YCC:
+	case DRM_MODE_COLORIMETRY_BT2020_CYCC:
 		return CSC_BT2020L;
 	default:
 		return CSC_BT709L;
@@ -707,8 +704,8 @@ static void vop2_setup_csc_mode(struct vop2_video_port *vp,
 	struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(vp->crtc.state);
 	int is_input_yuv = pstate->fb->format->is_yuv;
 	int is_output_yuv = is_yuv_output(vcstate->bus_format);
-	int input_csc = V4L2_COLORSPACE_DEFAULT;
-	int output_csc = vcstate->color_space;
+	enum drm_colorspace input_csc = DRM_MODE_COLORIMETRY_DEFAULT;
+	enum drm_colorspace output_csc = vcstate->colorspace;
 	bool r2y_en, y2r_en;
 	int csc_mode;
 
@@ -797,10 +794,10 @@ vop2_rgb2yuv_get_matrix(enum vop_csc_format csc)
 }
 
 /* Convert an RGB (16bpc) to YUV444 (16bpc). */
-static void vop2_rgb16_to_yuv16(int v4l2_cs, u16 r, u16 g, u16 b,
-				u16 *y, u16 *cb, u16 *cr)
+static void vop2_rgb16_to_yuv16(enum drm_colorspace colorspace,
+				u16 r, u16 g, u16 b, u16 *y, u16 *cb, u16 *cr)
 {
-	enum vop_csc_format csc = vop2_convert_csc_mode(v4l2_cs);
+	enum vop_csc_format csc = vop2_convert_csc_mode(colorspace);
 	const struct rgb2yuv_matrix *m = vop2_rgb2yuv_get_matrix(csc);
 	s64 rs = r, gs = g, bs = b;
 	s64 ys, cbs, crs;
@@ -1652,7 +1649,7 @@ static void vop2_bgcolor_setup(struct drm_crtc *crtc, bool force,
 	u32 val;
 
 	if (!force && old_crtc_state->background_color == bgcolor &&
-	    old_vcstate->color_space == new_vcstate->color_space)
+	    old_vcstate->colorspace == new_vcstate->colorspace)
 		return;
 
 	/*
@@ -1660,7 +1657,7 @@ static void vop2_bgcolor_setup(struct drm_crtc *crtc, bool force,
 	 * format when operating in YUV overlay mode, and RGB otherwise.
 	 */
 	if (new_vcstate->yuv_overlay) {
-		vop2_rgb16_to_yuv16(new_vcstate->color_space,
+		vop2_rgb16_to_yuv16(new_vcstate->colorspace,
 				    DRM_ARGB64_GETR(bgcolor),
 				    DRM_ARGB64_GETG(bgcolor),
 				    DRM_ARGB64_GETB(bgcolor),
@@ -2140,7 +2137,7 @@ static int vop2_crtc_state_dump(struct drm_crtc *crtc, struct seq_file *s)
 	seq_printf(s, "\tbus_format[%x]: %s\n", vcstate->bus_format,
 		   drm_get_bus_format_name(vcstate->bus_format));
 	seq_printf(s, "\toutput_mode[%x]", vcstate->output_mode);
-	seq_printf(s, " color_space[%d]\n", vcstate->color_space);
+	seq_printf(s, " colorspace[%d]\n", vcstate->colorspace);
 	seq_printf(s, "\tbackground color (10bpc): r=0x%x g=0x%x b=0x%x\n",
 		   DRM_ARGB64_GETR_BPCS(cstate->background_color, 10),
 		   DRM_ARGB64_GETG_BPCS(cstate->background_color, 10),
-- 
2.56.0



  reply	other threads:[~2026-11-21 16:09 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-21 16:06 [PATCH v6 0/8] drm: Add colorspace property support to the HDMI helpers Jan Claußen
2026-11-21 16:06 ` Jan Claußen [this message]
2026-11-21 16:06 ` [PATCH v6 7/8] drm/rockchip: dw_hdmi_qp: Set the VOP2 color space from the connector Jan Claußen
2026-11-21 16:07 ` [PATCH v6 8/8] drm/rockchip: dw_hdmi_qp: Advertise BT.709 and BT.2020 colorimetries Jan Claußen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261121160725.6344-7-jan.claussen10@web.de \
    --to=jan.claussen10@web.de \
    --cc=airlied@gmail.com \
    --cc=andy.yan@rock-chips.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=heiko@sntech.de \
    --cc=hjc@rock-chips.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=simona@ffwll.ch \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox