Merge branch 'msm-fixes-v5.13-rc6' into msm-next-redo
authorRob Clark <robdclark@chromium.org>
Wed, 23 Jun 2021 14:32:59 +0000 (07:32 -0700)
committerRob Clark <robdclark@chromium.org>
Wed, 23 Jun 2021 14:32:59 +0000 (07:32 -0700)
commit8c08c7b51ad33b75d480a20fb68a6f1376629e0e
tree310f731015aed3406c4f1266637b12aa4d12e201
parenta1f2ba60eace242fd034173db3762f342a824a2e
parent170b763597d3a0a79f135e4d83a38462c3964fdf
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>
drivers/gpu/drm/msm/adreno/a6xx_gpu.c
drivers/gpu/drm/msm/msm_gem.c