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 3461b30b3e171e16498f3d7bc59ab703aec475c8
> Author: Daniel Vetter <daniel.vetter@xxxxxxxx>
> Date: Thu Mar 5 10:32:44 2015 +0100
>
> drm/plane-helper: unexport drm_primary_helper_create_plane
>
> and I just didn't check that the solution from wiggle made sense.
>
> Cc: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> Cc: laurent.pinchart@xxxxxxxxxxxxxxxx
> Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/drm_plane_helper.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_plane_helper.c
> b/drivers/gpu/drm/drm_plane_helper.c index b62b03635050..33807e0adac7
> 100644
> --- a/drivers/gpu/drm/drm_plane_helper.c
> +++ b/drivers/gpu/drm/drm_plane_helper.c
> @@ -353,13 +353,14 @@ static struct drm_plane *create_primary_plane(struct
> drm_device *dev) if (primary == NULL) {
> DRM_DEBUG_KMS("Failed to allocate primary plane\n");
> return NULL;
> - /*
> - * Remove the format_default field from drm_plane when dropping
> - * this helper.
> - */
> - primary->format_default = true;
> }
>
> + /*
> + * Remove the format_default field from drm_plane when dropping
> + * this helper.
> + */
> + primary->format_default = true;
> +
> /* possible_crtc's will be filled in later by crtc_init */
> ret = drm_universal_plane_init(dev, primary, 0,
> &drm_primary_helper_funcs,
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
