raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

drm/v3d: Don't retrieve the clock twice

Browse Source 
Upstream commit d3976b4e38 ("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>
This commit is contained in:
Maíra Canal
2025-04-30 18:36:38 -03:00
committed by Dom Cobley
parent 1c6197f436
commit aed5527156
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/v3d/v3d_drv.c
View File

@@ -416,21 +416,18 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
} }
} }
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(); node = rpi_firmware_find_node();
if (!node) if (!node) {
return -EINVAL; ret = -EINVAL;
goto clk_disable;
}
firmware = rpi_firmware_get(node); firmware = rpi_firmware_get(node);
of_node_put(node); of_node_put(node);
if (!firmware) if (!firmware) {
return -EPROBE_DEFER; ret = -EPROBE_DEFER;
goto clk_disable;
}
v3d->clk_up_rate = rpi_firmware_clk_get_max_rate(firmware, v3d->clk_up_rate = rpi_firmware_clk_get_max_rate(firmware,
RPI_FIRMWARE_V3D_CLK_ID); RPI_FIRMWARE_V3D_CLK_ID);