[Intel-gfx] [PATCH] drm/i915/ehl: inherit icl cdclk init/uninit

[Bob Paauwe]

On Tue, 16 Apr 2019 11:28:52 +0300
Jani Nikula <jani.nikula at intel.com> wrote:

> The cdclk init/uninit code was changed by commit 93a643f29bcb
> ("drm/i915/cdclk: have only one init/uninit function") between the
> versions of commit 39564ae86d51 ("drm/i915/ehl: Inherit Ice Lake
> conditional code"). What got merged fails to do cdclk init/uninit on
> ehl.

Good catch!

Reviewed-by: Bob Paauwe <bob.j.paauwe at intel.com>

> 
> Fixes: 39564ae86d51 ("drm/i915/ehl: Inherit Ice Lake conditional code")
> Cc: José Roberto de Souza <jose.souza at intel.com>
> Cc: Lucas De Marchi <lucas.demarchi at intel.com>
> Cc: Bob Paauwe <bob.j.paauwe at intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at 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 7f060ea..ae40a86 100644
> --- a/drivers/gpu/drm/i915/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/intel_cdclk.c
> @@ -2034,7 +2034,7 @@ static void cnl_uninit_cdclk(struct drm_i915_private *dev_priv)
>   */
>  void intel_cdclk_init(struct drm_i915_private *i915)
>  {
> -	if (IS_ICELAKE(i915))
> +	if (INTEL_GEN(i915) >= 11)
>  		icl_init_cdclk(i915);
>  	else if (IS_CANNONLAKE(i915))
>  		cnl_init_cdclk(i915);
> @@ -2053,7 +2053,7 @@ void intel_cdclk_init(struct drm_i915_private *i915)
>   */
>  void intel_cdclk_uninit(struct drm_i915_private *i915)
>  {
> -	if (IS_ICELAKE(i915))
> +	if (INTEL_GEN(i915) >= 11)
>  		icl_uninit_cdclk(i915);
>  	else if (IS_CANNONLAKE(i915))
>  		cnl_uninit_cdclk(i915);



-- 
--
Bob Paauwe                  
Bob.J.Paauwe at intel.com
IOTG / PED Software Organization
Intel Corp.  Folsom, CA
(916) 356-6193