dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime@cerno.tech>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	Maxime Ripard <maxime@cerno.tech>,
	Daniel Vetter <daniel.vetter@intel.com>,
	David Airlie <airlied@linux.ie>
Cc: Dom Cobley <dom@raspberrypi.com>,
	Tim Gover <tim.gover@raspberrypi.com>,
	Dave Stevenson <dave.stevenson@raspberrypi.com>,
	dri-devel@lists.freedesktop.org,
	Werner Sembach <wse@tuxedocomputers.com>,
	Phil Elwell <phil@raspberrypi.com>
Subject: [PATCH v4 08/16] drm/vc4: hdmi: Replace CSC_CTL hardcoded value by defines
Date: Thu, 20 Jan 2022 16:16:17 +0100	[thread overview]
Message-ID: <20220120151625.594595-9-maxime@cerno.tech> (raw)
In-Reply-To: <20220120151625.594595-1-maxime@cerno.tech>

On BCM2711, the HDMI_CSC_CTL register value has been hardcoded to an
opaque value. Let's replace it with properly defined values.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 drivers/gpu/drm/vc4/vc4_hdmi.c | 5 ++---
 drivers/gpu/drm/vc4/vc4_regs.h | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 0f8b1e907fae..682c3c907cbe 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -779,9 +779,8 @@ static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
 			       const struct drm_display_mode *mode)
 {
 	unsigned long flags;
-	u32 csc_ctl;
-
-	csc_ctl = 0x07;	/* RGB_CONVERT_MODE = custom matrix, || USE_RGB_TO_YCBCR */
+	u32 csc_ctl = VC5_MT_CP_CSC_CTL_ENABLE | VC4_SET_FIELD(VC4_HD_CSC_CTL_MODE_CUSTOM,
+							       VC5_MT_CP_CSC_CTL_MODE);
 
 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
 
diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h
index 7538b84a6dca..33410718089e 100644
--- a/drivers/gpu/drm/vc4/vc4_regs.h
+++ b/drivers/gpu/drm/vc4/vc4_regs.h
@@ -774,6 +774,9 @@ enum {
 # define VC4_HD_CSC_CTL_RGB2YCC			BIT(1)
 # define VC4_HD_CSC_CTL_ENABLE			BIT(0)
 
+# define VC5_MT_CP_CSC_CTL_ENABLE		BIT(2)
+# define VC5_MT_CP_CSC_CTL_MODE_MASK		VC4_MASK(1, 0)
+
 # define VC4_DVP_HT_CLOCK_STOP_PIXEL		BIT(1)
 
 /* HVS display list information. */
-- 
2.34.1


  parent reply	other threads:[~2022-01-20 15:17 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-20 15:16 [PATCH v4 00/16] drm/vc4: hdmi: Yet Another Approach to HDMI YUV output Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 01/16] drm/edid: Rename drm_hdmi_avi_infoframe_colorspace to _colorimetry Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 02/16] drm/edid: Don't clear formats if using deep color Maxime Ripard
2022-01-24  9:00   ` Ville Syrjälä
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 03/16] drm/edid: Split deep color modes between RGB and YUV444 Maxime Ripard
2022-01-24  9:01   ` Ville Syrjälä
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 04/16] drm/connector: Fix typo in output format Maxime Ripard
2022-01-24  9:04   ` Ville Syrjälä
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 05/16] drm/vc4: hdmi: Add full range RGB helper Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 06/16] drm/vc4: hdmi: Use full range helper in csc functions Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 07/16] drm/vc4: hdmi: Move XBAR setup to csc_setup Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` Maxime Ripard [this message]
2022-01-25  9:25   ` (subset) [PATCH v4 08/16] drm/vc4: hdmi: Replace CSC_CTL hardcoded value by defines Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 09/16] drm/vc4: hdmi: Define colorspace matrices Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 10/16] drm/vc4: hdmi: Change CSC callback prototype Maxime Ripard
2022-01-25  9:25   ` (subset) " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 11/16] drm/vc4: hdmi: Move clock validation to its own function Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 12/16] drm/vc4: hdmi: Move clock calculation into " Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 13/16] drm/vc4: hdmi: Take the sink maximum TMDS clock into account Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 14/16] drm/vc4: hdmi: Take bpp into account for the scrambler Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 15/16] drm/vc4: hdmi: Always try to have the highest bpc Maxime Ripard
2022-01-20 15:16 ` [PATCH v4 16/16] drm/vc4: hdmi: Support HDMI YUV output Maxime Ripard

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=20220120151625.594595-9-maxime@cerno.tech \
    --to=maxime@cerno.tech \
    --cc=airlied@linux.ie \
    --cc=daniel.vetter@intel.com \
    --cc=dave.stevenson@raspberrypi.com \
    --cc=dom@raspberrypi.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=phil@raspberrypi.com \
    --cc=tim.gover@raspberrypi.com \
    --cc=tzimmermann@suse.de \
    --cc=wse@tuxedocomputers.com \
    /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