drm/plane-helper: Fixup mismerge

I somehow manage to screw up applying Laurent's patch in eca93e2: "drm: Check in setcrtc if the primary plane supports the fb pixel format". It was a conflict with commit 3461b30 Author: Daniel Vetter <[email protected]> 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 <[email protected]> Cc: [email protected] Reported-by: Dan Carpenter <[email protected]> Acked-by: [email protected] Signed-off-by: Daniel Vetter <[email protected]>
SKAPUSTIANSKYI · Mar 11, 2015 · 967667f · 967667f
1 parent b5ceff2
commit 967667f
Showing 1 changed file with 6 additions and 5 deletions.
diff --git 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,