Commit 438d00b1 authored Jun 13, 2022 by Rob Clark Committed by Greg Kroah-Hartman May 17, 2023

drm/msm/adreno: Defer enabling runpm until hw_init()



[ Upstream commit 4b18299b33655fa9672b774b6df774dc03d6aee8 ]

To avoid preventing the display from coming up before the rootfs is
mounted, without resorting to packing fw in the initrd, the GPU has
this limbo state where the device is probed, but we aren't ready to
start sending commands to it.  This is particularly problematic for
a6xx, since the GMU (which requires fw to be loaded) is the one that
is controlling the power/clk/icc votes.

So defer enabling runpm until we are ready to call gpu->hw_init(),
as that is a point where we know we have all the needed fw and are
ready to start sending commands to the coproc's.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/489337/
Link: https://lore.kernel.org/r/20220613182036.2567963-1-robdclark@gmail.com


Stable-dep-of: db7662d076c9 ("drm/msm/adreno: drop bogus pm_runtime_set_active()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 594726c9

drivers/gpu/drm/msm/adreno/adreno_device.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,12 @@ struct msm_gpu adreno_load_gpu(struct drm_device dev)
		if (ret)
		return NULL;

		/*
		* Now that we have firmware loaded, and are ready to begin
		* booting the gpu, go ahead and enable runpm:
		*/
		pm_runtime_enable(&pdev->dev);

		/* Make sure pm runtime is active and reset any previous errors */
		pm_runtime_set_active(&pdev->dev);

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -899,7 +899,6 @@ int adreno_gpu_init(struct drm_device drm, struct platform_device pdev,
		pm_runtime_set_autosuspend_delay(&pdev->dev,
		adreno_gpu->info->inactive_period);
		pm_runtime_use_autosuspend(&pdev->dev);
		pm_runtime_enable(&pdev->dev);

		return msm_gpu_init(drm, pdev, &adreno_gpu->base, &funcs->base,
		adreno_gpu->info->name, &adreno_gpu_config);