Re: [Intel-gfx] [PATCH 07/22] drm/i915: new register for IS_DISPLAYREG

2013-02-06 Thread Jani Nikula 
On Sat, 02 Feb 2013, Jesse Barnes jbar...@virtuousgeek.org wrote:
 From: Ben Widawsky b...@bwidawsk.net

 Signed-off-by: Ben Widawsky b...@bwidawsk.net
 ---
  drivers/gpu/drm/i915/i915_drv.c |7 +++
  drivers/gpu/drm/i915/i915_reg.h |1 +
  2 files changed, 4 insertions(+), 4 deletions(-)

 diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
 index b35b479..28d5992 100644
 --- a/drivers/gpu/drm/i915/i915_drv.c
 +++ b/drivers/gpu/drm/i915/i915_drv.c
 @@ -1193,10 +1193,6 @@ static bool IS_DISPLAYREG(u32 reg)
   reg = VLV_ISR)
   return false;
  
 - if (reg == FORCEWAKE_VLV ||
 - reg == FORCEWAKE_ACK_VLV)
 - return false;
 -
   if (reg == GEN6_GDRST)
   return false;
  
 @@ -1213,6 +1209,9 @@ static bool IS_DISPLAYREG(u32 reg)
   case GEN6_MBCTL:
   case GEN6_UCGCTL2:
   case GEN7_UCGCTL4:
 + case FORCEWAKE_VLV:
 + case FORCEWAKE_ACK_VLV:
 + case VLV_GTLC_WAKE_CTRL:

Obviously the IS_DISPLAYREG bits can be dropped now.

BR,
Jani.

   return false;
   default:
   break;
 diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
 index c785750..7e13f34 100644
 --- a/drivers/gpu/drm/i915/i915_reg.h
 +++ b/drivers/gpu/drm/i915/i915_reg.h
 @@ -4212,6 +4212,7 @@
  #define  FORCEWAKE_ACK_VLV   0x1300b4
  #define  FORCEWAKE_ACK_HSW   0x130044
  #define  FORCEWAKE_ACK   0x130090
 +#define  VLV_GTLC_WAKE_CTRL  0x130090
  #define  FORCEWAKE_MT0xa188 /* 
 multi-threaded */
  #define   FORCEWAKE_KERNEL   0x1
  #define   FORCEWAKE_USER 0x2
 -- 
 1.7.9.5

 ___
 Intel-gfx mailing list
 Intel-gfx@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 07/22] drm/i915: new register for IS_DISPLAYREG

2013-02-02 Thread Jesse Barnes 
From: Ben Widawsky b...@bwidawsk.net

Signed-off-by: Ben Widawsky b...@bwidawsk.net
---
 drivers/gpu/drm/i915/i915_drv.c |7 +++
 drivers/gpu/drm/i915/i915_reg.h |1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index b35b479..28d5992 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1193,10 +1193,6 @@ static bool IS_DISPLAYREG(u32 reg)
reg = VLV_ISR)
return false;
 
-   if (reg == FORCEWAKE_VLV ||
-   reg == FORCEWAKE_ACK_VLV)
-   return false;
-
if (reg == GEN6_GDRST)
return false;
 
@@ -1213,6 +1209,9 @@ static bool IS_DISPLAYREG(u32 reg)
case GEN6_MBCTL:
case GEN6_UCGCTL2:
case GEN7_UCGCTL4:
+   case FORCEWAKE_VLV:
+   case FORCEWAKE_ACK_VLV:
+   case VLV_GTLC_WAKE_CTRL:
return false;
default:
break;
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index c785750..7e13f34 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4212,6 +4212,7 @@
 #define  FORCEWAKE_ACK_VLV 0x1300b4
 #define  FORCEWAKE_ACK_HSW 0x130044
 #define  FORCEWAKE_ACK 0x130090
+#define  VLV_GTLC_WAKE_CTRL0x130090
 #define  FORCEWAKE_MT  0xa188 /* multi-threaded */
 #define   FORCEWAKE_KERNEL 0x1
 #define   FORCEWAKE_USER   0x2
-- 
1.7.9.5

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx