Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c33baa6 authored by Konrad Zapalowicz's avatar Konrad Zapalowicz Committed by Daniel Vetter
Browse files

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: default avatarKonrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f99d7069

drivers/gpu/drm/i915/intel_ringbuffer.c

+2 −0
Original line number Diff line number Diff line
@@ -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)