251a382c28
Deleted (upstreamed): generic/backport-5.15/400-mtdblock-warn-if-opened-on-NAND.patch [01] generic/backport-5.15/420-v5.19-01-mtd-spinand-gigadevice-fix-Quad-IO-for-GD5F1GQ5UExxG.patch [02] bcm27xx/patches-5.15/950-0029-Revert-mailbox-avoid-timer-start-from-callback.patch [03] bcm27xx/patches-5.15/950-0417-bcm2711_thermal-Don-t-clamp-temperature-at-zero.patch [04] bcm27xx/patches-5.15/950-0740-drm-vc4-hvs-Fix-frame-count-register-readout.patch [05] bcm27xx/patches-5.15/950-0755-drm-vc4-hvs-Reset-muxes-at-probe-time.patch [06] bcm27xx/patches-5.15/950-0759-drm-vc4-txp-Don-t-set-TXP_VSTART_AT_EOF.patch [07] bcm27xx/patches-5.15/950-0760-drm-vc4-txp-Force-alpha-to-be-0xff-if-it-s-disabled.patch [08] bcm53xx/patches-5.15/031-v5.17-0005-ARM-dts-BCM5301X-update-CRU-block-description.patch [09] mediatek/patches-5.15/102-mt7629-enable-arch-timer.patch [10] Manually rebased: bcm27xx/patches-5.15/950-0741-drm-vc4-hvs-Use-pointer-to-HVS-in-HVS_READ-and-HVS_W.patch [01] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=f41c9418c5898c01634675150696da290fb86796 [02] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=d5b66645305c6f3a1b2cf75cee4157b07f293309 [03] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=119f99209d8531359bcb935f252ec435f9d21b13 [04] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=c4e1280abead1552e1764684079a43e222ccd163 [05] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=08465a1889cb48ec64431e9db745b5be15399251 [06] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=0e26a6da02e63b75b629573d13966c36aa6264f0 [07] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=01c9020b2e7c85e394879f34851805179ac3d1d8 [08] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=d47f85cc0171a5d3c5bd8cbb8a98983ca3357cbd [09] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=5151f24ac937ff7eb1f078257c66e3c0f0296010 [10] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.46&id=ffea838686b82fbb2801cdfad6ba5309d15c032d Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
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
|
|
@@ -697,6 +697,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
|
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;
|
|
@@ -737,8 +738,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
|
/* 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
|
|
@@ -752,7 +753,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
|
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) {
|
|
@@ -775,7 +776,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
|
|
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) {
|