From: Rob Clark Date: Sun, 20 Oct 2024 20:34:03 +0000 (-0700) Subject: Merge branch 'msm-fixes' into msm-next X-Git-Tag: v6.13-rc1~122^2~11^2~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fac1fa4a67584599e7e72c26472f6603aa12a36;p=thirdparty%2Flinux.git Merge branch 'msm-fixes' into msm-next Back-merge msm-fixes to resolve msm-next conflicts. Signed-off-by: Rob Clark --- 1fac1fa4a67584599e7e72c26472f6603aa12a36 diff --cc drivers/gpu/drm/msm/adreno/a6xx_gpu.c index d74f0cbf31469,702b8d4b34972..1dee4c465ff06 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@@ -332,15 -293,8 +342,15 @@@ static void a7xx_submit(struct msm_gpu OUT_PKT7(ring, CP_THREAD_CONTROL, 1); OUT_RING(ring, CP_THREAD_CONTROL_0_SYNC_THREADS | CP_SET_THREAD_BR); - a6xx_set_pagetable(a6xx_gpu, ring, submit->queue->ctx); + a6xx_set_pagetable(a6xx_gpu, ring, submit); + /* + * If preemption is enabled, then set the pseudo register for the save + * sequence + */ + if (gpu->nr_rings > 1) + a6xx_emit_set_pseudo_reg(ring, a6xx_gpu, submit->queue); + get_stats_counter(ring, REG_A7XX_RBBM_PERFCTR_CP(0), rbmemptr_stats(ring, index, cpcycles_start)); get_stats_counter(ring, REG_A6XX_CP_ALWAYS_ON_COUNTER,