summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorChristophe JAILLET2017-09-10 10:56:42 +0200
committerRodrigo Vivi2017-09-19 00:22:20 +0200
commit814feed316e9d15b0ae869ca729370e7630b8d13 (patch)
treebdb336f21b3b36cc00651245282330a6dc88cbf8 /drivers/gpu/drm
parentdrm/i915/gvt: Fix incorrect PCI BARs reporting (diff)
downloadkernel-qcow2-linux-814feed316e9d15b0ae869ca729370e7630b8d13.tar.gz
kernel-qcow2-linux-814feed316e9d15b0ae869ca729370e7630b8d13.tar.xz
kernel-qcow2-linux-814feed316e9d15b0ae869ca729370e7630b8d13.zip
drm/i915: Fix an error handling in 'intel_framebuffer_init()'
We should go through the error handling path to decrease the 'framebuffer_references' as done everywhere else in this function. Fixes: 2e2adb05736c ("drm/i915: Add render decompression support") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20170910085642.13673-1-christophe.jaillet@wanadoo.fr (cherry picked from commit 37875d6b3af702425ce292de81b77faf94766616) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
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 f17275519484..00cd17c76fdc 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14030,7 +14030,7 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
if (mode_cmd->handles[i] != mode_cmd->handles[0]) {
DRM_DEBUG_KMS("bad plane %d handle\n", i);
- return -EINVAL;
+ goto err;
}
stride_alignment = intel_fb_stride_alignment(fb, i);