diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2012-11-20 10:27:43 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-21 11:47:11 -0500 |
commit | d567b07fce8f55f82e2cfe040cd74f7b4997ff38 (patch) | |
tree | 7f25f959da356ad1fba176f522f87b45f5034d4b /drivers | |
parent | 54075a7d75732147c32f7a99af5218f7d0f62596 (diff) |
drm/i915: fix intel_ddi_get_cdclk_freq for ULT machines
For now, this code is just used by the eDP AUX channel frequency.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 669afcabe3b1..87c06f97fa89 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -1161,6 +1161,8 @@ struct drm_i915_file_private { | |||
1161 | #define IS_VALLEYVIEW(dev) (INTEL_INFO(dev)->is_valleyview) | 1161 | #define IS_VALLEYVIEW(dev) (INTEL_INFO(dev)->is_valleyview) |
1162 | #define IS_HASWELL(dev) (INTEL_INFO(dev)->is_haswell) | 1162 | #define IS_HASWELL(dev) (INTEL_INFO(dev)->is_haswell) |
1163 | #define IS_MOBILE(dev) (INTEL_INFO(dev)->is_mobile) | 1163 | #define IS_MOBILE(dev) (INTEL_INFO(dev)->is_mobile) |
1164 | #define IS_ULT(dev) (IS_HASWELL(dev) && \ | ||
1165 | ((dev)->pci_device & 0xFF00) == 0x0A00) | ||
1164 | 1166 | ||
1165 | /* | 1167 | /* |
1166 | * The genX designation typically refers to the render engine, so render | 1168 | * The genX designation typically refers to the render engine, so render |
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index d706d538e8b7..852012b6fc5b 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c | |||
@@ -1309,6 +1309,8 @@ int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv) | |||
1309 | else if ((I915_READ(LCPLL_CTL) & LCPLL_CLK_FREQ_MASK) == | 1309 | else if ((I915_READ(LCPLL_CTL) & LCPLL_CLK_FREQ_MASK) == |
1310 | LCPLL_CLK_FREQ_450) | 1310 | LCPLL_CLK_FREQ_450) |
1311 | return 450; | 1311 | return 450; |
1312 | else if (IS_ULT(dev_priv->dev)) | ||
1313 | return 338; | ||
1312 | else | 1314 | else |
1313 | return 540; | 1315 | return 540; |
1314 | } | 1316 | } |