Re: [git pull] drm fixes

From: Jesse Barnes
Date: Mon Feb 27 2012 - 11:09:17 EST


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

> On Wed, Feb 22, 2012 at 8:56 PM, Dave Airlie <airlied@xxxxxxxx> 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

Attachment: signature.asc
Description: PGP signature