Update to 3.4-rc4.

[linux-flexiantxendom0-3.2.10.git] / drivers / gpu / drm / i915 / intel_display.c

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5908cd5..2f80637 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8439,7 +8439,11 @@ void gen6_update_ring_freq(struct drm_i915_private *dev_priv)
         * over
         */
        if (!max_ia_freq)
+#ifndef CONFIG_XEN
                max_ia_freq = tsc_khz;
+#else
+               max_ia_freq = cpu_khz;
+#endif
 
        /* Convert from kHz to MHz */
        max_ia_freq /= 1000;