Merge branch 'msm-fixes' into msm-next

Back-merge msm-fixes to resolve msm-next conflicts.

Signed-off-by: Rob Clark <[email protected]>

diff --cc drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index d74f0cbf314694efb600082b80717d80a1411cc0,702b8d4b3497237e38ff6258a160defc1da81119..1dee4c465ff065ea52f367ebd0947d1194d51543
--- 1/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
--- 2/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,