| Message ID | 1341443222-20460-1-git-send-email-eugeni.dodonov@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 4 Jul 2012 20:07:02 -0300, Eugeni Dodonov <eugeni.dodonov@intel.com> wrote: > Noticed by Chris Wilson, this got through in the last iteration of the rps > for Haswell patch. That's the fix. Hopefully there is enough time for Daniel to rewrite history and spare our blushes. -Chris
On Thu, Jul 05, 2012 at 01:00:10AM +0100, Chris Wilson wrote: > On Wed, 4 Jul 2012 20:07:02 -0300, Eugeni Dodonov <eugeni.dodonov@intel.com> wrote: > > Noticed by Chris Wilson, this got through in the last iteration of the rps > > for Haswell patch. > > That's the fix. Hopefully there is enough time for Daniel to rewrite > history and spare our blushes. History is fixed, it never happened. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 0350bab..e697df7 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2460,7 +2460,7 @@ static void gen6_enable_rps(struct drm_device *dev) GEN6_RP_MEDIA_IS_GFX | GEN6_RP_ENABLE | GEN6_RP_UP_BUSY_AVG | - (IS_HASWELL(dev)) ? GEN7_RP_DOWN_IDLE_AVG : GEN6_RP_DOWN_IDLE_CONT); + (IS_HASWELL(dev) ? GEN7_RP_DOWN_IDLE_AVG : GEN6_RP_DOWN_IDLE_CONT)); if (wait_for((I915_READ(GEN6_PCODE_MAILBOX) & GEN6_PCODE_READY) == 0, 500))
Noticed by Chris Wilson, this got through in the last iteration of the rps for Haswell patch. CC: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com> --- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)