Skip to content

Commit 63b6c7b

Browse files
Dan Carpenterjnikula
authored andcommitted
drm/i915: fix an error code in intel_overlay_do_put_image()
This code should propagate the error from intel_overlay_pin_fb() but currently it returns success. Fixes: 1b32102 ("drm/i915: Pass ww ctx to intel_pin_to_display_plane") Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> Signed-off-by: Rodrigo Vivi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/YHaFcEzcnh/hk1/Q@mwanda (cherry picked from commit 103b8cb) Signed-off-by: Jani Nikula <[email protected]>
1 parent 3aea49f commit 63b6c7b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/gpu/drm/i915/display/intel_overlay.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,8 +803,10 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
803803
atomic_inc(&dev_priv->gpu_error.pending_fb_pin);
804804

805805
vma = intel_overlay_pin_fb(new_bo);
806-
if (IS_ERR(vma))
806+
if (IS_ERR(vma)) {
807+
ret = PTR_ERR(vma);
807808
goto out_pin_section;
809+
}
808810

809811
i915_gem_object_flush_frontbuffer(new_bo, ORIGIN_DIRTYFB);
810812

0 commit comments

Comments
 (0)