diff options
| author |   Jani Nikula <jani.nikula@intel.com> | 2019-04-16 11:28:52 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2019-04-17 11:50:23 +0300 |
| commit | 5b354966d0d470488d8dd244f0b5d82e9ecc4e18 (patch) | |
| tree | c3c33cdbda9573f8c57ef12b7ab54f8ce9542f5d /drivers/gpu/drm/i915 | |
| parent | drm/i915: Introduce struct class_instance for engines across the uAPI (diff) | |
| download | linux-dev-5b354966d0d470488d8dd244f0b5d82e9ecc4e18.tar.xz linux-dev-5b354966d0d470488d8dd244f0b5d82e9ecc4e18.zip | |
drm/i915/ehl: inherit icl cdclk init/uninit
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.
Fixes: 39564ae86d51 ("drm/i915/ehl: Inherit Ice Lake conditional code")
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Bob Paauwe <bob.j.paauwe@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Bob Paauwe <bob.j.paauwe@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190416082852.18141-1-jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_cdclk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c index 7f060eaf1b17..ae40a8679314 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); |