<div dir="ltr">Oh I think we should reorganize everything here now... <div><br></div><div>It got messy... Well it was messy anyway already...</div><div><br></div><div>not this patch's fault so:</div><div><br></div><div>Reviewed-by: Rodrigo Vivi <<a href="mailto:rodrigo.vivi@intel.com">rodrigo.vivi@intel.com</a>></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Sep 4, 2014 at 4:27 AM, Damien Lespiau <span dir="ltr"><<a href="mailto:damien.lespiau@intel.com" target="_blank">damien.lespiau@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Gen9 is different enough (for instance, fetching the memory latency<br>
values is different from ILK+) to not take the HAS_PCH_SPLIT() branch,<br>
so let's prefer a clean separation.<br>
<br>
v2: Rebase on top of the broadwell_init_clock_gating() name change<br>
<br>
Signed-off-by: Damien Lespiau <<a href="mailto:damien.lespiau@intel.com">damien.lespiau@intel.com</a>><br>
---<br>
drivers/gpu/drm/i915/intel_pm.c | 6 +++---<br>
1 file changed, 3 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c<br>
index faff54e..a236e77 100644<br>
--- a/drivers/gpu/drm/i915/intel_pm.c<br>
+++ b/drivers/gpu/drm/i915/intel_pm.c<br>
@@ -7395,7 +7395,9 @@ void intel_init_pm(struct drm_device *dev)<br>
i915_ironlake_get_mem_freq(dev);<br>
<br>
/* For FIFO watermark updates */<br>
- if (HAS_PCH_SPLIT(dev)) {<br>
+ if (IS_GEN9(dev)) {<br>
+ dev_priv->display.init_clock_gating = gen9_init_clock_gating;<br>
+ } else if (HAS_PCH_SPLIT(dev)) {<br>
ilk_setup_wm_latency(dev);<br>
<br>
if ((IS_GEN5(dev) && dev_priv->wm.pri_latency[1] &&<br>
@@ -7419,8 +7421,6 @@ void intel_init_pm(struct drm_device *dev)<br>
dev_priv->display.init_clock_gating = haswell_init_clock_gating;<br>
else if (INTEL_INFO(dev)->gen == 8)<br>
dev_priv->display.init_clock_gating = broadwell_init_clock_gating;<br>
- else if (INTEL_INFO(dev)->gen == 9)<br>
- dev_priv->display.init_clock_gating = gen9_init_clock_gating;<br>
} else if (IS_CHERRYVIEW(dev)) {<br>
dev_priv->display.update_wm = cherryview_update_wm;<br>
dev_priv->display.update_sprite_wm = valleyview_update_sprite_wm;<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.8.3.1<br>
<br>
_______________________________________________<br>
Intel-gfx mailing list<br>
<a href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/intel-gfx" target="_blank">http://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Rodrigo Vivi</div><div>Blog: <a href="http://blog.vivi.eng.br" target="_blank">http://blog.vivi.eng.br</a></div><div> </div>
</div>