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"
Showing
- drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c 5 additions, 0 deletionsdrivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c
- drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h 4 additions, 11 deletionsdrivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h
- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c 61 additions, 38 deletionsdrivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
- drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c 3 additions, 3 deletionsdrivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c
- drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c 5 additions, 0 deletionsdrivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c
- drivers/gpu/drm/msm/msm_atomic.c 3 additions, 1 deletiondrivers/gpu/drm/msm/msm_atomic.c
Loading
Please register or sign in to comment