[git pull] drm fixes

[Jesse Barnes]

On Thu, 23 Feb 2012 21:19:20 +0100
Torsten Kaiser <just.for.lkml at googlemail.com> wrote:

> On Wed, Feb 22, 2012 at 8:56 PM, Dave Airlie <airlied at linux.ie> wrote:
> > Eugeni Dodonov (4):
> >      drm/i915: gen7: implement rczunit workaround
> >      drm/i915: gen7: Implement an L3 caching workaround.
> >      drm/i915: gen7: work around a system hang on IVB
> >      drm/i915: do not enable RC6p on Sandy Bridge
> 
> That last patch about RC6p looks wrong.
> 
> It does:
>  GEN6_RC_CTL_RC6_ENABLE |
> 			(IS_GEN7(dev_priv->dev)) ? GEN6_RC_CTL_RC6p_ENABLE : 0;
> But I think this was meant:
>  GEN6_RC_CTL_RC6_ENABLE |
> 			((IS_GEN7(dev_priv->dev)) ? GEN6_RC_CTL_RC6p_ENABLE : 0);
> 
> Or did I get the operator precedence wrong?

You're right, no cookie for Eugeni. :)  This would have prevented RC6
from ever getting enabled though, which should have the same effect as
the patch intended, though at the cost of higher power consumption.

Fix just sent to Dave anyway.

-- 
Jesse Barnes, Intel Open Source Technology Center
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20120227/94db2cce/attachment.pgp>