Merge tag 'drm-msm-fixes-2022-06-28' into msm-next-staging
authorRob Clark <robdclark@chromium.org>
Tue, 28 Jun 2022 22:41:29 +0000 (15:41 -0700)
committerRob Clark <robdclark@chromium.org>
Tue, 28 Jun 2022 22:41:29 +0000 (15:41 -0700)
commit1796c0255bae9d3d4528b8b3916182b2bc4e1e71
tree474ecb1ef87ad1bd1d41c62737da924db224f4a2
parentb13baccc3850ca8b8cccbf8ed9912dbaa0fdf7f3
parent08de214138cdea438a0dfcb10d355a6650c6017c
Merge tag 'drm-msm-fixes-2022-06-28' into msm-next-staging

Merge v5.19 fixes to avoid merge conflicts

Signed-off-by: Rob Clark <robdclark@chromium.org>
drivers/gpu/drm/msm/dp/dp_ctrl.c
drivers/gpu/drm/msm/dp/dp_display.c
drivers/gpu/drm/msm/msm_drv.h
drivers/gpu/drm/msm/msm_gem.c
drivers/gpu/drm/msm/msm_gem_submit.c