dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Konrad Zapalowicz <bergo.torino@gmail.com>
To: daniel.vetter@ffwll.ch
Cc: airlied@linux.ie, intel-gfx@lists.freedesktop.org,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	Konrad Zapalowicz <bergo.torino@gmail.com>
Subject: [PATCH v2] drivers/i915: Fix unnoticed failure of init_ring_common()
Date: Thu, 19 Jun 2014 19:07:15 +0200	[thread overview]
Message-ID: <1403197635-14598-1-git-send-email-bergo.torino@gmail.com> (raw)
In-Reply-To: <1403131134-9533-1-git-send-email-bergo.torino@gmail.com>

This commit add check for return value of init_ring_common() in the
init_render_ring(). Now, when failure is detected the error code is
propagated to the caller instead of being ignored.

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
---
 
 v2:
   - remove from commit message references to the Oops.

 drivers/gpu/drm/i915/intel_ringbuffer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 279488a..d205b0d 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -604,6 +604,8 @@ static int init_render_ring(struct intel_engine_cs *ring)
 	struct drm_device *dev = ring->dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	int ret = init_ring_common(ring);
+	if (ret)
+		return ret;
 
 	/* WaTimedSingleVertexDispatch:cl,bw,ctg,elk,ilk,snb */
 	if (INTEL_INFO(dev)->gen >= 4 && INTEL_INFO(dev)->gen < 7)
-- 
1.8.1.2

  parent reply	other threads:[~2014-06-19 17:07 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-18 22:38 [PATCH] drivers/i915: Fix unnoticed failure of init_ring_common() Konrad Zapalowicz
2014-06-19  6:15 ` Daniel Vetter
2014-06-19 12:45   ` Konrad Zapalowicz
2014-06-19 14:35     ` Daniel Vetter
2014-06-19 14:36       ` Daniel Vetter
2014-06-19 14:42         ` Konrad Zapalowicz
2014-06-19 17:07 ` Konrad Zapalowicz [this message]
2014-06-19 19:00   ` [PATCH v2] " Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403197635-14598-1-git-send-email-bergo.torino@gmail.com \
    --to=bergo.torino@gmail.com \
    --cc=airlied@linux.ie \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox