diff options
| author | Ville Syrjälä | 2018-10-29 15:00:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-11-21 09:19:27 +0100 |
| commit | 6d6e718e454b65448bbb50c876e5040f5d05db6d (patch) | |
| tree | d2bfe5c75e813b60e1ee3123a5044ea29d8f5e1b /drivers/gpu/drm/i915 | |
| parent | drm/i915: Mark up GTT sizes as u64 (diff) | |
| download | kernel-qcow2-linux-6d6e718e454b65448bbb50c876e5040f5d05db6d.tar.gz kernel-qcow2-linux-6d6e718e454b65448bbb50c876e5040f5d05db6d.tar.xz kernel-qcow2-linux-6d6e718e454b65448bbb50c876e5040f5d05db6d.zip | |
drm/i915: Fix error handling for the NV12 fb dimensions check
commit f42f343887016330b321dd40eebc68c7292e4f1b upstream.
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: e44134f2673c ("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 3b90946fcb6f13b65888c380461793a9dea9d1f4)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 04846fd3e2cf..ff841400051c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14582,7 +14582,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++) { |