drm/i915: Fix error handling for the NV12 fb dimensions check

vsyrjala · jlahtine-intel · commit f42f34388701 · 2018-11-06T17:17:37.000+02:00
Let's not leak obj->framebuffer_references when we decide that the framebuffer domensions are not suitable for NV12. Cc: stable@vger.kernel.org Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Vidya Srinivas <vidya.srinivas@intel.com> Fixes: e44134f ("drm/i915: Add NV12 support to intel_framebuffer_init") Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181029140031.11765-1-ville.syrjala@linux.intel.com Reviewed-by: Matt Roper <matthew.d.roper@intel.com> (cherry picked from commit 3b90946) Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
@@ -14646,7 +14646,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
 	     fb->height < SKL_MIN_YUV_420_SRC_H ||
 	     (fb->width % 4) != 0 || (fb->height % 4) != 0)) {
 		DRM_DEBUG_KMS("src dimensions not correct for NV12\n");
-		return -EINVAL;
+		goto err;
 	}
 
 	for (i = 0; i < fb->format->num_planes; i++) {

Original file line number	Diff line number	Diff line change
`@@ -14646,7 +14646,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,`
`14646`	`14646`	`fb->height < SKL_MIN_YUV_420_SRC_H \|\|`
`14647`	`14647`	`(fb->width % 4) != 0 \|\| (fb->height % 4) != 0)) {`
`14648`	`14648`	`DRM_DEBUG_KMS("src dimensions not correct for NV12\n");`
`14649`		`- return -EINVAL;`
	`14649`	`+ goto err;`
`14650`	`14650`	`}`
`14651`	`14651`
`14652`	`14652`	`for (i = 0; i < fb->format->num_planes; i++) {`