Skip to content

Commit 56247d4

Browse files
lategoodbyepopcornmix
authored andcommitted
drm/v3d: Add clock handling
Since the initial commit 57692c9 ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+") the struct v3d_dev reserved a pointer for an optional V3D clock. But there wasn't any code, which fetched it. So add the missing clock handling before accessing any V3D registers. Signed-off-by: Stefan Wahren <wahrenst@gmx.net> Reviewed-by: Maíra Canal <mcanal@igalia.com> Signed-off-by: Maíra Canal <mcanal@igalia.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250201125046.33030-1-wahrenst@gmx.net
1 parent 65b284d commit 56247d4

File tree

1 file changed

+20
-5
lines changed

1 file changed

+20
-5
lines changed

drivers/gpu/drm/v3d/v3d_drv.c

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,21 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
304304
if (ret)
305305
return ret;
306306

307+
v3d->clk = devm_clk_get_optional(dev, NULL);
308+
if (IS_ERR(v3d->clk))
309+
return dev_err_probe(dev, PTR_ERR(v3d->clk), "Failed to get V3D clock\n");
310+
311+
ret = clk_prepare_enable(v3d->clk);
312+
if (ret) {
313+
dev_err(&pdev->dev, "Couldn't enable the V3D clock\n");
314+
return ret;
315+
}
316+
307317
mmu_debug = V3D_READ(V3D_MMU_DEBUG_INFO);
308318
mask = DMA_BIT_MASK(30 + V3D_GET_FIELD(mmu_debug, V3D_MMU_PA_WIDTH));
309319
ret = dma_set_mask_and_coherent(dev, mask);
310320
if (ret)
311-
return ret;
321+
goto clk_disable;
312322

313323
v3d->va_width = 30 + V3D_GET_FIELD(mmu_debug, V3D_MMU_VA_WIDTH);
314324

@@ -328,14 +338,14 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
328338
ret = PTR_ERR(v3d->reset);
329339

330340
if (ret == -EPROBE_DEFER)
331-
return ret;
341+
goto clk_disable;
332342

333343
v3d->reset = NULL;
334344
ret = map_regs(v3d, &v3d->bridge_regs, "bridge");
335345
if (ret) {
336346
dev_err(dev,
337347
"Failed to get reset control or bridge regs\n");
338-
return ret;
348+
goto clk_disable;
339349
}
340350
}
341351

@@ -370,14 +380,15 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
370380
if (v3d->ver < 41) {
371381
ret = map_regs(v3d, &v3d->gca_regs, "gca");
372382
if (ret)
373-
return ret;
383+
goto clk_disable;
374384
}
375385

376386
v3d->mmu_scratch = dma_alloc_wc(dev, 4096, &v3d->mmu_scratch_paddr,
377387
GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO);
378388
if (!v3d->mmu_scratch) {
379389
dev_err(dev, "Failed to allocate MMU scratch page\n");
380-
return -ENOMEM;
390+
ret = -ENOMEM;
391+
goto clk_disable;
381392
}
382393

383394
ret = v3d_gem_init(drm);
@@ -408,6 +419,8 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
408419
v3d_gem_destroy(drm);
409420
dma_free:
410421
dma_free_wc(dev, 4096, v3d->mmu_scratch, v3d->mmu_scratch_paddr);
422+
clk_disable:
423+
clk_disable_unprepare(v3d->clk);
411424
return ret;
412425
}
413426

@@ -425,6 +438,8 @@ static void v3d_platform_drm_remove(struct platform_device *pdev)
425438

426439
dma_free_wc(v3d->drm.dev, 4096, v3d->mmu_scratch,
427440
v3d->mmu_scratch_paddr);
441+
442+
clk_disable_unprepare(v3d->clk);
428443
}
429444

430445
static struct platform_driver v3d_platform_driver = {

0 commit comments

Comments
 (0)