Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/v3d: Add clock handling

Since the initial commit 57692c94dcbe ("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

authored by

Stefan Wahren and committed by
Maíra Canal
4dd40b5f 796a9f55

+20 -5
+20 -5
drivers/gpu/drm/v3d/v3d_drv.c
··· 295 295 if (ret) 296 296 return ret; 297 297 298 + v3d->clk = devm_clk_get_optional(dev, NULL); 299 + if (IS_ERR(v3d->clk)) 300 + return dev_err_probe(dev, PTR_ERR(v3d->clk), "Failed to get V3D clock\n"); 301 + 302 + ret = clk_prepare_enable(v3d->clk); 303 + if (ret) { 304 + dev_err(&pdev->dev, "Couldn't enable the V3D clock\n"); 305 + return ret; 306 + } 307 + 298 308 mmu_debug = V3D_READ(V3D_MMU_DEBUG_INFO); 299 309 mask = DMA_BIT_MASK(30 + V3D_GET_FIELD(mmu_debug, V3D_MMU_PA_WIDTH)); 300 310 ret = dma_set_mask_and_coherent(dev, mask); 301 311 if (ret) 302 - return ret; 312 + goto clk_disable; 303 313 304 314 v3d->va_width = 30 + V3D_GET_FIELD(mmu_debug, V3D_MMU_VA_WIDTH); 305 315 ··· 329 319 ret = PTR_ERR(v3d->reset); 330 320 331 321 if (ret == -EPROBE_DEFER) 332 - return ret; 322 + goto clk_disable; 333 323 334 324 v3d->reset = NULL; 335 325 ret = map_regs(v3d, &v3d->bridge_regs, "bridge"); 336 326 if (ret) { 337 327 dev_err(dev, 338 328 "Failed to get reset control or bridge regs\n"); 339 - return ret; 329 + goto clk_disable; 340 330 } 341 331 } 342 332 343 333 if (v3d->ver < 41) { 344 334 ret = map_regs(v3d, &v3d->gca_regs, "gca"); 345 335 if (ret) 346 - return ret; 336 + goto clk_disable; 347 337 } 348 338 349 339 v3d->mmu_scratch = dma_alloc_wc(dev, 4096, &v3d->mmu_scratch_paddr, 350 340 GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO); 351 341 if (!v3d->mmu_scratch) { 352 342 dev_err(dev, "Failed to allocate MMU scratch page\n"); 353 - return -ENOMEM; 343 + ret = -ENOMEM; 344 + goto clk_disable; 354 345 } 355 346 356 347 ret = v3d_gem_init(drm); ··· 380 369 v3d_gem_destroy(drm); 381 370 dma_free: 382 371 dma_free_wc(dev, 4096, v3d->mmu_scratch, v3d->mmu_scratch_paddr); 372 + clk_disable: 373 + clk_disable_unprepare(v3d->clk); 383 374 return ret; 384 375 } 385 376 ··· 399 386 400 387 dma_free_wc(v3d->drm.dev, 4096, v3d->mmu_scratch, 401 388 v3d->mmu_scratch_paddr); 389 + 390 + clk_disable_unprepare(v3d->clk); 402 391 } 403 392 404 393 static struct platform_driver v3d_platform_driver = {