2022-05-16 21:40:32 +00:00
|
|
|
From ac0e3e24176b77fa19a7a2e041879f6c5e652122 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
|
|
|
Date: Mon, 29 Nov 2021 12:18:39 +0100
|
|
|
|
|
Subject: [PATCH] drm/vc4: hvs: Store channel in variable
|
|
|
|
|
|
|
|
|
|
The assigned_channel field of our vc4_crtc_state structure is accessed
|
|
|
|
|
multiple times in vc4_hvs_atomic_flush, so let's move it to a variable
|
|
|
|
|
that can be used in all those places.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 9 +++++----
|
|
|
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
2022-06-09 13:19:03 +00:00
|
|
|
@@ -697,6 +697,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
2022-05-16 21:40:32 +00:00
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
|
struct vc4_dev *vc4 = to_vc4_dev(dev);
|
|
|
|
|
struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
|
|
|
|
|
+ unsigned int channel = vc4_state->assigned_channel;
|
|
|
|
|
struct drm_plane *plane;
|
|
|
|
|
struct vc4_plane_state *vc4_plane_state;
|
|
|
|
|
bool debug_dump_regs = false;
|
2022-06-09 13:19:03 +00:00
|
|
|
@@ -737,8 +738,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
2022-05-16 21:40:32 +00:00
|
|
|
/* This sets a black background color fill, as is the case
|
|
|
|
|
* with other DRM drivers.
|
|
|
|
|
*/
|
|
|
|
|
- HVS_WRITE(SCALER_DISPBKGNDX(vc4_state->assigned_channel),
|
|
|
|
|
- HVS_READ(SCALER_DISPBKGNDX(vc4_state->assigned_channel)) |
|
|
|
|
|
+ HVS_WRITE(SCALER_DISPBKGNDX(channel),
|
|
|
|
|
+ HVS_READ(SCALER_DISPBKGNDX(channel)) |
|
|
|
|
|
SCALER_DISPBKGND_FILL);
|
|
|
|
|
|
|
|
|
|
/* Only update DISPLIST if the CRTC was already running and is not
|
2022-06-09 13:19:03 +00:00
|
|
|
@@ -752,7 +753,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
2022-05-16 21:40:32 +00:00
|
|
|
vc4_hvs_update_dlist(crtc);
|
|
|
|
|
|
|
|
|
|
if (crtc->state->color_mgmt_changed) {
|
|
|
|
|
- u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(vc4_state->assigned_channel));
|
|
|
|
|
+ u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel));
|
|
|
|
|
|
|
|
|
|
if (crtc->state->gamma_lut) {
|
|
|
|
|
if (!vc4->hvs->hvs5) {
|
2022-06-09 13:19:03 +00:00
|
|
|
@@ -775,7 +776,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
2022-05-16 21:40:32 +00:00
|
|
|
if (!vc4->hvs->hvs5)
|
|
|
|
|
dispbkgndx &= ~SCALER_DISPBKGND_GAMMA;
|
|
|
|
|
}
|
|
|
|
|
- HVS_WRITE(SCALER_DISPBKGNDX(vc4_state->assigned_channel), dispbkgndx);
|
|
|
|
|
+ HVS_WRITE(SCALER_DISPBKGNDX(channel), dispbkgndx);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (debug_dump_regs) {
|
