From mboxrd@z Thu Jan 1 00:00:00 1970 From: Damien Lespiau Subject: Re: [PATCH] drm/i915/chv: WaDisablePwrmtrEvent:chv on CHV only Date: Mon, 9 Jun 2014 18:32:38 +0100 Message-ID: <20140609173238.GA27756@strange.amr.corp.intel.com> References: <1402333609-5782-1-git-send-email-Tom.O'Rourke@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id B22676E59B for ; Mon, 9 Jun 2014 10:32:40 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1402333609-5782-1-git-send-email-Tom.O'Rourke@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Tom.O'Rourke@intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Jun 09, 2014 at 10:06:49AM -0700, Tom.O'Rourke@intel.com wrote: > From: Tom O'Rourke > > In gen8_enable_rps, don't write CHV registers unless IS_CHERRYVIEW. > > Signed-off-by: Tom O'Rourke A lovely catch. Reviewed-by: Damien Lespiau -- Damien > --- > drivers/gpu/drm/i915/intel_pm.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index d9c5918..3d3e402 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3522,8 +3522,10 @@ static void gen8_enable_rps(struct drm_device *dev) > I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10); > > /* WaDisablePwrmtrEvent:chv (pre-production hw) */ > - I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff); > - I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00); > + if (IS_CHERRYVIEW(dev)) { > + I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff); > + I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00); > + } > > /* 5: Enable RPS */ > I915_WRITE(GEN6_RP_CONTROL, > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx