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

Commit 68c6198b authored by Arun Siluvery's avatar Arun Siluvery Committed by Daniel Vetter
Browse files

drm/i915/gen8: Move INSTPM WA to common function 



Signed-off-by: default avatarArun Siluvery <arun.siluvery@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e9a64ada

drivers/gpu/drm/i915/intel_ringbuffer.c

+4 −4
Original line number Diff line number Diff line
@@ -802,6 +802,10 @@ static int wa_add(struct drm_i915_private *dev_priv, 


static int gen8_init_workarounds(struct intel_engine_cs *ring)

{

	struct drm_device *dev = ring->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;



	WA_SET_BIT_MASKED(INSTPM, INSTPM_FORCE_ORDERING);



	return 0;

}
@@ -816,8 +820,6 @@ static int bdw_init_workarounds(struct intel_engine_cs *ring) 
	if (ret)

		return ret;



	WA_SET_BIT_MASKED(INSTPM, INSTPM_FORCE_ORDERING);



	/* WaDisableAsyncFlipPerfMode:bdw */

	WA_SET_BIT_MASKED(MI_MODE, ASYNC_FLIP_PERF_DISABLE);
@@ -887,8 +889,6 @@ static int chv_init_workarounds(struct intel_engine_cs *ring) 
	if (ret)

		return ret;



	WA_SET_BIT_MASKED(INSTPM, INSTPM_FORCE_ORDERING);



	/* WaDisableAsyncFlipPerfMode:chv */

	WA_SET_BIT_MASKED(MI_MODE, ASYNC_FLIP_PERF_DISABLE);