From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Tom.O'Rourke@intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915/chv: Fix "drm/i915/chv: Add a bunch of pre production workarounds"
Date: Thu, 12 Jun 2014 11:20:36 +0300 [thread overview]
Message-ID: <20140612082036.GP27580@intel.com> (raw)
In-Reply-To: <1402442794-166797-1-git-send-email-Tom.O'Rourke@intel.com>
On Tue, Jun 10, 2014 at 04:26:34PM -0700, Tom.O'Rourke@intel.com wrote:
> From: Tom O'Rourke <Tom.O'Rourke@intel.com>
>
> Correct a merge mishap in commit e4443e459ccf43f2c139358400365fd6a839d40d.
>
> Wa*:chv belongs in cherryview_enable_rps, not gen8_enable_rps.
>
> Signed-off-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 18f0ba0..c6e893b 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3520,15 +3520,11 @@ 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);
> -
> /* 5: Enable RPS */
> I915_WRITE(GEN6_RP_CONTROL,
> GEN6_RP_MEDIA_TURBO |
> GEN6_RP_MEDIA_HW_NORMAL_MODE |
> - GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
> + GEN6_RP_MEDIA_IS_GFX |
> GEN6_RP_ENABLE |
> GEN6_RP_UP_BUSY_AVG |
> GEN6_RP_DOWN_IDLE_AVG);
> @@ -4022,10 +4018,14 @@ static void cherryview_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);
> +
> /* 5: Enable RPS */
> I915_WRITE(GEN6_RP_CONTROL,
> GEN6_RP_MEDIA_HW_NORMAL_MODE |
> - GEN6_RP_MEDIA_IS_GFX |
> + GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
> GEN6_RP_ENABLE |
> GEN6_RP_UP_BUSY_AVG |
> GEN6_RP_DOWN_IDLE_AVG);
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
next prev parent reply other threads:[~2014-06-12 8:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-09 17:06 [PATCH] drm/i915/chv: WaDisablePwrmtrEvent:chv on CHV only Tom.O'Rourke
2014-06-09 17:32 ` Damien Lespiau
2014-06-10 15:30 ` Jani Nikula
2014-06-10 15:34 ` Jani Nikula
2014-06-10 17:16 ` Ville Syrjälä
2014-06-10 18:17 ` Jani Nikula
2014-06-10 19:03 ` O'Rourke, Tom
2014-06-10 19:15 ` Ville Syrjälä
2014-06-10 23:26 ` [PATCH] drm/i915/chv: Fix "drm/i915/chv: Add a bunch of pre production workarounds" Tom.O'Rourke
2014-06-12 8:20 ` Ville Syrjälä [this message]
2014-06-12 10:35 ` Daniel Vetter
2014-06-12 10:33 ` [PATCH] drm/i915/chv: WaDisablePwrmtrEvent:chv on CHV only Jani Nikula
2014-06-12 12:42 ` Daniel Vetter
2014-06-13 8:35 ` [PATCH] drm/i915/bdw: remove erroneous chv specific workarounds from bdw code Jani Nikula
2014-06-13 8:53 ` Jani Nikula
2014-06-13 15:55 ` O'Rourke, Tom
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140612082036.GP27580@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=Tom.O'Rourke@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox