diff options
| author | Konrad Zapalowicz | 2014-06-19 19:07:15 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-06-19 20:59:52 +0200 |
| commit | 9c33baa6b3bbb01c1a88dceba986b20e6642cf31 (patch) | |
| tree | e65e031a5389929ddbddac19326c96f8d9a06ccd /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | drm/i915: Track frontbuffer invalidation/flushing (diff) | |
| download | kernel-qcow2-linux-9c33baa6b3bbb01c1a88dceba986b20e6642cf31.tar.gz kernel-qcow2-linux-9c33baa6b3bbb01c1a88dceba986b20e6642cf31.tar.xz kernel-qcow2-linux-9c33baa6b3bbb01c1a88dceba986b20e6642cf31.zip | |
drivers/i915: Fix unnoticed failure of init_ring_common()
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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index b96edaf905de..2faef2605e97 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) |