openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/ehl: inherit icl cdclk init/uninit 

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

Fixes: 39564ae86d ("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
This commit is contained in:
Jani Nikula 2019-04-16 11:28:52 +03:00
parent d1172ab3d4
commit 5b354966d0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/intel_cdclk.c
View File

@ -2034,7 +2034,7 @@ static void cnl_uninit_cdclk(struct drm_i915_private *dev_priv)
*/ */
void intel_cdclk_init(struct drm_i915_private *i915) void intel_cdclk_init(struct drm_i915_private *i915)
{ {
if (IS_ICELAKE(i915)) if (INTEL_GEN(i915) >= 11)
icl_init_cdclk(i915); icl_init_cdclk(i915);
else if (IS_CANNONLAKE(i915)) else if (IS_CANNONLAKE(i915))
cnl_init_cdclk(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) void intel_cdclk_uninit(struct drm_i915_private *i915)
{ {
if (IS_ICELAKE(i915)) if (INTEL_GEN(i915) >= 11)
icl_uninit_cdclk(i915); icl_uninit_cdclk(i915);
else if (IS_CANNONLAKE(i915)) else if (IS_CANNONLAKE(i915))
cnl_uninit_cdclk(i915); cnl_uninit_cdclk(i915);