| Message ID | 1403574526-15585-2-git-send-email-benjamin.widawsky@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 24 Jun 2014, Ben Widawsky <benjamin.widawsky@intel.com> wrote: > From: Chris Wilson <chris@chris-wilson.co.uk> > > Fallout from > > commit 46470fc932ac8a0e8317a220b3f4ea4ed903338e > Author: Mika Kuoppala <mika.kuoppala@linux.intel.com> > Date: Wed May 21 19:01:06 2014 +0300 > > drm/i915: Add null state batch to active list > > undid the earlier fix of only marking the ctx as initialised after it is > saved by the hardware during a SET_CONTEXT operation. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Reviewed-by: Ben Widawsky <ben@bwidawsk.net> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Damien Lespiau <damien.lespiau@intel.com> > Cc: Mika Kuoppala <mika.kuoppala@intel.com> I've pushed this one patch to -fixes. BR, Jani. > --- > drivers/gpu/drm/i915/i915_gem_context.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c > index 21eda88..0d2c75b 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -598,6 +598,7 @@ static int do_switch(struct intel_engine_cs *ring, > struct intel_context *from = ring->last_context; > struct i915_hw_ppgtt *ppgtt = ctx_to_ppgtt(to); > u32 hw_flags = 0; > + bool uninitialized = false; > int ret, i; > > if (from != NULL && ring == &dev_priv->ring[RCS]) { > @@ -696,18 +697,19 @@ static int do_switch(struct intel_engine_cs *ring, > i915_gem_context_unreference(from); > } > > + uninitialized = !to->is_initialized && from == NULL; > + to->is_initialized = true; > + > done: > i915_gem_context_reference(to); > ring->last_context = to; > > - if (ring->id == RCS && !to->is_initialized && from == NULL) { > + if (uninitialized) { > ret = i915_gem_render_state_init(ring); > if (ret) > DRM_ERROR("init render state: %d\n", ret); > } > > - to->is_initialized = true; > - > return 0; > > unpin_out: > -- > 2.0.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 21eda88..0d2c75b 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -598,6 +598,7 @@ static int do_switch(struct intel_engine_cs *ring, struct intel_context *from = ring->last_context; struct i915_hw_ppgtt *ppgtt = ctx_to_ppgtt(to); u32 hw_flags = 0; + bool uninitialized = false; int ret, i; if (from != NULL && ring == &dev_priv->ring[RCS]) { @@ -696,18 +697,19 @@ static int do_switch(struct intel_engine_cs *ring, i915_gem_context_unreference(from); } + uninitialized = !to->is_initialized && from == NULL; + to->is_initialized = true; + done: i915_gem_context_reference(to); ring->last_context = to; - if (ring->id == RCS && !to->is_initialized && from == NULL) { + if (uninitialized) { ret = i915_gem_render_state_init(ring); if (ret) DRM_ERROR("init render state: %d\n", ret); } - to->is_initialized = true; - return 0; unpin_out: