* [PATCH] drm/i915: fix an error code in intel_overlay_do_put_image()
@ 2021-04-14 6:02 Dan Carpenter
2021-04-20 14:14 ` Rodrigo Vivi
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2021-04-14 6:02 UTC (permalink / raw)
To: Jani Nikula, Maarten Lankhorst
Cc: Thomas Hellström, David Airlie, Pankaj Bharadiya, intel-gfx,
kernel-janitors, dri-devel, Chris Wilson, Matthew Auld,
Rodrigo Vivi
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/i915: fix an error code in intel_overlay_do_put_image()
2021-04-14 6:02 [PATCH] drm/i915: fix an error code in intel_overlay_do_put_image() Dan Carpenter
@ 2021-04-20 14:14 ` Rodrigo Vivi
0 siblings, 0 replies; 2+ messages in thread
From: Rodrigo Vivi @ 2021-04-20 14:14 UTC (permalink / raw)
To: Dan Carpenter
Cc: Thomas Hellström, kernel-janitors, David Airlie,
Pankaj Bharadiya, intel-gfx, Chris Wilson, dri-devel,
Matthew Auld
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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-20 14:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-14 6:02 [PATCH] drm/i915: fix an error code in intel_overlay_do_put_image() Dan Carpenter
2021-04-20 14:14 ` Rodrigo Vivi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).