diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_i2c.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 02c35d57fbed..ff7593f70f0f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/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) | |||
1226 | #define I915_WRITE8(reg, val) i915_write(dev_priv, (reg), (val), 1) | 1226 | #define I915_WRITE8(reg, val) i915_write(dev_priv, (reg), (val), 1) |
1227 | #define I915_WRITE64(reg, val) i915_write(dev_priv, (reg), (val), 8) | 1227 | #define I915_WRITE64(reg, val) i915_write(dev_priv, (reg), (val), 8) |
1228 | #define I915_READ64(reg) i915_read(dev_priv, (reg), 8) | 1228 | #define I915_READ64(reg) i915_read(dev_priv, (reg), 8) |
1229 | #define POSTING_READ(reg) (void)I915_READ(reg) | ||
1230 | #define POSTING_READ16(reg) (void)I915_READ16(reg) | ||
1231 | 1229 | ||
1232 | #define I915_READ_NOTRACE(reg) readl(dev_priv->regs + (reg)) | 1230 | #define I915_READ_NOTRACE(reg) readl(dev_priv->regs + (reg)) |
1233 | #define I915_WRITE_NOTRACE(reg, val) writel(val, dev_priv->regs + (reg)) | 1231 | #define I915_WRITE_NOTRACE(reg, val) writel(val, dev_priv->regs + (reg)) |
1234 | #define POSTING_READ_NOTRACE(reg) (void)I915_READ_NOTRACE(reg) | 1232 | #define I915_READ16_NOTRACE(reg) readw(dev_priv->regs + (reg)) |
1233 | #define I915_WRITE16_NOTRACE(reg, val) writew(val, dev_priv->regs + (reg)) | ||
1234 | |||
1235 | #define POSTING_READ(reg) (void)I915_READ_NOTRACE(reg) | ||
1236 | #define POSTING_READ16(reg) (void)I915_READ16_NOTRACE(reg) | ||
1235 | 1237 | ||
1236 | 1238 | ||
1237 | #define BEGIN_LP_RING(n) \ | 1239 | #define BEGIN_LP_RING(n) \ |
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index 8f5c0d33ea00..d2d493a24e65 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c | |||
@@ -126,7 +126,7 @@ static void set_clock(void *data, int state_high) | |||
126 | GPIO_CLOCK_VAL_MASK; | 126 | GPIO_CLOCK_VAL_MASK; |
127 | 127 | ||
128 | I915_WRITE_NOTRACE(gpio->reg, reserved | clock_bits); | 128 | I915_WRITE_NOTRACE(gpio->reg, reserved | clock_bits); |
129 | POSTING_READ_NOTRACE(gpio->reg); | 129 | POSTING_READ(gpio->reg); |
130 | } | 130 | } |
131 | 131 | ||
132 | static void set_data(void *data, int state_high) | 132 | static void set_data(void *data, int state_high) |
@@ -143,7 +143,7 @@ static void set_data(void *data, int state_high) | |||
143 | GPIO_DATA_VAL_MASK; | 143 | GPIO_DATA_VAL_MASK; |
144 | 144 | ||
145 | I915_WRITE_NOTRACE(gpio->reg, reserved | data_bits); | 145 | I915_WRITE_NOTRACE(gpio->reg, reserved | data_bits); |
146 | POSTING_READ_NOTRACE(gpio->reg); | 146 | POSTING_READ(gpio->reg); |
147 | } | 147 | } |
148 | 148 | ||
149 | static struct i2c_adapter * | 149 | static struct i2c_adapter * |