On Wed, 17 Apr 2019, "Souza, Jose" <jose.souza@xxxxxxxxx> wrote:
> On Tue, 2019-04-16 at 11:28 +0300, Jani Nikula 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.
>
> Thanks for catching up this
>
> Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx>
Thanks for the reviews, pushed (already yesterday).
BR,
Jani.
>
>>
>> Fixes: 39564ae86d51 ("drm/i915/ehl: Inherit Ice Lake conditional
>> code")
>> Cc: José Roberto de Souza <jose.souza@xxxxxxxxx>
>> Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
>> Cc: Bob Paauwe <bob.j.paauwe@xxxxxxxxx>
>> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>> ---
>> 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);
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
