evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915/skl: Move gen9 pm initialization into its own branch

Browse source 
Gen9 is different enough (for instance, fetching the memory latency
values is different from ILK+) to not take the HAS_PCH_SPLIT() branch,
so let's prefer a clean separation.

v2: Rebase on top of the broadwell_init_clock_gating() name change

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Damien Lespiau 2014-03-28 00:18:35 +05:30 • committed by Daniel Vetter
parent 6af31a653d
commit c83155a604
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/i915/intel_pm.c
View file

@ -7397,7 +7397,9 @@ void intel_init_pm(struct drm_device *dev)
i915_ironlake_get_mem_freq(dev); i915_ironlake_get_mem_freq(dev);
/* For FIFO watermark updates */ /* For FIFO watermark updates */
if (HAS_PCH_SPLIT(dev)) { if (IS_GEN9(dev)) {
dev_priv->display.init_clock_gating = gen9_init_clock_gating;
} else if (HAS_PCH_SPLIT(dev)) {
ilk_setup_wm_latency(dev); ilk_setup_wm_latency(dev);
if ((IS_GEN5(dev) && dev_priv->wm.pri_latency[1] && if ((IS_GEN5(dev) && dev_priv->wm.pri_latency[1] &&
@ -7421,8 +7423,6 @@ void intel_init_pm(struct drm_device *dev)
dev_priv->display.init_clock_gating = haswell_init_clock_gating; dev_priv->display.init_clock_gating = haswell_init_clock_gating;
else if (INTEL_INFO(dev)->gen == 8) else if (INTEL_INFO(dev)->gen == 8)
dev_priv->display.init_clock_gating = broadwell_init_clock_gating; dev_priv->display.init_clock_gating = broadwell_init_clock_gating;
else if (INTEL_INFO(dev)->gen == 9)
dev_priv->display.init_clock_gating = gen9_init_clock_gating;
} else if (IS_CHERRYVIEW(dev)) { } else if (IS_CHERRYVIEW(dev)) {
dev_priv->display.update_wm = cherryview_update_wm; dev_priv->display.update_wm = cherryview_update_wm;
dev_priv->display.update_sprite_wm = valleyview_update_sprite_wm; dev_priv->display.update_sprite_wm = valleyview_update_sprite_wm;