9af0e94fa6
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>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 5158e28769)
80 lines
2.6 KiB
Diff
80 lines
2.6 KiB
Diff
From f2583edf6b5b26d6e5525728f57befeca112d253 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 4 Jan 2024 12:02:43 +0000
|
|
Subject: [PATCH 0810/1085] drm/vc4: Fix reading of frame count on GEN5 / Pi4
|
|
|
|
The frame count values moved within registers DISPSTAT1 and
|
|
DISPSTAT2 with GEN5, so update the accessor function to
|
|
accommodate that.
|
|
|
|
Fixes: b51cd7ad143d ("drm/vc4: hvs: Fix frame count register readout")
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 23 +++++++++++++++++++++--
|
|
drivers/gpu/drm/vc4/vc4_regs.h | 6 ++++++
|
|
2 files changed, 27 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
@@ -826,10 +826,28 @@ u8 vc4_hvs_get_fifo_frame_count(struct v
|
|
if (!drm_dev_enter(drm, &idx))
|
|
return 0;
|
|
|
|
- if (vc4->gen >= VC4_GEN_6) {
|
|
+ switch (vc4->gen) {
|
|
+ case VC4_GEN_6:
|
|
field = VC4_GET_FIELD(HVS_READ(SCALER6_DISPX_STATUS(fifo)),
|
|
SCALER6_DISPX_STATUS_FRCNT);
|
|
- } else {
|
|
+ break;
|
|
+ case VC4_GEN_5:
|
|
+ switch (fifo) {
|
|
+ case 0:
|
|
+ field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
|
|
+ SCALER5_DISPSTAT1_FRCNT0);
|
|
+ break;
|
|
+ case 1:
|
|
+ field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
|
|
+ SCALER5_DISPSTAT1_FRCNT1);
|
|
+ break;
|
|
+ case 2:
|
|
+ field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT2),
|
|
+ SCALER5_DISPSTAT2_FRCNT2);
|
|
+ break;
|
|
+ }
|
|
+ break;
|
|
+ case VC4_GEN_4:
|
|
switch (fifo) {
|
|
case 0:
|
|
field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
|
|
@@ -844,6 +862,7 @@ u8 vc4_hvs_get_fifo_frame_count(struct v
|
|
SCALER_DISPSTAT2_FRCNT2);
|
|
break;
|
|
}
|
|
+ break;
|
|
}
|
|
|
|
drm_dev_exit(idx);
|
|
--- a/drivers/gpu/drm/vc4/vc4_regs.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_regs.h
|
|
@@ -424,6 +424,10 @@
|
|
# define SCALER_DISPSTAT1_FRCNT0_SHIFT 18
|
|
# define SCALER_DISPSTAT1_FRCNT1_MASK VC4_MASK(17, 12)
|
|
# define SCALER_DISPSTAT1_FRCNT1_SHIFT 12
|
|
+# define SCALER5_DISPSTAT1_FRCNT0_MASK VC4_MASK(25, 20)
|
|
+# define SCALER5_DISPSTAT1_FRCNT0_SHIFT 20
|
|
+# define SCALER5_DISPSTAT1_FRCNT1_MASK VC4_MASK(19, 14)
|
|
+# define SCALER5_DISPSTAT1_FRCNT1_SHIFT 14
|
|
|
|
#define SCALER_DISPSTATX(x) (SCALER_DISPSTAT0 + \
|
|
(x) * (SCALER_DISPSTAT1 - \
|
|
@@ -442,6 +446,8 @@
|
|
#define SCALER_DISPSTAT2 0x00000068
|
|
# define SCALER_DISPSTAT2_FRCNT2_MASK VC4_MASK(17, 12)
|
|
# define SCALER_DISPSTAT2_FRCNT2_SHIFT 12
|
|
+# define SCALER5_DISPSTAT2_FRCNT2_MASK VC4_MASK(19, 14)
|
|
+# define SCALER5_DISPSTAT2_FRCNT2_SHIFT 14
|
|
|
|
#define SCALER_DISPBASE2 0x0000006c
|
|
#define SCALER_DISPALPHA2 0x00000070
|