linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Fix an error handling in 'intel_framebuffer_init()'
@ 2017-09-10  8:56 Christophe JAILLET
  2017-09-11 12:02 ` Jani Nikula
  0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2017-09-10  8:56 UTC (permalink / raw)
  To: jani.nikula, joonas.lahtinen, rodrigo.vivi, airlied
  Cc: intel-gfx, dri-devel, linux-kernel, kernel-janitors, Christophe JAILLET

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>
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 7cd392f2cd94..478fa449003f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14077,7 +14077,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);
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] drm/i915: Fix an error handling in 'intel_framebuffer_init()'
  2017-09-10  8:56 [PATCH] drm/i915: Fix an error handling in 'intel_framebuffer_init()' Christophe JAILLET
@ 2017-09-11 12:02 ` Jani Nikula
  0 siblings, 0 replies; 2+ messages in thread
From: Jani Nikula @ 2017-09-11 12:02 UTC (permalink / raw)
  To: Christophe JAILLET, joonas.lahtinen, rodrigo.vivi, airlied
  Cc: intel-gfx, dri-devel, linux-kernel, kernel-janitors, Christophe JAILLET

On Sun, 10 Sep 2017, Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
> 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>

Pushed to drm-intel-next-queued, thanks for the patch.

For future reference, the intel-gfx list will suffice.


BR,
Jani.


> ---
>  drivers/gpu/drm/i915/intel_display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 7cd392f2cd94..478fa449003f 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -14077,7 +14077,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);

-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-09-11 12:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-10  8:56 [PATCH] drm/i915: Fix an error handling in 'intel_framebuffer_init()' Christophe JAILLET
2017-09-11 12:02 ` Jani Nikula

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).