Skip to content

Commit affe714

Browse files
mripardmdiewa
authored andcommitted
Revert "drm/vc4: Correct interrupt enable bits on hvs4"
BugLink: https://bugs.launchpad.net/bugs/1964144 This reverts commit fae5987. (cherry picked from commit 1db761647f65dd032d4f3921bf91f9ff3ff8e76e rpi-5.15.y) Signed-off-by: Juerg Haefliger <juergh@canonical.com>
1 parent 32d83b0 commit affe714

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/vc4/vc4_hvs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ static void vc4_hvs_install_dlist(struct vc4_dev *vc4, unsigned int channel)
644644
hvs->fifo[channel].pending = false;
645645

646646
reg = HVS_READ(SCALER_DISPCTRL);
647-
reg &= ~BIT(7 + (channel * (vc4->hvs->hvs5 ? 4 : 2)));
647+
reg &= ~BIT(7 + (channel * 4));
648648
HVS_WRITE(SCALER_DISPCTRL, reg);
649649

650650
spin_unlock_irqrestore(&hvs->hw_dlist_lock, flags);
@@ -664,7 +664,7 @@ static void vc4_hvs_schedule_dlist_update(struct vc4_dev *vc4,
664664
}
665665

666666
HVS_WRITE(SCALER_DISPCTRL,
667-
HVS_READ(SCALER_DISPCTRL) | BIT(7 + (channel * (vc4->hvs->hvs5 ? 4 : 2))));
667+
HVS_READ(SCALER_DISPCTRL) | BIT(7 + (channel * 4)));
668668

669669
hvs->fifo[channel].pending = true;
670670

0 commit comments

Comments
 (0)