From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: Linux 2.6.37-rc8 (no fb)
Date: Thu, 30 Dec 2010 10:16:58 -0800
Message-ID: <20101230101658.1d3a7837@jbarnes-desktop>
References: <Pine.LNX.4.64.1012301045170.5207@boston.corp.fedex.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org>
Received: from cpoproxy2-pub.bluehost.com (cpoproxy2-pub.bluehost.com
	[67.222.39.38])
	by gabe.freedesktop.org (Postfix) with SMTP id AA9A29E738
	for <dri-devel@lists.freedesktop.org>;
	Thu, 30 Dec 2010 10:17:00 -0800 (PST)
In-Reply-To: <Pine.LNX.4.64.1012301045170.5207@boston.corp.fedex.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
	<mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
To: Jeff Chua <jeff.chua.linux@gmail.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>, Alex Riesen <raa.lkml@gmail.com>, Linus Torvalds <torvalds@linux-foundation.org>, Linux Kernel <linux-kernel@vger.kernel.org>, dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

On Thu, 30 Dec 2010 10:49:33 +0800 (SGT)
Jeff Chua <jeff.chua.linux@gmail.com> wrote:

> 
> On Thu, Dec 30, 2010 at 4:16 AM, Jesse Barnes <jbarnes@virtuousgeek.org> 
> wrote:
> 
> > Randy, Jeff and Alex, does the below help at all?  If so, it may be the
> > minimal fix we want for 2.6.37.
> 
> Jesse,
> 
> Yes, that worked for me. I improved on the patch a bit below.
> 
> Thanks,
> Jeff
> 
> 
> --- a/drivers/gpu/drm/i915/intel_bios.c	2010-12-29 13:35:57.000000000 +0800
> +++ a/drivers/gpu/drm/i915/intel_bios.c	2010-12-30 10:18:39.000000000 +0800
> @@ -262,7 +262,10 @@
>   	if (general) {
>   		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 */
> +		dev_priv->lvds_use_ssc = (IS_GEN5(dev) || IS_GEN6(dev)) ?
> +			0 : general->enable_ssc;

For some expressions, the ternary operator is more compact & readable.
For others (like this one imo) it doesn't really add anything, so I
prefer the if statement.  In this case I think the if statement is more
readable since it communicates that we're overriding the default value
on certain generations (i.e. it's a standalone clause).

-- 
Jesse Barnes, Intel Open Source Technology Center