diff options
| author | Tvrtko Ursulin | 2019-06-11 12:45:45 +0200 |
|---|---|---|
| committer | Tvrtko Ursulin | 2019-06-12 16:33:11 +0200 |
| commit | e44d62d1dd29e1d5855b053dd7fa7b2120f50bd7 (patch) | |
| tree | 7e81185657802b4d8a8fc95201d4cd5d115f8bc7 /drivers/gpu/drm/i915/gt/intel_ringbuffer.c | |
| parent | drm/i915: Remove I915_POSTING_READ_FW (diff) | |
| download | kernel-qcow2-linux-e44d62d1dd29e1d5855b053dd7fa7b2120f50bd7.tar.gz kernel-qcow2-linux-e44d62d1dd29e1d5855b053dd7fa7b2120f50bd7.tar.xz kernel-qcow2-linux-e44d62d1dd29e1d5855b053dd7fa7b2120f50bd7.zip | |
drm/i915: Remove POSTING_READ16
Only a few call sites remain which have been converted to uncore mmio
accessors and so the macro can be removed.
ENGINE_POSTING_READ16 is added to replace one engine->mmio_base relative
call site.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190611104548.30545-3-tvrtko.ursulin@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c index c834d016c965..b0a71dac7b24 100644 --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c @@ -976,11 +976,11 @@ i9xx_irq_disable(struct intel_engine_cs *engine) static void i8xx_irq_enable(struct intel_engine_cs *engine) { - struct drm_i915_private *dev_priv = engine->i915; + struct drm_i915_private *i915 = engine->i915; - dev_priv->irq_mask &= ~engine->irq_enable_mask; - I915_WRITE16(GEN2_IMR, dev_priv->irq_mask); - POSTING_READ16(RING_IMR(engine->mmio_base)); + i915->irq_mask &= ~engine->irq_enable_mask; + intel_uncore_write16(&i915->uncore, GEN2_IMR, i915->irq_mask); + ENGINE_POSTING_READ16(engine, RING_IMR); } static void |