Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

drm/vc4: Fix gpu reset #6239

Open
wants to merge 1 commit into
base: rpi-6.1.y
Choose a base branch
from
Open

drm/vc4: Fix gpu reset #6239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions drivers/gpu/drm/vc4/vc4_v3d.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,23 +472,26 @@ static int vc4_v3d_bind(struct device *dev, struct device *master, void *data)
if (ret)
return ret;

ret = pm_runtime_resume_and_get(dev);
ret = clk_prepare_enable(v3d->clk);
if (ret)
return ret;

/* Reset the binner overflow address/size at setup, to be sure
* we don't reuse an old one.
*/
V3D_WRITE(V3D_BPOA, 0);
V3D_WRITE(V3D_BPOS, 0);

vc4_v3d_init_hw(drm);
vc4_irq_enable(&vc4->base);

if (V3D_READ(V3D_IDENT0) != V3D_EXPECTED_IDENT0) {
DRM_ERROR("V3D_IDENT0 read 0x%08x instead of 0x%08x\n",
V3D_READ(V3D_IDENT0), V3D_EXPECTED_IDENT0);
ret = -EINVAL;
goto err_put_runtime_pm;
}

/* Reset the binner overflow address/size at setup, to be sure
* we don't reuse an old one.
*/
V3D_WRITE(V3D_BPOA, 0);
V3D_WRITE(V3D_BPOS, 0);

ret = vc4_irq_install(drm, vc4->irq);
if (ret) {
DRM_ERROR("Failed to install IRQ handler\n");
Expand Down