64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
From 8c8b3c5a94eb8b5f6a2b0c0c20a25643842646f7 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Mon, 18 Jan 2021 09:51:12 +0100
|
|
Subject: [PATCH] drm/vc4: hdmi: Change CSC callback prototype
|
|
|
|
In order to support the YUV output, we'll need the atomic state to know
|
|
what is the state of the associated property in the CSC setup callback.
|
|
|
|
Let's change the prototype of that callback to allow us to access it.
|
|
|
|
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 7 ++++++-
|
|
drivers/gpu/drm/vc4/vc4_hdmi.h | 1 +
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -742,6 +742,7 @@ static void vc4_hdmi_encoder_post_crtc_p
|
|
}
|
|
|
|
static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
|
|
+ struct drm_connector_state *state,
|
|
const struct drm_display_mode *mode)
|
|
{
|
|
unsigned long flags;
|
|
@@ -829,6 +830,7 @@ static void vc5_hdmi_set_csc_coeffs(stru
|
|
}
|
|
|
|
static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
|
|
+ struct drm_connector_state *state,
|
|
const struct drm_display_mode *mode)
|
|
{
|
|
unsigned long flags;
|
|
@@ -1141,13 +1143,16 @@ static void vc4_hdmi_encoder_pre_crtc_en
|
|
struct drm_atomic_state *state)
|
|
{
|
|
struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
|
|
+ struct drm_connector *connector = &vc4_hdmi->connector;
|
|
struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode;
|
|
+ struct drm_connector_state *conn_state =
|
|
+ drm_atomic_get_new_connector_state(state, connector);
|
|
unsigned long flags;
|
|
|
|
mutex_lock(&vc4_hdmi->mutex);
|
|
|
|
if (vc4_hdmi->variant->csc_setup)
|
|
- vc4_hdmi->variant->csc_setup(vc4_hdmi, mode);
|
|
+ vc4_hdmi->variant->csc_setup(vc4_hdmi, conn_state, mode);
|
|
|
|
spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
|
|
HDMI_WRITE(HDMI_FIFO_CTL, VC4_HDMI_FIFO_CTL_MASTER_SLAVE_N);
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
@@ -77,6 +77,7 @@ struct vc4_hdmi_variant {
|
|
|
|
/* Callback to enable / disable the CSC */
|
|
void (*csc_setup)(struct vc4_hdmi *vc4_hdmi,
|
|
+ struct drm_connector_state *state,
|
|
const struct drm_display_mode *mode);
|
|
|
|
/* Callback to configure the video timings in the HDMI block */
|