[PATCH] drm/plane-helper: Fixup mismerge

2015-03-11 Thread Laurent Pinchart
Hi Daniel, Thank you for the patch. On Wednesday 11 March 2015 09:00:26 Daniel Vetter wrote: > I somehow manage to screw up applying Laurent's patch in eca93e28c256: > "drm: Check in setcrtc if the primary plane supports the fb pixel > format". It was a conflict with > > commit 3461b30b3e171e164

[PATCH] drm/plane-helper: Fixup mismerge

2015-03-11 Thread Daniel Vetter
I somehow manage to screw up applying Laurent's patch in eca93e28c256: "drm: Check in setcrtc if the primary plane supports the fb pixel format". It was a conflict with commit 3461b30b3e171e16498f3d7bc59ab703aec475c8 Author: Daniel Vetter Date: Thu Mar 5 10:32:44 2015 +0100 drm/plane-helpe