Commit ce8f1381 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Rob Clark
Browse files

drm/msm/a6xx: Move force keepalive vote removal to a6xx_gmu_force_off() 

As pointed out by Akhil during the review process of GMU wrapper
introduction [1], it makes sense to move this write into the function
that's responsible for forcibly shutting the GMU off.

It is also very convenient to move this to GMU-specific code, so that
it does not have to be guarded by an if-condition to avoid calling it
on GMU wrapper targets.

Move the write to the aforementioned a6xx_gmu_force_off() to achieve
that. No effective functional change.

[1] https://lore.kernel.org/linux-arm-msm/20230501194022.GA18382@akhilpo-linux.qualcomm.com/



Reviewed-by: default avatarAkhil P Oommen <quic_akhilpo@quicinc.com>
Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/542752/


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent bd31afe0

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

+6 −0
Original line number Diff line number Diff line
@@ -912,6 +912,12 @@ static void a6xx_gmu_force_off(struct a6xx_gmu *gmu) 
	struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;

	struct msm_gpu *gpu = &adreno_gpu->base;



	/*

	 * Turn off keep alive that might have been enabled by the hang

	 * interrupt

	 */

	gmu_write(&a6xx_gpu->gmu, REG_A6XX_GMU_GMU_PWR_COL_KEEPALIVE, 0);



	/* Flush all the queues */

	a6xx_hfi_stop(gmu);

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

+0 −6
Original line number Diff line number Diff line
@@ -1382,12 +1382,6 @@ static void a6xx_recover(struct msm_gpu *gpu) 
	/* Halt SQE first */

	gpu_write(gpu, REG_A6XX_CP_SQE_CNTL, 3);



	/*

	 * Turn off keep alive that might have been enabled by the hang

	 * interrupt

	 */

	gmu_write(&a6xx_gpu->gmu, REG_A6XX_GMU_GMU_PWR_COL_KEEPALIVE, 0);



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



	/* active_submit won't change until we make a submission */