From: Damien Lespiau Date: Wed, 1 Oct 2014 19:04:16 +0000 (+0100) Subject: drm/i915: Use IS_HSW_ULT() in HSW CDCLK clock read-out X-Git-Tag: firefly_0821_release~176^2~2672^2~78^2~52 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=95626e7caac4f0dbe285c59d9702b9f55af497eb;p=firefly-linux-kernel-4.4.55.git drm/i915: Use IS_HSW_ULT() in HSW CDCLK clock read-out hsw_get_cdclk_freq() is really just HSW, so we can use IS_HSW_ULT() instead of IS_ULT() there. Signed-off-by: Damien Lespiau Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index a151de7d13cd..cb5367c6f95a 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1291,7 +1291,7 @@ static int hsw_get_cdclk_freq(struct drm_i915_private *dev_priv) return 450000; else if (freq == LCPLL_CLK_FREQ_450) return 450000; - else if (IS_ULT(dev)) + else if (IS_HSW_ULT(dev)) return 337500; else return 540000;