[PATCH] Revert "drm/i915/vlv: fixup DDR freq detection per Punit spec"

[PATCH] Revert "drm/i915/vlv: fixup DDR freq detection per Punit spec"

[deepak.s]

From: Deepak S <deepak.s@linux.intel.com>

This reverts commit f64a28a7c5ab2fc342326de9e126acf3cc0f91d6.

As per the inputs provided by hardware team  we still use DDR
Rates as 0,1=800, 2=1066, 3=1333.
With this change, Turbo freqs used on current machines matches.
---
 drivers/gpu/drm/i915/intel_pm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 30730be..2c8c7da 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5049,13 +5049,11 @@ static void valleyview_init_clock_gating(struct drm_device *dev)
 	mutex_unlock(&dev_priv->rps.hw_lock);
 	switch ((val >> 6) & 3) {
 	case 0:
-		dev_priv->mem_freq = 800;
-		break;
 	case 1:
-		dev_priv->mem_freq = 1066;
+		dev_priv->mem_freq = 800;
 		break;
 	case 2:
-		dev_priv->mem_freq = 1333;
+		dev_priv->mem_freq = 1066;
 		break;
 	case 3:
 		dev_priv->mem_freq = 1333;
-- 
1.9.1

Re: [PATCH] Revert "drm/i915/vlv: fixup DDR freq detection per Punit spec"

[Daniel Vetter]

On Sun, Mar 30, 2014 at 12:30:56PM +0530, deepak.s@linux.intel.com wrote:
> From: Deepak S <deepak.s@linux.intel.com>
> 
> This reverts commit f64a28a7c5ab2fc342326de9e126acf3cc0f91d6.
> 
> As per the inputs provided by hardware team  we still use DDR
> Rates as 0,1=800, 2=1066, 3=1333.
> With this change, Turbo freqs used on current machines matches.

sob line is missing here. Also a reference to all the previous commit
which changed this would be useful, any maybe a mention of any issues seen
in hw platforms shipping in the wild this patch fixes.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 30730be..2c8c7da 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -5049,13 +5049,11 @@ static void valleyview_init_clock_gating(struct drm_device *dev)
>  	mutex_unlock(&dev_priv->rps.hw_lock);
>  	switch ((val >> 6) & 3) {
>  	case 0:
> -		dev_priv->mem_freq = 800;
> -		break;
>  	case 1:
> -		dev_priv->mem_freq = 1066;
> +		dev_priv->mem_freq = 800;
>  		break;
>  	case 2:
> -		dev_priv->mem_freq = 1333;
> +		dev_priv->mem_freq = 1066;
>  		break;
>  	case 3:
>  		dev_priv->mem_freq = 1333;
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: [PATCH] Revert "drm/i915/vlv: fixup DDR freq detection per Punit spec"

[Jesse Barnes]

On Sun, 30 Mar 2014 12:30:56 +0530
deepak.s@linux.intel.com wrote:

> From: Deepak S <deepak.s@linux.intel.com>
> 
> This reverts commit f64a28a7c5ab2fc342326de9e126acf3cc0f91d6.
> 
> As per the inputs provided by hardware team  we still use DDR
> Rates as 0,1=800, 2=1066, 3=1333.
> With this change, Turbo freqs used on current machines matches.
> ---

I don't know what to do about this... I don't have a bunch of machines
to test with, and the docs say different.

But if you have feedback from the hw guys, I guess

Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center

[PATCH v2] Revert "drm/i915/vlv: fixup DDR freq detection per Punit spec"

[deepak.s]

From: Deepak S <deepak.s@linux.intel.com>

As per the inputs provided by hardware team  we still use DDR
Rates as 0,1=800, 2=1066, 3=1333.
With this change, Turbo freqs used on current machines matches.

This reverts commit f64a28a7c5ab2fc342326de9e126acf3cc0f91d6.

commit f64a28a7c5ab2fc342326de9e126acf3cc0f91d6
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Nov 4 16:07:00 2013 -0800

     drm/i915/vlv: fixup DDR freq detection per Punit spec

v2: Add reference to previous commit which changed this. (Daniel)

Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index e9a9aef..55dcda6 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -5037,13 +5037,11 @@ static void valleyview_init_clock_gating(struct drm_device *dev)
 	mutex_unlock(&dev_priv->rps.hw_lock);
 	switch ((val >> 6) & 3) {
 	case 0:
-		dev_priv->mem_freq = 800;
-		break;
 	case 1:
-		dev_priv->mem_freq = 1066;
+		dev_priv->mem_freq = 800;
 		break;
 	case 2:
-		dev_priv->mem_freq = 1333;
+		dev_priv->mem_freq = 1066;
 		break;
 	case 3:
 		dev_priv->mem_freq = 1333;
-- 
1.9.1

Re: [PATCH v2] Revert "drm/i915/vlv: fixup DDR freq detection per Punit spec"

[Daniel Vetter]

On Thu, Apr 03, 2014 at 09:01:28PM +0530, deepak.s@linux.intel.com wrote:
> From: Deepak S <deepak.s@linux.intel.com>
> 
> As per the inputs provided by hardware team  we still use DDR
> Rates as 0,1=800, 2=1066, 3=1333.
> With this change, Turbo freqs used on current machines matches.
> 
> This reverts commit f64a28a7c5ab2fc342326de9e126acf3cc0f91d6.
> 
> commit f64a28a7c5ab2fc342326de9e126acf3cc0f91d6
> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date:   Mon Nov 4 16:07:00 2013 -0800
> 
>      drm/i915/vlv: fixup DDR freq detection per Punit spec
> 
> v2: Add reference to previous commit which changed this. (Daniel)
> 
> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Deepak S <deepak.s@linux.intel.com>

Picked up for -fixes, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch