diff mbox

[v2] drm/i915: Don't use GEN6_RC_VIDEO_FREQ on gen10+

Message ID 20171117080146.20150-1-david.weinehall@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

David Weinehall Nov. 17, 2017, 8:01 a.m. UTC 
GEN6_RC_VIDEO_FREQ is deprecated for >= gen10;
don't try to program it.

v2: Use IS_GEN9() instead of INTEL_GEN() and remove comment (Rodrigo)

Signed-off-by: David Weinehall <david.weinehall@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Rodrigo Vivi Nov. 20, 2017, 10:33 p.m. UTC | #1 
On Fri, Nov 17, 2017 at 08:01:46AM +0000, David Weinehall wrote:
> GEN6_RC_VIDEO_FREQ is deprecated for >= gen10;
> don't try to program it.
> 
> v2: Use IS_GEN9() instead of INTEL_GEN() and remove comment (Rodrigo)
> 
> Signed-off-by: David Weinehall <david.weinehall@linux.intel.com>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Merged to dinq. Thanks for the patch.

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 8c69ec9eb6ee..8f6c02477226 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -6583,9 +6583,10 @@ static void gen9_enable_rps(struct drm_i915_private *dev_priv)
>  {
>  	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
>  
> -	/* Program defaults and thresholds for RPS*/
> -	I915_WRITE(GEN6_RC_VIDEO_FREQ,
> -		GEN9_FREQUENCY(dev_priv->gt_pm.rps.rp1_freq));
> +	/* Program defaults and thresholds for RPS */
> +	if (IS_GEN9(dev_priv))
> +		I915_WRITE(GEN6_RC_VIDEO_FREQ,
> +			GEN9_FREQUENCY(dev_priv->gt_pm.rps.rp1_freq));
>  
>  	/* 1 second timeout*/
>  	I915_WRITE(GEN6_RP_DOWN_TIMEOUT,
> -- 
> 2.15.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 8c69ec9eb6ee..8f6c02477226 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6583,9 +6583,10 @@  static void gen9_enable_rps(struct drm_i915_private *dev_priv)
 {
 	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 
-	/* Program defaults and thresholds for RPS*/
-	I915_WRITE(GEN6_RC_VIDEO_FREQ,
-		GEN9_FREQUENCY(dev_priv->gt_pm.rps.rp1_freq));
+	/* Program defaults and thresholds for RPS */
+	if (IS_GEN9(dev_priv))
+		I915_WRITE(GEN6_RC_VIDEO_FREQ,
+			GEN9_FREQUENCY(dev_priv->gt_pm.rps.rp1_freq));
 
 	/* 1 second timeout*/
 	I915_WRITE(GEN6_RP_DOWN_TIMEOUT,