Merge branch 'msm-fixes-v5.13-rc6' into msm-next-redo

Syncing up with -rc6 fixes to avoid conflicts with a660 patches.

Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --cc drivers/gpu/drm/msm/adreno/a6xx_gpu.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gem.c
Simple merge