[MAVERICK] request-pull drm/i915: fix VGA plane disable for Ironlake+

[manoj.iyer at canonical.com]

>
> Examining this patch, it appears to actually be upstream:
>
> commit 9cce37f4855a30cc7c364edf18522282782f7ddc
> Author: Jesse Barnes <jbarnes at virtuousgeek.org>
> Date:   Fri Aug 13 15:11:26 2010 -0700
>
>    drm/i915: fix VGA plane disable for Ironlake+
>

Yes this was cherry-pick from upstream with minor backporting.

> However, I noticed a discrepancy between the you've provided and the
> upstream version of the patch (see below).
>
>>
>> Buglink: http://launchpad.net/bugs/602281
>
> Minor nit pick, this should be "BugLink:" and if it could be moved to
> above the SOB's that'd be great.  More below ...
>

Sorry, that was a typo.

>>
>> -		i915_disable_vga(dev);
>> +		if (dev_priv->cfb_plane == plane &&
>> +		    dev_priv->display.disable_fbc)
>> +			dev_priv->display.disable_fbc(dev);
>
> The upstream version of patch 9cce37f4 does not add the above lines.  It
> seems the above lines are added as part of upstream commit:
>
> commit b52eb4dcab23fe0c52a437276258e0afcf913ef5
> Author: Zhao Yakui <yakui.zhao at intel.com>
> Date:   Sat Jun 12 14:32:27 2010 +0800
>
>    drm/i915: Add frame buffer compression support on Ironlake mobile
>
> Did you unintentionally add these lines when backporting upstream patch
> 9cce37f4?  If so, care to fix this up and re-send?  Also, if you do so,
> can you add the following line in the commit message:
>
> (backported from upstream commit 9cce37f4855a30cc7c364edf18522282782f7ddc)

Yep that is definitely my bad, I had that patch in that tree by mistake. 
Thanks for catching that error. I will send you a fresh patch with the 
correct bits from the patch. I will add the backported from string to the 
commit log.