47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From 2163477b39ed25362d5679d0cf9b843fe2c4bfbb Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Thu, 6 May 2021 17:01:46 +0200
|
|
Subject: [PATCH] drm/vc4: crtc: Pass the drm_atomic_state to config_pv
|
|
|
|
The vc4_crtc_config_pv will need to access the drm_atomic_state
|
|
structure and its only parent function, vc4_crtc_atomic_enable already
|
|
has access to it. Let's pass it as a parameter.
|
|
|
|
Fixes: 792c3132bc1b ("drm/vc4: encoder: Add finer-grained encoder callbacks")
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_crtc.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
@@ -305,7 +305,7 @@ static void vc4_crtc_pixelvalve_reset(st
|
|
CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_FIFO_CLR);
|
|
}
|
|
|
|
-static void vc4_crtc_config_pv(struct drm_crtc *crtc)
|
|
+static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_atomic_state *state)
|
|
{
|
|
struct drm_device *dev = crtc->dev;
|
|
struct vc4_dev *vc4 = to_vc4_dev(dev);
|
|
@@ -313,8 +313,8 @@ static void vc4_crtc_config_pv(struct dr
|
|
struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);
|
|
struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
|
|
const struct vc4_pv_data *pv_data = vc4_crtc_to_vc4_pv_data(vc4_crtc);
|
|
- struct drm_crtc_state *state = crtc->state;
|
|
- struct drm_display_mode *mode = &state->adjusted_mode;
|
|
+ struct drm_crtc_state *crtc_state = crtc->state;
|
|
+ struct drm_display_mode *mode = &crtc_state->adjusted_mode;
|
|
bool interlace = mode->flags & DRM_MODE_FLAG_INTERLACE;
|
|
u32 pixel_rep = (mode->flags & DRM_MODE_FLAG_DBLCLK) ? 2 : 1;
|
|
bool is_dsi = (vc4_encoder->type == VC4_ENCODER_TYPE_DSI0 ||
|
|
@@ -540,7 +540,7 @@ static void vc4_crtc_atomic_enable(struc
|
|
if (vc4_encoder->pre_crtc_configure)
|
|
vc4_encoder->pre_crtc_configure(encoder, state);
|
|
|
|
- vc4_crtc_config_pv(crtc);
|
|
+ vc4_crtc_config_pv(crtc, state);
|
|
|
|
CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_EN);
|
|
|