mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 12:40:16 +04:00
Shiji Yang
8f638f9366
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.91 Remove upstreamed patches: - airoha/patches-6.12/017-v6.13-net-airoha-Implement-BQL-support.patch[1] - airoha/patches-6.12/138-v7.1-net-airoha-Add-missing-RX_CPU_IDX-configuration-in-a.patch[2] - airoha/patches-6.12/149-v7.1-net-airoha-Move-ndesc-initialization-at-end-of-airoh.patch[3] - generic/backport-6.12/940-v7.1-net-dsa-realtek-rtl8365mb-fix-mode-mask-calculation.patch[5] Manually rebased patches: - airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch[1] - ath79/patches-6.12/800-leds-add-reset-controller-based-driver.patch[4] - bcm27xx/patches-6.12/950-0122-bcmgenet-Better-coalescing-parameter-defaults.patch[6] We also backported four patches to fix perf tool regression: - generic/backport-6.12/216-01-revert-perf-cgroup-update-metric-leader-in-evlist__e.patch - generic/backport-6.12/216-02-revert-perf-tool_pmu-fix-aggregation-on-duration_tim.patch - generic/backport-6.12/216-03-revert-perf-python-add-parse_events-function.patch - generic/backport-6.12/216-04-revert-perf-tool_pmu-factor-tool-events-into-their-o.patch All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=ca24fcac1daaa5e8a667981d81986a3eb4b9fb04 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=f00037a99bc2332ef59dc85298b98b20af165904 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=d36be272adda7f313e39dd118086955d993bf6a7 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=07d3611389ba7d78b80ea360a42ce32ab2521fbc [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=3354d6c62fd4baa7b32cbd80cc5a8aa3f2bd0656 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=b84351dcc359667bc952131c1424b692ec83dce2 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/23444 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From e6d477a23563767b25d36f42b1f41ff109a6e8da Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ma=C3=ADra=20Canal?= <mcanal@igalia.com>
|
|
Date: Wed, 30 Apr 2025 18:36:38 -0300
|
|
Subject: [PATCH] drm/v3d: Don't retrieve the clock twice
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Upstream commit d3976b4e3830 ("drm/v3d: Add clock handling") introduced
|
|
clock handling. Therefore, delete the clock handling previously
|
|
introduced in downstream.
|
|
|
|
Signed-off-by: Maíra Canal <mcanal@igalia.com>
|
|
---
|
|
drivers/gpu/drm/v3d/v3d_drv.c | 19 ++++++++-----------
|
|
1 file changed, 8 insertions(+), 11 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_drv.c
|
|
+++ b/drivers/gpu/drm/v3d/v3d_drv.c
|
|
@@ -405,21 +405,18 @@ static int v3d_platform_drm_probe(struct
|
|
}
|
|
}
|
|
|
|
- v3d->clk = devm_clk_get(dev, NULL);
|
|
- if (IS_ERR_OR_NULL(v3d->clk)) {
|
|
- if (PTR_ERR(v3d->clk) != -EPROBE_DEFER)
|
|
- dev_err(dev, "Failed to get clock (%ld)\n", PTR_ERR(v3d->clk));
|
|
- return PTR_ERR(v3d->clk);
|
|
- }
|
|
-
|
|
node = rpi_firmware_find_node();
|
|
- if (!node)
|
|
- return -EINVAL;
|
|
+ if (!node) {
|
|
+ ret = -EINVAL;
|
|
+ goto clk_disable;
|
|
+ }
|
|
|
|
firmware = rpi_firmware_get(node);
|
|
of_node_put(node);
|
|
- if (!firmware)
|
|
- return -EPROBE_DEFER;
|
|
+ if (!firmware) {
|
|
+ ret = -EPROBE_DEFER;
|
|
+ goto clk_disable;
|
|
+ }
|
|
|
|
v3d->clk_up_rate = rpi_firmware_clk_get_max_rate(firmware,
|
|
RPI_FIRMWARE_V3D_CLK_ID);
|