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

Commit a937eaf8 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Fix uninitialized return from mi_set_context 



For some reason my compiler (and CI as well) failed to spot the
uninitialized ret in mi_set_context.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: 73dec95e ("drm/i915: Emit to ringbuffer directly")
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170214152901.20361-1-tvrtko.ursulin@linux.intel.com
parent 73dec95e

drivers/gpu/drm/i915/i915_gem_context.c

+3 −3
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) 
		i915.semaphores ?

		INTEL_INFO(dev_priv)->num_rings - 1 :

		0;

	int len, ret;

	int len;



	/* w/a: If Flush TLB Invalidation Mode is enabled, driver must do a TLB

	 * invalidation prior to MI_SET_CONTEXT. On GEN6 we don't set the value
@@ -612,7 +612,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) 
	 * itlb_before_ctx_switch.

	 */

	if (IS_GEN6(dev_priv)) {

		ret = engine->emit_flush(req, EMIT_INVALIDATE);

		int ret = engine->emit_flush(req, EMIT_INVALIDATE);

		if (ret)

			return ret;

	}
@@ -687,7 +687,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) 


	intel_ring_advance(req, cs);



	return ret;

	return 0;

}



static int remap_l3(struct drm_i915_gem_request *req, int slice)