From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ben Widawsky <benjamin.widawsky@intel.com>,
Intel GFX <intel-gfx@lists.freedesktop.org>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Subject: Re: [PATCH 2/6] drm/i915: Only mark the ctx as initialised after a SET_CONTEXT operation
Date: Tue, 24 Jun 2014 16:27:40 +0300 [thread overview]
Message-ID: <87fviu8mk3.fsf@intel.com> (raw)
In-Reply-To: <1403574526-15585-2-git-send-email-benjamin.widawsky@intel.com>
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
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2014-06-24 13:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-24 1:48 [PATCH 1/6] drm/i915: Prevent signals from interrupting close() Ben Widawsky
2014-06-24 1:48 ` [PATCH 2/6] drm/i915: Only mark the ctx as initialised after a SET_CONTEXT operation Ben Widawsky
2014-06-24 13:27 ` Jani Nikula [this message]
2014-06-24 1:48 ` [PATCH 3/6] drm/i915: Split up do_switch Ben Widawsky
2014-06-24 1:48 ` [PATCH 4/6] drm/i915: Extract l3 remapping out of ctx switch Ben Widawsky
2014-06-24 1:48 ` [PATCH 5/6] drm/i915/ppgtt: Load address space after mi_set_context Ben Widawsky
2014-06-24 1:48 ` [PATCH 6/6] drm/i915/bdw: Enable full PPGTT Ben Widawsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fviu8mk3.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=benjamin.widawsky@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=mika.kuoppala@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox