mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
ee67afeda9
This refreshes the patches on top of kernel 5.4.127. Deleted (upstreamed): bcm27xx/patches-5.10/950-0005-Revert-mailbox-avoid-timer-start-from-callback.patch [0] bcm27xx/patches-5.10/950-0678-bcm2711_thermal-Don-t-clamp-temperature-at-zero.patch [1] Needed manual modifications: bcm27xx/patches-5.10/950-0410-drm-atomic-Pass-the-full-state-to-CRTC-atomic-begin-.patch [0]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.127&id=bb2220e0672b7433a9a42618599cd261b2629240 [1]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.127&id=83603802954068ccd1b8a3f2ccbbaf5e0862acb0 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
71 lines
2.1 KiB
Diff
71 lines
2.1 KiB
Diff
From 09157702811f9e2144a769aef1f2269306fe86bb Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Tue, 6 Oct 2020 18:44:42 +0100
|
|
Subject: [PATCH] drm/vc4: Add debugfs node that dumps the current
|
|
display lists
|
|
|
|
This allows easy analysis of display lists when debugging.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 41 +++++++++++++++++++++++++++++++++++
|
|
1 file changed, 41 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
@@ -95,6 +95,45 @@ static int vc4_hvs_debugfs_underrun(stru
|
|
return 0;
|
|
}
|
|
|
|
+static int vc4_hvs_debugfs_dlist(struct seq_file *m, void *data)
|
|
+{
|
|
+ struct drm_info_node *node = m->private;
|
|
+ struct drm_device *dev = node->minor->dev;
|
|
+ struct vc4_dev *vc4 = to_vc4_dev(dev);
|
|
+ struct drm_printer p = drm_seq_file_printer(m);
|
|
+ unsigned int next_entry_start = 0;
|
|
+ unsigned int i, j;
|
|
+ u32 dlist_word, dispstat;
|
|
+
|
|
+ for (i = 0; i < SCALER_CHANNELS_COUNT; i++) {
|
|
+ dispstat = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTATX(i)),
|
|
+ SCALER_DISPSTATX_MODE);
|
|
+ if (dispstat == SCALER_DISPSTATX_MODE_DISABLED ||
|
|
+ dispstat == SCALER_DISPSTATX_MODE_EOF) {
|
|
+ drm_printf(&p, "HVS chan %u disabled\n", i);
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ drm_printf(&p, "HVS chan %u:\n", i);
|
|
+
|
|
+ for (j = HVS_READ(SCALER_DISPLISTX(i)); j < 256; j++) {
|
|
+ dlist_word = readl((u32 __iomem *)vc4->hvs->dlist + j);
|
|
+ drm_printf(&p, "dlist: %02d: 0x%08x\n", j,
|
|
+ dlist_word);
|
|
+ if (!next_entry_start ||
|
|
+ next_entry_start == j) {
|
|
+ if (dlist_word & SCALER_CTL0_END)
|
|
+ break;
|
|
+ next_entry_start = j +
|
|
+ VC4_GET_FIELD(dlist_word,
|
|
+ SCALER_CTL0_SIZE);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
/* The filter kernel is composed of dwords each containing 3 9-bit
|
|
* signed integers packed next to each other.
|
|
*/
|
|
@@ -687,6 +726,8 @@ static int vc4_hvs_bind(struct device *d
|
|
vc4_debugfs_add_regset32(drm, "hvs_regs", &hvs->regset);
|
|
vc4_debugfs_add_file(drm, "hvs_underrun", vc4_hvs_debugfs_underrun,
|
|
NULL);
|
|
+ vc4_debugfs_add_file(drm, "hvs_dlists", vc4_hvs_debugfs_dlist,
|
|
+ NULL);
|
|
|
|
return 0;
|
|
}
|