Currently, we record the elsp register offset inside init-hw but we only
need to do it once during engine setup (after we know the mmio
iomapping).

Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/intel_lrc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 5295059b6318..2e1adbaaec2f 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1494,9 +1494,6 @@ static int gen8_init_common_ring(struct intel_engine_cs 
*engine)
        execlists->csb_head = -1;
        execlists->active = 0;
 
-       execlists->elsp =
-               dev_priv->regs + i915_mmio_reg_offset(RING_ELSP(engine));
-
        /* After a GPU reset, we may have requests to replay */
        if (execlists->first)
                tasklet_schedule(&execlists->tasklet);
@@ -2005,6 +2002,9 @@ static int logical_ring_init(struct intel_engine_cs 
*engine)
        if (ret)
                goto error;
 
+       engine->execlists.elsp =
+               engine->i915->regs + i915_mmio_reg_offset(RING_ELSP(engine));
+
        return 0;
 
 error:
-- 
2.15.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to