drm/i915: Fix error handling for the NV12 fb dimensions check
authorVille Syrjälä <[email protected]>
Mon, 29 Oct 2018 14:00:31 +0000 (16:00 +0200)
committerJoonas Lahtinen <[email protected]>
Tue, 6 Nov 2018 15:17:37 +0000 (17:17 +0200)
Let's not leak obj->framebuffer_references when we decide that
the framebuffer domensions are not suitable for NV12.

Cc: [email protected]
Cc: Maarten Lankhorst <[email protected]>
Cc: Vidya Srinivas <[email protected]>
Fixes: e44134f2673c ("drm/i915: Add NV12 support to intel_framebuffer_init")
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Matt Roper <[email protected]>
(cherry picked from commit 3b90946fcb6f13b65888c380461793a9dea9d1f4)
Signed-off-by: Joonas Lahtinen <[email protected]>
drivers/gpu/drm/i915/intel_display.c

index 9741cc419e1b2bc1f5eb4771ae75468f0099289d..b8dfdbc9ca1f6ee4f50c5bd996c33e07753a5080 100644 (file)
@@ -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++) {