tree c2c8944591fd7f9b07548c9d30ef080b8f7e49fe
parent 92eed291e9869371a1b66f0f5fa75a4f4e99a768
parent aa80a4a5190e697a6945849ab36fa7dabca815f3
author Dave Airlie <airlied@redhat.com> 1425512187 +1000
committer Dave Airlie <airlied@redhat.com> 1425512187 +1000

Merge branch 'msm-fixes-4.0' of git://people.freedesktop.org/~robclark/linux into drm-fixes

Fixup some fallout of the fallout of atomic dpms, few mdp5 cursor
fixes, fix a leak in error path, and some fixes for kexec

* 'msm-fixes-4.0' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: kexec fixes
  drm/msm/mdp5: fix cursor blending
  drm/msm/mdp5: fix cursor ROI
  drm/msm/atomic: Don't leak atomic commit object when commit fails
  drm/msm/mdp5: Avoid flushing registers when CRTC is disabled
  drm/msm: update generated headers (add 6th lm.base entry)
  drm/msm/mdp5: fixup "drm/msm: fix fallout of atomic dpms changes"