[Intel-gfx] [PATCH 09/13] drm/i915: Remove identical macros

[Joonas Lahtinen]

On to, 2016-09-29 at 16:35 +0100, Tvrtko Ursulin wrote:
> vlv_read##x(struct drm_i915_private *dev_priv, i915_reg_t reg, bool trace) { \
> 
>  	enum forcewake_domains fw_engine; \
>  	GEN6_READ_HEADER(x); \
> -	fw_engine = __vlv_reg_read_fw_domains(offset); \
> +	fw_engine = __fwtable_reg_read_fw_domains(offset); \
>  	if (fw_engine) \
>  		__force_wake_auto(dev_priv, fw_engine); \
>  	val = __raw_i915_read##x(dev_priv, reg); \

I notice you in later patch remove the now equal funcs.

> @@ -1829,18 +1813,18 @@ intel_uncore_forcewake_for_read(struct drm_i915_private *dev_priv,
>  
>  	switch (INTEL_GEN(dev_priv)) {
>  	case 9:
> -		fw_domains = __gen9_reg_read_fw_domains(i915_mmio_reg_offset(reg));
> +		fw_domains = __fwtable_reg_read_fw_domains(i915_mmio_reg_offset(reg));
>  		break;
>  	case 8:
>  		if (IS_CHERRYVIEW(dev_priv))
> -			fw_domains = __chv_reg_read_fw_domains(i915_mmio_reg_offset(reg));
> +			fw_domains = __fwtable_reg_read_fw_domains(i915_mmio_reg_offset(reg));
>  		else
>  			fw_domains = __gen6_reg_read_fw_domains(i915_mmio_reg_offset(reg));
>  		break;
>  	case 7:
>  	case 6:
>  		if (IS_VALLEYVIEW(dev_priv))
> -			fw_domains = __vlv_reg_read_fw_domains(i915_mmio_reg_offset(reg));
> +			fw_domains = __fwtable_reg_read_fw_domains(i915_mmio_reg_offset(reg));
>  		else
>  			fw_domains = __gen6_reg_read_fw_domains(i915_mmio_reg_offset(reg));
>  		break;

Drop the whole switch, just do if (IS_CHERRYVIEW || IS_VALLEYVIEW)
fwtable_ else gen6_. Maybe some HAS_FWTABLE() prop would work too, but
that's not must.

With switch removed,

Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>

Regards, Joonas
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation