| Message ID | YHaFcEzcnh/hk1/Q@mwanda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: fix an error code in intel_overlay_do_put_image() | expand |
On Wed, Apr 14, 2021 at 09:02:24AM +0300, Dan Carpenter wrote: > This code should propagate the error from intel_overlay_pin_fb() > but currently it returns success. > > Fixes: 1b321026e213 ("drm/i915: Pass ww ctx to intel_pin_to_display_plane") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> and pushed. thanks for the patch. > --- > drivers/gpu/drm/i915/display/intel_overlay.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c > index e477b6114a60..e5dadde422f7 100644 > --- a/drivers/gpu/drm/i915/display/intel_overlay.c > +++ b/drivers/gpu/drm/i915/display/intel_overlay.c > @@ -803,8 +803,10 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay, > atomic_inc(&dev_priv->gpu_error.pending_fb_pin); > > vma = intel_overlay_pin_fb(new_bo); > - if (IS_ERR(vma)) > + if (IS_ERR(vma)) { > + ret = PTR_ERR(vma); > goto out_pin_section; > + } > > i915_gem_object_flush_frontbuffer(new_bo, ORIGIN_DIRTYFB); > > -- > 2.30.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c index e477b6114a60..e5dadde422f7 100644 --- a/drivers/gpu/drm/i915/display/intel_overlay.c +++ b/drivers/gpu/drm/i915/display/intel_overlay.c @@ -803,8 +803,10 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay, atomic_inc(&dev_priv->gpu_error.pending_fb_pin); vma = intel_overlay_pin_fb(new_bo); - if (IS_ERR(vma)) + if (IS_ERR(vma)) { + ret = PTR_ERR(vma); goto out_pin_section; + } i915_gem_object_flush_frontbuffer(new_bo, ORIGIN_DIRTYFB);
This code should propagate the error from intel_overlay_pin_fb() but currently it returns success. Fixes: 1b321026e213 ("drm/i915: Pass ww ctx to intel_pin_to_display_plane") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/gpu/drm/i915/display/intel_overlay.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)