Rev 4104 | Rev 4371 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4104 | Rev 4293 | ||
|---|---|---|---|
| Line 362... | Line 362... | ||
| 362 | dev_priv->uncore.funcs.force_wake_put(dev_priv); \ |
362 | dev_priv->uncore.funcs.force_wake_put(dev_priv); \ |
| 363 | } else { \ |
363 | } else { \ |
| 364 | val = __raw_i915_read##x(dev_priv, reg); \ |
364 | val = __raw_i915_read##x(dev_priv, reg); \ |
| 365 | } \ |
365 | } \ |
| 366 | spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); \ |
366 | spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); \ |
| - | 367 | trace_i915_reg_rw(false, reg, val, sizeof(val), trace); \ |
|
| 367 | return val; \ |
368 | return val; \ |
| 368 | } |
369 | } |
| Line 369... | Line 370... | ||
| 369 | 370 | ||
| 370 | __i915_read(8) |
371 | __i915_read(8) |
| Line 375... | Line 376... | ||
| 375 | 376 | ||
| 376 | #define __i915_write(x) \ |
377 | #define __i915_write(x) \ |
| 377 | void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val, bool trace) { \ |
378 | void i915_write##x(struct drm_i915_private *dev_priv, u32 reg, u##x val, bool trace) { \ |
| 378 | unsigned long irqflags; \ |
379 | unsigned long irqflags; \ |
| - | 380 | u32 __fifo_ret = 0; \ |
|
| 379 | u32 __fifo_ret = 0; \ |
381 | trace_i915_reg_rw(true, reg, val, sizeof(val), trace); \ |
| 380 | spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); \ |
382 | spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); \ |
| 381 | if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \ |
383 | if (NEEDS_FORCE_WAKE((dev_priv), (reg))) { \ |
| 382 | __fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \ |
384 | __fifo_ret = __gen6_gt_wait_for_fifo(dev_priv); \ |
| 383 | } \ |
385 | } \ |