Skip to content

Fix GPU blocking XO Shutdown on QLI2.0 #658

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

Open
shivrawa wants to merge 1 commit into
base: qcom-6.18.y
Choose a base branch
from
+4 −1
Open

Fix GPU blocking XO Shutdown on QLI2.0 #658

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
5 changes: 4 additions & 1 deletion drivers/gpu/drm/msm/adreno/a6xx_gmu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ static void a6xx_rpmh_stop(struct a6xx_gmu *gmu)
int ret;
u32 val;

if (test_and_clear_bit(GMU_STATUS_FW_START, &gmu->status))
if (!test_and_clear_bit(GMU_STATUS_FW_START, &gmu->status))
return;

gmu_write(gmu, REG_A6XX_GMU_RSCC_CONTROL_REQ, 1);
Expand Down Expand Up @@ -1259,6 +1259,9 @@ static void a6xx_gmu_shutdown(struct a6xx_gmu *gmu)
/* Stop the interrupts and mask the hardware */
a6xx_gmu_irq_disable(gmu);

/* Halt the gmu cm3 core */
gmu_write(gmu, REG_A6XX_GMU_CM3_SYSRESET, 1);

/* Tell RPMh to power off the GPU */
a6xx_rpmh_stop(gmu);

Expand Down