mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-18 21:28:02 +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>
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
From e546f85606dcf2cdff94ff32a0756e2541bccb05 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Wed, 25 Jan 2023 13:05:26 +0100
|
|
Subject: [PATCH 0033/1085] drm/vc4: hvs: Destroy dlist allocations immediately
|
|
when running a test
|
|
|
|
When running a kunit test, the driver runs with a mock device. As such,
|
|
any attempt to read or write to a hardware register will fail the
|
|
current test immediately.
|
|
|
|
The dlist allocation management recently introduced will read the
|
|
current frame count from the HVS to defer its destruction until a
|
|
subsequent frame has been output. This obviously involves a register
|
|
read that fails the Kunit tests.
|
|
|
|
Change the destruction deferral function to destroy the allocation
|
|
immediately if we run under kunit. This is essentially harmless since
|
|
the main reason for that deferall is to prevent any access to the
|
|
hardware dlist while a frame described by that list is rendered. On our
|
|
mock driver, we have neither a hardware dlist nor a rendering, so it
|
|
doesn't matter.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
@@ -495,6 +495,18 @@ void vc4_hvs_mark_dlist_entry_stale(stru
|
|
if (!drm_mm_node_allocated(&alloc->mm_node))
|
|
return;
|
|
|
|
+ /*
|
|
+ * Kunit tests run with a mock device and we consider any hardware
|
|
+ * access a test failure. Let's free the dlist allocation right away if
|
|
+ * we're running under kunit, we won't risk a dlist corruption anyway.
|
|
+ */
|
|
+ if (kunit_get_current_test()) {
|
|
+ spin_lock_irqsave(&hvs->mm_lock, flags);
|
|
+ vc4_hvs_free_dlist_entry_locked(hvs, alloc);
|
|
+ spin_unlock_irqrestore(&hvs->mm_lock, flags);
|
|
+ return;
|
|
+ }
|
|
+
|
|
frcnt = vc4_hvs_get_fifo_frame_count(hvs, alloc->channel);
|
|
alloc->target_frame_count = (frcnt + 1) & ((1 << 6) - 1);
|
|
|