8f9e91ad03
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
49 lines
1.4 KiB
Diff
49 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
|
|
@@ -395,21 +395,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);
|