diff options
| author | Ville Syrjälä | 2015-09-18 19:03:15 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-09-23 17:13:01 +0200 |
| commit | 83843d84fcd38a7e9b30ff0b9af04669c77ecf8c (patch) | |
| tree | 1281b2dd20123f3e9dfee32322b7fc2d214b706b /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | drm/i915: Don't pass sdvo_reg to intel_sdvo_select_{ddc, i2c}_bus() (diff) | |
| download | kernel-qcow2-linux-83843d84fcd38a7e9b30ff0b9af04669c77ecf8c.tar.gz kernel-qcow2-linux-83843d84fcd38a7e9b30ff0b9af04669c77ecf8c.tar.xz kernel-qcow2-linux-83843d84fcd38a7e9b30ff0b9af04669c77ecf8c.zip | |
drm/i915: Parametrize LRC registers
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index ff9a481ed997..7417650ed9cf 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -349,7 +349,7 @@ static void execlists_elsp_write(struct drm_i915_gem_request *rq0, I915_WRITE_FW(RING_ELSP(ring), lower_32_bits(desc[0])); /* ELSP is a wo register, use another nearby reg for posting */ - POSTING_READ_FW(RING_EXECLIST_STATUS(ring)); + POSTING_READ_FW(RING_EXECLIST_STATUS_LO(ring)); intel_uncore_forcewake_put__locked(dev_priv, FORCEWAKE_ALL); spin_unlock(&dev_priv->uncore.lock); } @@ -519,10 +519,8 @@ void intel_lrc_irq_handler(struct intel_engine_cs *ring) while (read_pointer < write_pointer) { read_pointer++; - status = I915_READ(RING_CONTEXT_STATUS_BUF(ring) + - (read_pointer % 6) * 8); - status_id = I915_READ(RING_CONTEXT_STATUS_BUF(ring) + - (read_pointer % 6) * 8 + 4); + status = I915_READ(RING_CONTEXT_STATUS_BUF_LO(ring, read_pointer % 6)); + status_id = I915_READ(RING_CONTEXT_STATUS_BUF_HI(ring, read_pointer % 6)); if (status & GEN8_CTX_STATUS_IDLE_ACTIVE) continue; |