drm/vc4: hvs: Store channel in variable
authorMaxime Ripard <maxime@cerno.tech>
Mon, 29 Nov 2021 11:18:39 +0000 (12:18 +0100)
committerDom Cobley <popcornmix@gmail.com>
Mon, 21 Mar 2022 16:04:34 +0000 (16:04 +0000)
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

index a873d9d..2995a27 100644 (file)
@@ -674,6 +674,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
        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;
@@ -714,8 +715,8 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
                /* 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
@@ -729,7 +730,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
                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) {
@@ -752,7 +753,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc,
                        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) {