From d57c472dd57be19ca18a5814d3d7421530af7f47 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 3 Dec 2009 09:52:43 -0800 Subject: [PATCH] --- yaml --- r: 174581 b: refs/heads/master c: 85364905f9ae12d19cb34099257d493e5d9a0c4e h: refs/heads/master i: 174579: 1189f90ef007b078420949d200d748eb66b60aac v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 40557b0796e9..249c04db927b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22fd0fab3b512b5fcb4fd0b0668deeaa701511f9 +refs/heads/master: 85364905f9ae12d19cb34099257d493e5d9a0c4e diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 22dcd0851637..6b9dd672dd59 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -4740,6 +4740,13 @@ void intel_modeset_init(struct drm_device *dev) (unsigned long)dev); intel_setup_overlay(dev); + + if (IS_IGD(dev) && !intel_get_cxsr_latency(IS_IGDG(dev), + dev_priv->fsb_freq, + dev_priv->mem_freq)) + DRM_INFO("failed to find known CxSR latency " + "(found fsb freq %d, mem freq %d), disabling CxSR\n", + dev_priv->fsb_freq, dev_priv->mem_freq); } void intel_modeset_cleanup(struct drm_device *dev)