Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eed6dba9 authored by Rob Clark's avatar Rob Clark Committed by Greg Kroah-Hartman
Browse files

drm/msm: Do hw_init() before capturing GPU state 



commit e4840d537c2c6b1189d4de16ee0f4820e069dcea upstream.

In particular, we need to ensure all the necessary blocks are switched
to 64b mode (a5xx+) otherwise the high bits of the address of the BO to
snapshot state into will be ignored, resulting in:

  *** gpu fault: ttbr0=0000000000000000 iova=0000000000012000 dir=READ type=TRANSLATION source=CP (0,0,0,0)
  platform 506a000.gmu: [drm:a6xx_gmu_set_oob] *ERROR* Timeout waiting for GMU OOB set BOOT_SLUMBER: 0x0

Fixes: 4f776f45 ("drm/msm/gpu: Convert the GPU show function to use the GPU state")
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Link: https://lore.kernel.org/r/20211108180122.487859-1-robdclark@gmail.com


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 40fdfacb

drivers/gpu/drm/msm/msm_debugfs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,7 @@ static int msm_gpu_open(struct inode *inode, struct file *file) 
		goto free_priv;

		goto free_priv;





	pm_runtime_get_sync(&gpu->pdev->dev);

	pm_runtime_get_sync(&gpu->pdev->dev);

	msm_gpu_hw_init(gpu);

	show_priv->state = gpu->funcs->gpu_state_get(gpu);

	show_priv->state = gpu->funcs->gpu_state_get(gpu);

	pm_runtime_put_sync(&gpu->pdev->dev);

	pm_runtime_put_sync(&gpu->pdev->dev);