From: Dave Airlie Date: Wed, 4 Mar 2015 23:37:58 +0000 (+1000) Subject: Merge branch 'drm/next/atomic' of git://linuxtv.org/pinchartl/fbdev into drm-next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7e4774843bff41d312850669e1dd5aa14edd7e9b;p=linux-beck.git Merge branch 'drm/next/atomic' of git://linuxtv.org/pinchartl/fbdev into drm-next rcar-du atomic modesetting support * 'drm/next/atomic' of git://linuxtv.org/pinchartl/fbdev: (32 commits) drm: rcar-du: Fix race condition in hardware plane allocator drm: rcar-du: Move group locking inside rcar_du_crtc_update_planes() drm: rcar-du: Move plane commit code from CRTC start to CRTC resume drm: rcar-du: Move plane format to plane state drm: rcar-du: Remove unneeded rcar_du_crtc plane field drm: rcar-du: Replace plane crtc and enabled fields by plane state drm: rcar-du: Rework plane setup code drm: rcar-du: Switch plane set_property to atomic helpers drm: rcar-du: Switch page flip to atomic helpers drm: rcar-du: Implement asynchronous commit support drm: rcar-du: Replace encoder mode_fixup with atomic_check drm: rcar-du: Switch connector DPMS to atomic helpers drm: rcar-du: Switch mode config to atomic helpers drm: rcar-du: Switch plane update to atomic helpers drm: rcar-du: Rework CRTC enable/disable for atomic updates drm: rcar-du: Rework HDMI encoder enable/disable for atomic updates drm: rcar-du: Rework encoder enable/disable for atomic updates drm: rcar-du: Replace LVDS encoder DPMS by enable/disable drm: rcar-du: Remove private copy of plane size and position drm: rcar-du: Wire up atomic state object scaffolding ... --- 7e4774843bff41d312850669e1dd5aa14edd7e9b