diff options
| author | Oscar Mateo <oscar.mateo@intel.com> | 2014-06-11 16:17:16 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-13 17:45:18 +0200 |
| commit | 3b2cc8ab64bf5d643ac9a917653e0cb6fce32ffc (patch) | |
| tree | f3b3e5f26cdd74f6ae6da37c088947f4a70c0ed1 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | b90b91d87038f6b257b40a02b42ed4f9705e06f0 (diff) | |
| download | op-kernel-dev-3b2cc8ab64bf5d643ac9a917653e0cb6fce32ffc.zip op-kernel-dev-3b2cc8ab64bf5d643ac9a917653e0cb6fce32ffc.tar.gz | |
drm/i915/bdw: Do not write the Semaphore Sync Registers in GEN8+
These do not exist anymore.
Spotted while reading through intel_ringbuffer.c
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 279488a..0eaaaec 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1746,14 +1746,15 @@ int intel_ring_cacheline_align(struct intel_engine_cs *ring) void intel_ring_init_seqno(struct intel_engine_cs *ring, u32 seqno) { - struct drm_i915_private *dev_priv = ring->dev->dev_private; + struct drm_device *dev = ring->dev; + struct drm_i915_private *dev_priv = dev->dev_private; BUG_ON(ring->outstanding_lazy_seqno); - if (INTEL_INFO(ring->dev)->gen >= 6) { + if (INTEL_INFO(dev)->gen == 6 || INTEL_INFO(dev)->gen == 7) { I915_WRITE(RING_SYNC_0(ring->mmio_base), 0); I915_WRITE(RING_SYNC_1(ring->mmio_base), 0); - if (HAS_VEBOX(ring->dev)) + if (HAS_VEBOX(dev)) I915_WRITE(RING_SYNC_2(ring->mmio_base), 0); } |
