|
@@ -2550,13 +2550,12 @@ int intel_ring_cacheline_align(struct drm_i915_gem_request *req)
|
|
|
|
|
|
void intel_ring_init_seqno(struct intel_engine_cs *engine, u32 seqno)
|
|
|
{
|
|
|
- struct drm_device *dev = engine->dev;
|
|
|
- struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
+ struct drm_i915_private *dev_priv = to_i915(engine->dev);
|
|
|
|
|
|
- if (INTEL_INFO(dev)->gen == 6 || INTEL_INFO(dev)->gen == 7) {
|
|
|
+ if (INTEL_INFO(dev_priv)->gen == 6 || INTEL_INFO(dev_priv)->gen == 7) {
|
|
|
I915_WRITE(RING_SYNC_0(engine->mmio_base), 0);
|
|
|
I915_WRITE(RING_SYNC_1(engine->mmio_base), 0);
|
|
|
- if (HAS_VEBOX(dev))
|
|
|
+ if (HAS_VEBOX(dev_priv))
|
|
|
I915_WRITE(RING_SYNC_2(engine->mmio_base), 0);
|
|
|
}
|
|
|
|