diff mbox

[09/12] drm/i915/skl: Remove WaSetGAPSunitClckGateDisable

Message ID 1443188026-1222-10-git-send-email-arun.siluvery@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

arun.siluvery@linux.intel.com Sept. 25, 2015, 1:33 p.m. UTC 
Dropping it because it is for pre-production stepping, also removed
bit definition in i915_reg as it is not used anywhere else.

Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h | 1 -
 drivers/gpu/drm/i915/intel_pm.c | 6 ------
 2 files changed, 7 deletions(-)

Comments

Ville Syrjälä Sept. 25, 2015, 5:43 p.m. UTC | #1 
On Fri, Sep 25, 2015 at 02:33:43PM +0100, Arun Siluvery wrote:
> Dropping it because it is for pre-production stepping, also removed
> bit definition in i915_reg as it is not used anywhere else.
> 
> Signed-off-by: Arun Siluvery <arun.siluvery@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h | 1 -
>  drivers/gpu/drm/i915/intel_pm.c | 6 ------
>  2 files changed, 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 085ffa2..ef3d71f 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -6705,7 +6705,6 @@ enum skl_disp_power_wells {
>  #define GEN6_RSTCTL				0x9420
>  
>  #define GEN8_UCGCTL6				0x9430
> -#define   GEN8_GAPSUNIT_CLOCK_GATE_DISABLE	(1<<24)
>  #define   GEN8_SDEUNIT_CLOCK_GATE_DISABLE	(1<<14)
>  #define   GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ (1<<28)

I would keep the bit define.

> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index a6ee0d3..65c60bc 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -76,12 +76,6 @@ static void skl_init_clock_gating(struct drm_device *dev)
>  	gen9_init_clock_gating(dev);
>  
>  	if (INTEL_REVID(dev) <= SKL_REVID_B0) {
> -		/*
> -		 * WaSetGAPSunitClckGateDisable:skl
> -		 */
> -		I915_WRITE(GEN8_UCGCTL6, I915_READ(GEN8_UCGCTL6) |
> -			   GEN8_GAPSUNIT_CLOCK_GATE_DISABLE);
> -

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

But again BSpec is confused. It says BXT until B0 would also need this,
whereas w/a db doesn't have it fot BXT.

>  		/* WaDisableVFUnitClockGating:skl */
>  		I915_WRITE(GEN6_UCGCTL2, I915_READ(GEN6_UCGCTL2) |
>  			   GEN6_VFUNIT_CLOCK_GATE_DISABLE);
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 085ffa2..ef3d71f 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6705,7 +6705,6 @@  enum skl_disp_power_wells {
 #define GEN6_RSTCTL				0x9420
 
 #define GEN8_UCGCTL6				0x9430
-#define   GEN8_GAPSUNIT_CLOCK_GATE_DISABLE	(1<<24)
 #define   GEN8_SDEUNIT_CLOCK_GATE_DISABLE	(1<<14)
 #define   GEN8_HDCUNIT_CLOCK_GATE_DISABLE_HDCREQ (1<<28)
 
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index a6ee0d3..65c60bc 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -76,12 +76,6 @@  static void skl_init_clock_gating(struct drm_device *dev)
 	gen9_init_clock_gating(dev);
 
 	if (INTEL_REVID(dev) <= SKL_REVID_B0) {
-		/*
-		 * WaSetGAPSunitClckGateDisable:skl
-		 */
-		I915_WRITE(GEN8_UCGCTL6, I915_READ(GEN8_UCGCTL6) |
-			   GEN8_GAPSUNIT_CLOCK_GATE_DISABLE);
-
 		/* WaDisableVFUnitClockGating:skl */
 		I915_WRITE(GEN6_UCGCTL2, I915_READ(GEN6_UCGCTL2) |
 			   GEN6_VFUNIT_CLOCK_GATE_DISABLE);