mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-20 14:38:20 +02:00
8299d1f057
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted patches, wireless patches and defconfig patches. bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 4B v1.1 4G bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 23771cfafeedba325b6e9d7dedde11eb25381d67 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Mon, 14 Jun 2021 15:27:24 +0200
|
|
Subject: [PATCH] drm/vc4: crtc: Add encoder to vc4_crtc_config_pv
|
|
prototype
|
|
|
|
vc4_crtc_config_pv() retrieves the encoder again, even though its only
|
|
caller, vc4_crtc_atomic_enable(), already did.
|
|
|
|
Pass the encoder pointer as an argument instead of going through all the
|
|
connectors to retrieve it again.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_crtc.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
|
|
@@ -313,12 +313,11 @@ 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, struct drm_atomic_state *state)
|
|
+static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_encoder *encoder,
|
|
+ struct drm_atomic_state *state)
|
|
{
|
|
struct drm_device *dev = crtc->dev;
|
|
struct vc4_dev *vc4 = to_vc4_dev(dev);
|
|
- struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, state,
|
|
- drm_atomic_get_new_connector_state);
|
|
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);
|
|
@@ -581,7 +580,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, state);
|
|
+ vc4_crtc_config_pv(crtc, encoder, state);
|
|
|
|
CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_EN);
|
|
|