mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
5158e28769
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.64 Manually rebased: generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch bcm27xx/patches-6.6/950-0585-drm-vc4-Introduce-generation-number-enum.patch bcm27xx/patches-6.6/950-0610-drm-vc4-hvs-Support-BCM2712-HVS.patch bcm27xx/patches-6.6/950-0829-vc4-hvs-Add-support-for-D0-register-changes.patch Removed upstreamed: bcm27xx/patches-6.6/950-0597-drm-vc4-hdmi-Avoid-hang-with-debug-registers-when-su.patch[1] bcm27xx/patches-6.6/950-0599-drm-vc4-Fix-dlist-debug-not-resetting-the-next-entry.patch[2] bcm27xx/patches-6.6/950-0600-drm-vc4-Remove-incorrect-limit-from-hvs_dlist-debugf.patch[3] bcm27xx/patches-6.6/950-0708-drm-vc4-Correct-logic-on-stopping-an-HVS-channel.patch[4] ramips/patches-6.6/002-01-v6.13-clk-ralink-mtmips-fix-clock-plan-for-Ralink-SoC-RT38.patch[5] ramips/patches-6.6/002-02-v6.13-clk-ralink-mtmips-fix-clocks-probe-order-in-oldest-r.patch[6] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=223ee2567a55e4f80315c768d2969e6a3b9fb23d 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=8182b5ca19c6f173b6498d1c6d3e4b034b76bbde 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=52c1716f65a558174e381360bd88f18dae4be85c 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=9728b508b01a5eeeac79ceb676364c674dd951ac 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=f85a1d06afbcc57ac44176db8f9d7a934979952c 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=fbb13732c6ffa9d58cedafabcd5ce8fd7ef8ae5a Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Co-authored-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/17217 Signed-off-by: Robert Marko <robimarko@gmail.com>
75 lines
1.9 KiB
Diff
75 lines
1.9 KiB
Diff
From 99399a38b0bae58af42d8f278f92440c593b0715 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 17 Feb 2023 15:07:29 +0100
|
|
Subject: [PATCH 0588/1085] drm/vc4: hvs: Use switch statement to simplify
|
|
enabling/disabling irq
|
|
|
|
Since we'll support BCM2712 soon, let's move the logic to enable and
|
|
disable the end-of-frame interrupts to a switch to extend it more
|
|
easily.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 42 ++++++++++++++++++++++++++---------
|
|
1 file changed, 32 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
@@ -421,24 +421,46 @@ static void vc4_hvs_irq_enable_eof(const
|
|
unsigned int channel)
|
|
{
|
|
struct vc4_dev *vc4 = hvs->vc4;
|
|
- u32 irq_mask = vc4->gen == VC4_GEN_5 ?
|
|
- SCALER5_DISPCTRL_DSPEIEOF(channel) :
|
|
- SCALER_DISPCTRL_DSPEIEOF(channel);
|
|
|
|
- HVS_WRITE(SCALER_DISPCTRL,
|
|
- HVS_READ(SCALER_DISPCTRL) | irq_mask);
|
|
+ switch (vc4->gen) {
|
|
+ case VC4_GEN_4:
|
|
+ HVS_WRITE(SCALER_DISPCTRL,
|
|
+ HVS_READ(SCALER_DISPCTRL) |
|
|
+ SCALER_DISPCTRL_DSPEIEOF(channel));
|
|
+ break;
|
|
+
|
|
+ case VC4_GEN_5:
|
|
+ HVS_WRITE(SCALER_DISPCTRL,
|
|
+ HVS_READ(SCALER_DISPCTRL) |
|
|
+ SCALER5_DISPCTRL_DSPEIEOF(channel));
|
|
+ break;
|
|
+
|
|
+ default:
|
|
+ break;
|
|
+ }
|
|
}
|
|
|
|
static void vc4_hvs_irq_clear_eof(const struct vc4_hvs *hvs,
|
|
unsigned int channel)
|
|
{
|
|
struct vc4_dev *vc4 = hvs->vc4;
|
|
- u32 irq_mask = vc4->gen == VC4_GEN_5 ?
|
|
- SCALER5_DISPCTRL_DSPEIEOF(channel) :
|
|
- SCALER_DISPCTRL_DSPEIEOF(channel);
|
|
|
|
- HVS_WRITE(SCALER_DISPCTRL,
|
|
- HVS_READ(SCALER_DISPCTRL) & ~irq_mask);
|
|
+ switch (vc4->gen) {
|
|
+ case VC4_GEN_4:
|
|
+ HVS_WRITE(SCALER_DISPCTRL,
|
|
+ HVS_READ(SCALER_DISPCTRL) &
|
|
+ ~SCALER_DISPCTRL_DSPEIEOF(channel));
|
|
+ break;
|
|
+
|
|
+ case VC4_GEN_5:
|
|
+ HVS_WRITE(SCALER_DISPCTRL,
|
|
+ HVS_READ(SCALER_DISPCTRL) &
|
|
+ ~SCALER5_DISPCTRL_DSPEIEOF(channel));
|
|
+ break;
|
|
+
|
|
+ default:
|
|
+ break;
|
|
+ }
|
|
}
|
|
|
|
static struct vc4_hvs_dlist_allocation *
|