---

yaml --- r: 228702 b: refs/heads/master c: 374c479 h: refs/heads/master v: v3
git-mirror · Nov 8, 2010 · ce9f65d · ce9f65d
1 parent 2c4007b
commit ce9f65d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db5e4172a023cff68b3597ace8a5390b02669d27
+refs/heads/master: 374c479bef7ecd2b41d6dd6e24aa21d73b3afae5
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h
@@ -1226,12 +1226,14 @@ i915_write(struct drm_i915_private *dev_priv, u32 reg, u64 val, int len)
 #define I915_WRITE8(reg, val)	i915_write(dev_priv, (reg), (val), 1)
 #define I915_WRITE64(reg, val)	i915_write(dev_priv, (reg), (val), 8)
 #define I915_READ64(reg)	i915_read(dev_priv, (reg), 8)
-#define POSTING_READ(reg)	(void)I915_READ(reg)
-#define POSTING_READ16(reg)	(void)I915_READ16(reg)
 
 #define I915_READ_NOTRACE(reg)		readl(dev_priv->regs + (reg))
 #define I915_WRITE_NOTRACE(reg, val)	writel(val, dev_priv->regs + (reg))
-#define POSTING_READ_NOTRACE(reg)	(void)I915_READ_NOTRACE(reg)
+#define I915_READ16_NOTRACE(reg)		readw(dev_priv->regs + (reg))
+#define I915_WRITE16_NOTRACE(reg, val)	writew(val, dev_priv->regs + (reg))
+
+#define POSTING_READ(reg)	(void)I915_READ_NOTRACE(reg)
+#define POSTING_READ16(reg)	(void)I915_READ16_NOTRACE(reg)
 
 
 #define BEGIN_LP_RING(n) \

diff --git a/trunk/drivers/gpu/drm/i915/intel_i2c.c b/trunk/drivers/gpu/drm/i915/intel_i2c.c
@@ -126,7 +126,7 @@ static void set_clock(void *data, int state_high)
 			GPIO_CLOCK_VAL_MASK;
 
 	I915_WRITE_NOTRACE(gpio->reg, reserved | clock_bits);
-	POSTING_READ_NOTRACE(gpio->reg);
+	POSTING_READ(gpio->reg);
 }
 
 static void set_data(void *data, int state_high)
@@ -143,7 +143,7 @@ static void set_data(void *data, int state_high)
 			GPIO_DATA_VAL_MASK;
 
 	I915_WRITE_NOTRACE(gpio->reg, reserved | data_bits);
-	POSTING_READ_NOTRACE(gpio->reg);
+	POSTING_READ(gpio->reg);
 }
 
 static struct i2c_adapter *