From: Dave Airlie Date: Tue, 26 May 2015 06:19:53 +0000 (+1000) Subject: Merge branch 'drm/next/rcar-du' of git://linuxtv.org/pinchartl/fbdev into drm-next X-Git-Tag: v5.15~15474^2~50 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f025705e738f6124e5f6a737e9a7c67d31a13a48;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'drm/next/rcar-du' of git://linuxtv.org/pinchartl/fbdev into drm-next rcar-du fixes * 'drm/next/rcar-du' of git://linuxtv.org/pinchartl/fbdev: drm: rcar-du: Split planes pre-association 4/4 between CRTCs drm: rcar-du: Store the number of CRTCs per group in the group structure drm: rcar-du: Consider plane to CRTC associations in the plane allocator drm: rcar-du: Keep plane to CRTC associations when disabling a plane drm: rcar-du: Add plane allocation debugging drm: rcar-du: Rename to_rcar_du_plane_state to to_rcar_plane_state drm: rcar-du: Embed rcar_du_planes structure into rcar_du_group drm: rcar-du: Move properties from rcar_du_planes to rcar_du_device drm: rcar-du: Document the rcar_du_plane_state structure drm: rcar-du: Document the rcar_du_crtc structure --- f025705e738f6124e5f6a737e9a7c67d31a13a48