From patchwork Wed Dec 29 20:16:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 438161 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBUM59Jf026897 for ; Thu, 30 Dec 2010 22:05:31 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7409A9EAF2 for ; Wed, 29 Dec 2010 12:16:17 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from oproxy3-pub.bluehost.com (oproxy3-pub.bluehost.com [69.89.21.8]) by gabe.freedesktop.org (Postfix) with SMTP id 402179E808 for ; Wed, 29 Dec 2010 12:16:07 -0800 (PST) Received: (qmail 28801 invoked by uid 0); 29 Dec 2010 20:16:04 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy3.bluehost.com with SMTP; 29 Dec 2010 20:16:04 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=grIFZQ3MnS1q/0ROQW+bzmt1nOWlR5mH95lc5vdSd5VyKDd/VrtqRFPJdoSdyVNgCZmK8oDq7SBdr/6wUaFOB+PF2wysxdc5MWA3DbXfUsA5Qmin0WBCQnJ/0P8BMmut; Received: from c-67-174-193-198.hsd1.ca.comcast.net ([67.174.193.198] helo=jbarnes-desktop) by box514.bluehost.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) (envelope-from ) id 1PY2RI-0005Ok-03; Wed, 29 Dec 2010 13:16:04 -0700 Date: Wed, 29 Dec 2010 12:16:01 -0800 From: Jesse Barnes To: Linus Torvalds Subject: Re: Linux 2.6.37-rc8 (no fb) Message-ID: <20101229121601.179983b7@jbarnes-desktop> In-Reply-To: References: <20101229102127.06c0e505.randy.dunlap@oracle.com> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.174.193.198 authed with jbarnes@virtuousgeek.org} Cc: Randy Dunlap , Jeff Chua , Alex Riesen , Linux Kernel Mailing List , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 30 Dec 2010 22:05:31 +0000 (UTC) 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))