Commit 8f0e2b9d authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: Move golden context init into ->init_context

Similar to a patch from Thomas Daniel for lrc contexts. This keeps
both sides somewhat in sync and should make Dave Gordon happy.

Note that both the wa and the golden context init code suffer a bit
from an inssuficient split into driver load and hw init code. Which
means we have a bunch of tests all over the place to check whether the
one-time initialization has been done already or not.

All that one-tim code should be moved into the one-time ring setup
code, but that's work for later.

Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: Thomas Daniel <thomas.daniel@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarDave Gordon <david.s.gordon@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b05ddd4d
...@@ -651,10 +651,6 @@ static int do_switch(struct intel_engine_cs *ring, ...@@ -651,10 +651,6 @@ static int do_switch(struct intel_engine_cs *ring,
if (ret) if (ret)
DRM_ERROR("ring init context: %d\n", ret); DRM_ERROR("ring init context: %d\n", ret);
} }
ret = i915_gem_render_state_init(ring);
if (ret)
DRM_ERROR("init render state: %d\n", ret);
} }
return 0; return 0;
......
...@@ -710,6 +710,22 @@ static int intel_ring_workarounds_emit(struct intel_engine_cs *ring, ...@@ -710,6 +710,22 @@ static int intel_ring_workarounds_emit(struct intel_engine_cs *ring,
return 0; return 0;
} }
static int intel_rcs_ctx_init(struct intel_engine_cs *ring,
struct intel_context *ctx)
{
int ret;
ret = intel_ring_workarounds_emit(ring, ctx);
if (ret != 0)
return ret;
ret = i915_gem_render_state_init(ring);
if (ret)
DRM_ERROR("init render state: %d\n", ret);
return ret;
}
static int wa_add(struct drm_i915_private *dev_priv, static int wa_add(struct drm_i915_private *dev_priv,
const u32 addr, const u32 val, const u32 mask) const u32 addr, const u32 val, const u32 mask)
{ {
...@@ -2345,7 +2361,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) ...@@ -2345,7 +2361,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
} }
} }
ring->init_context = intel_ring_workarounds_emit; ring->init_context = intel_rcs_ctx_init;
ring->add_request = gen6_add_request; ring->add_request = gen6_add_request;
ring->flush = gen8_render_ring_flush; ring->flush = gen8_render_ring_flush;
ring->irq_get = gen8_ring_get_irq; ring->irq_get = gen8_ring_get_irq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment