[Intel-gfx] [PATCH 2/3] drm/i915: remove potentially confusing IS_G4X checks

[Ville Syrjälä]

On Mon, Feb 20, 2017 at 05:00:41PM -0300, Paulo Zanoni wrote:
> The IS_G4X macro is defined as IS_G45 || IS_GM45. We have two points
> in our code where we have an if statement checking for GM45 followed
> by an else if statement checking for IS_G4X. This can be confusing
> since the IS_G4X check won't be catching the previously-checked GM45.
> Someone quickly trying to check which functions run on each platform
> may end up getting confused while reading the code.
> 
> Fix the potential confusion by limiting the else if statements to only
> check for the platform that was not already checked earlier in the if
> ladder.
> 
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_cdclk.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c
> index dd6fe25..942adf0 100644
> --- a/drivers/gpu/drm/i915/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/intel_cdclk.c
> @@ -223,7 +223,7 @@ static unsigned int intel_hpll_vco(struct drm_i915_private *dev_priv)
>  	/* FIXME other chipsets? */
>  	if (IS_GM45(dev_priv))
>  		vco_table = ctg_vco;
> -	else if (IS_G4X(dev_priv))
> +	else if (IS_G45(dev_priv))
>  		vco_table = elk_vco;
>  	else if (IS_I965GM(dev_priv))
>  		vco_table = cl_vco;
> @@ -1778,7 +1778,7 @@ void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
>  		dev_priv->display.get_cdclk = fixed_450mhz_get_cdclk;
>  	else if (IS_GM45(dev_priv))
>  		dev_priv->display.get_cdclk = gm45_get_cdclk;
> -	else if (IS_G4X(dev_priv))
> +	else if (IS_G45(dev_priv))
>  		dev_priv->display.get_cdclk = g33_get_cdclk;
>  	else if (IS_I965GM(dev_priv))
>  		dev_priv->display.get_cdclk = i965gm_get_cdclk;
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC