Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 967667fd authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/plane-helper: Fixup mismerge 



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 3461b30b
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
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@oracle.com>
Cc: laurent.pinchart@ideasonboard.com
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatar <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent b5ceff20

drivers/gpu/drm/drm_plane_helper.c

+6 −5
Original line number Diff line number Diff line
@@ -353,12 +353,13 @@ 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;

	}



	/* possible_crtc's will be filled in later by crtc_init */

	ret = drm_universal_plane_init(dev, primary, 0,