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

Commit 43f33642 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Greg Kroah-Hartman
Browse files

drm/msm/a5xx: fix setting of the CP_PREEMPT_ENABLE_LOCAL register 



[ Upstream commit a7a4c19c36de1e4b99b06e4060ccc8ab837725bc ]

Rather than writing CP_PREEMPT_ENABLE_GLOBAL twice, follow the vendor
kernel and set CP_PREEMPT_ENABLE_LOCAL register instead. a5xx_submit()
will override it during submission, but let's get the sequence correct.

Fixes: b1fc2839 ("drm/msm: Implement preemption for A5XX targets")
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/522638/
Link: https://lore.kernel.org/r/20230214020956.164473-2-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8dac5a63

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

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 
	OUT_RING(ring, 1);



	/* Enable local preemption for finegrain preemption */

	OUT_PKT7(ring, CP_PREEMPT_ENABLE_GLOBAL, 1);

	OUT_RING(ring, 0x02);

	OUT_PKT7(ring, CP_PREEMPT_ENABLE_LOCAL, 1);

	OUT_RING(ring, 0x1);



	/* Allow CP_CONTEXT_SWITCH_YIELD packets in the IB2 */

	OUT_PKT7(ring, CP_YIELD_ENABLE, 1);