Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

drm/i915: Rename FBC_C3_IDLE to FBC_CTL_C3_IDLE to match other registers

Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Priit Laes 15 years ago
parent
5d9391628e
commit
4967790112
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      drivers/gpu/drm/i915/i915_reg.h
  2. 1 1
      drivers/gpu/drm/i915/intel_display.c

+ 1 - 1
drivers/gpu/drm/i915/i915_reg.h
View File 

@@ -366,7 +366,7 @@
 
 #define   FBC_CTL_PERIODIC	(1<<30)
 
 #define   FBC_CTL_PERIODIC	(1<<30)
 
 #define   FBC_CTL_INTERVAL_SHIFT (16)
 
 #define   FBC_CTL_INTERVAL_SHIFT (16)
 
 #define   FBC_CTL_UNCOMPRESSIBLE (1<<14)
 
 #define   FBC_CTL_UNCOMPRESSIBLE (1<<14)
 
-#define   FBC_C3_IDLE		(1<<13)
 
+#define   FBC_CTL_C3_IDLE	(1<<13)
 
 #define   FBC_CTL_STRIDE_SHIFT	(5)
 
 #define   FBC_CTL_STRIDE_SHIFT	(5)
 
 #define   FBC_CTL_FENCENO	(1<<0)
 
 #define   FBC_CTL_FENCENO	(1<<0)
 
 #define FBC_COMMAND		0x0320c
 
 #define FBC_COMMAND		0x0320c

+ 1 - 1
drivers/gpu/drm/i915/intel_display.c
View File 

@@ -1032,7 +1032,7 @@ static void i8xx_enable_fbc(struct drm_crtc *crtc, unsigned long interval)
 
 	/* enable it... */
 
 	/* enable it... */
 
 	fbc_ctl = FBC_CTL_EN | FBC_CTL_PERIODIC;
 
 	fbc_ctl = FBC_CTL_EN | FBC_CTL_PERIODIC;
 
 	if (IS_I945GM(dev))
 
 	if (IS_I945GM(dev))
 
-		fbc_ctl |= FBC_C3_IDLE; /* 945 needs special SR handling */
 
+		fbc_ctl |= FBC_CTL_C3_IDLE; /* 945 needs special SR handling */
 
 	fbc_ctl |= (dev_priv->cfb_pitch & 0xff) << FBC_CTL_STRIDE_SHIFT;
 
 	fbc_ctl |= (dev_priv->cfb_pitch & 0xff) << FBC_CTL_STRIDE_SHIFT;
 
 	fbc_ctl |= (interval & 0x2fff) << FBC_CTL_INTERVAL_SHIFT;
 
 	fbc_ctl |= (interval & 0x2fff) << FBC_CTL_INTERVAL_SHIFT;
 
 	if (obj_priv->tiling_mode != I915_TILING_NONE)
 
 	if (obj_priv->tiling_mode != I915_TILING_NONE)