Commit 69b768f2 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Chris Wilson
Browse files

drm/i915: Move workaround infrastructure code up 



Top comment in intel_workarounds.c says common code should come first so
lets respect that. Also, by moving the common code together opportunities
to reduce duplication will become more obvious.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/1548983324-15344-2-git-send-email-talha.nassar@intel.com
parent 2b34e562

drivers/gpu/drm/i915/intel_workarounds.c

+37 −37
Original line number Diff line number Diff line
@@ -153,6 +153,43 @@ __wa_add(struct i915_wa_list *wal, i915_reg_t reg, u32 mask, u32 val) 
	_wa_add(wal, &wa);

}



static void

wa_masked_en(struct i915_wa_list *wal, i915_reg_t reg, u32 val)

{

	struct i915_wa wa = {

		.reg = reg,

		.mask = val,

		.val = _MASKED_BIT_ENABLE(val)

	};



	_wa_add(wal, &wa);

}



static void

wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,

		   u32 val)

{

	struct i915_wa wa = {

		.reg = reg,

		.mask = mask,

		.val = val

	};



	_wa_add(wal, &wa);

}



static void

wa_write(struct i915_wa_list *wal, i915_reg_t reg, u32 val)

{

	wa_write_masked_or(wal, reg, ~0, val);

}



static void

wa_write_or(struct i915_wa_list *wal, i915_reg_t reg, u32 val)

{

	wa_write_masked_or(wal, reg, val, val);

}



#define WA_REG(addr, mask, val) __wa_add(wal, (addr), (mask), (val))



#define WA_SET_BIT_MASKED(addr, mask) \
@@ -602,43 +639,6 @@ int intel_engine_emit_ctx_wa(struct i915_request *rq) 
	return 0;

}



static void

wa_masked_en(struct i915_wa_list *wal, i915_reg_t reg, u32 val)

{

	struct i915_wa wa = {

		.reg = reg,

		.mask = val,

		.val = _MASKED_BIT_ENABLE(val)

	};



	_wa_add(wal, &wa);

}



static void

wa_write_masked_or(struct i915_wa_list *wal, i915_reg_t reg, u32 mask,

		   u32 val)

{

	struct i915_wa wa = {

		.reg = reg,

		.mask = mask,

		.val = val

	};



	_wa_add(wal, &wa);

}



static void

wa_write(struct i915_wa_list *wal, i915_reg_t reg, u32 val)

{

	wa_write_masked_or(wal, reg, ~0, val);

}



static void

wa_write_or(struct i915_wa_list *wal, i915_reg_t reg, u32 val)

{

	wa_write_masked_or(wal, reg, val, val);

}



static void

gen9_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)

{