From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: Linux 2.6.37-rc8 (no fb) Date: Wed, 29 Dec 2010 12:16:01 -0800 Message-ID: <20101229121601.179983b7@jbarnes-desktop> References: <20101229102127.06c0e505.randy.dunlap@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Linus Torvalds Cc: Randy Dunlap , Linux Kernel Mailing List , dri-devel@lists.freedesktop.org, Jeff Chua , Alex Riesen List-Id: dri-devel@lists.freedesktop.org On Wed, 29 Dec 2010 11:40:04 -0800 Linus Torvalds wrote: > On Wed, Dec 29, 2010 at 10:21 AM, Randy Dunlap wrote: > > > > The only significant difference that I can see in the kernel message log > > is this: > > Hmm. I suspect that difference should have gone away with commit > 92971021c6328 (Revert "drm: Don't try and disable an encoder that was > never enabled"), but clearly that didn't fix your blank screen. > > Does reverting commit 448f53a1ede54eb854d036abf54573281412d650 > ("drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks") fix it for > you? It does for some people.. > > Chris - why did that lvds_ssc_freq thing suddenly start mattering? Can > we please just disable spread-spectrum entirely? Or perhaps only if we > notice that it was enabled already? Or something? Randy, Jeff and Alex, does the below help at all? If so, it may be the minimal fix we want for 2.6.37. diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios index 2b20786..d27d016 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -263,6 +263,9 @@ parse_general_features(struct drm_i915_private *dev_priv, dev_priv->int_tv_support = general->int_tv_support; dev_priv->int_crt_support = general->int_crt_support; dev_priv->lvds_use_ssc = general->enable_ssc; + /* force disable until we can parse this correctly */ + if (IS_GEN5(dev) || IS_GEN6(dev)) + dev_priv->lvds_use_ssc = 0; if (dev_priv->lvds_use_ssc) { if (IS_I85X(dev)) -- Jesse Barnes, Intel Open Source Technology Center