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>
62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From 41d939b210865e7ba3469916844e684665e31521 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Fri, 27 Oct 2023 16:46:04 +0100
|
|
Subject: [PATCH 0711/1085] drm/vc4: Add hvs_dlist_allocs debugfs function.
|
|
|
|
Users are reporting running out of DLIST memory. Add a
|
|
debugfs file to dump out all the allocations.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 32 ++++++++++++++++++++++++++++++++
|
|
1 file changed, 32 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
@@ -347,6 +347,36 @@ static int vc5_hvs_debugfs_gamma(struct
|
|
return 0;
|
|
}
|
|
|
|
+static int vc4_hvs_debugfs_dlist_allocs(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 vc4_hvs *hvs = vc4->hvs;
|
|
+ struct drm_printer p = drm_seq_file_printer(m);
|
|
+ struct vc4_hvs_dlist_allocation *cur, *next;
|
|
+ struct drm_mm_node *mm_node;
|
|
+ unsigned long flags;
|
|
+
|
|
+ spin_lock_irqsave(&hvs->mm_lock, flags);
|
|
+
|
|
+ drm_printf(&p, "Allocated nodes:\n");
|
|
+ list_for_each_entry(mm_node, drm_mm_nodes(&hvs->dlist_mm), node_list) {
|
|
+ drm_printf(&p, "node [%08llx + %08llx]\n", mm_node->start, mm_node->size);
|
|
+ }
|
|
+
|
|
+ drm_printf(&p, "Stale nodes:\n");
|
|
+ list_for_each_entry_safe(cur, next, &hvs->stale_dlist_entries, node) {
|
|
+ drm_printf(&p, "node [%08llx + %08llx] channel %u frcnt %u\n",
|
|
+ cur->mm_node.start, cur->mm_node.size, cur->channel,
|
|
+ cur->target_frame_count);
|
|
+ }
|
|
+
|
|
+ spin_unlock_irqrestore(&hvs->mm_lock, flags);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
/* The filter kernel is composed of dwords each containing 3 9-bit
|
|
* signed integers packed next to each other.
|
|
*/
|
|
@@ -1555,6 +1585,8 @@ int vc4_hvs_debugfs_init(struct drm_mino
|
|
|
|
drm_debugfs_add_file(drm, "hvs_underrun", vc4_hvs_debugfs_underrun, NULL);
|
|
|
|
+ drm_debugfs_add_file(drm, "hvs_dlist_allocs", vc4_hvs_debugfs_dlist_allocs, NULL);
|
|
+
|
|
vc4_debugfs_add_regset32(drm, "hvs_regs", &hvs->regset);
|
|
|
|
return 0;
|