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

Commit e555e326 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Remove superfluous hw_flags from mi_set_context() 



Why have both hw_flags and flags, when just one will do?

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170322210350.6208-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
parent 40149f00

drivers/gpu/drm/i915/i915_gem_context.c

+7 −7
Original line number Diff line number Diff line
@@ -576,25 +576,25 @@ void i915_gem_context_close(struct drm_device *dev, struct drm_file *file) 
}



static inline int

mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)

mi_set_context(struct drm_i915_gem_request *req, u32 flags)

{

	struct drm_i915_private *dev_priv = req->i915;

	struct intel_engine_cs *engine = req->engine;

	enum intel_engine_id id;

	u32 *cs, flags = hw_flags | MI_MM_SPACE_GTT;

	const int num_rings =

		/* Use an extended w/a on ivb+ if signalling from other rings */

		i915.semaphores ?

		INTEL_INFO(dev_priv)->num_rings - 1 :

		0;

	int len;

	u32 *cs;



	/* These flags are for resource streamer on HSW+ */

	flags |= MI_MM_SPACE_GTT;

	if (IS_HASWELL(dev_priv) || INTEL_GEN(dev_priv) >= 8)

		flags |= (HSW_MI_RS_SAVE_STATE_EN | HSW_MI_RS_RESTORE_STATE_EN);

	else if (INTEL_GEN(dev_priv) < 8)

		flags |= (MI_SAVE_EXT_STATE_EN | MI_RESTORE_EXT_STATE_EN);



		/* These flags are for resource streamer on HSW+ */

		flags |= HSW_MI_RS_SAVE_STATE_EN | HSW_MI_RS_RESTORE_STATE_EN;

	else

		flags |= MI_SAVE_EXT_STATE_EN | MI_RESTORE_EXT_STATE_EN;



	len = 4;

	if (INTEL_GEN(dev_priv) >= 7)