public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: John Harrison <John.C.Harrison@Intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Fix execlist cleanup bug
Date: Fri, 31 Oct 2014 11:43:19 +0000	[thread overview]
Message-ID: <545375D7.6070205@Intel.com> (raw)
In-Reply-To: <1414683003-17211-1-git-send-email-david.s.gordon@intel.com>

This is an old version. I have a new and improved patch that also fixes 
the legacy ring buffer case (which was equally broken). Will post shortly...

On 30/10/2014 15:30, Dave Gordon wrote:
> From: John Harrison <John.C.Harrison@Intel.com>
>
> Check whether each engine exists before trying to clean up the
> corresponding logical ring.
>
> Change-Id: I31b1ed941824db2d6bd7233360dbce05671979a8
> Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
> ---
>   drivers/gpu/drm/i915/intel_lrc.c |   12 ++++++++----
>   1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index cd74e5c..7a7d30a 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -1444,13 +1444,17 @@ int intel_logical_rings_init(struct drm_device *dev)
>   	return 0;
>   
>   cleanup_bsd2_ring:
> -	intel_logical_ring_cleanup(&dev_priv->ring[VCS2]);
> +	if (HAS_BSD2(dev))
> +		intel_logical_ring_cleanup(&dev_priv->ring[VCS2]);
>   cleanup_vebox_ring:
> -	intel_logical_ring_cleanup(&dev_priv->ring[VECS]);
> +	if (HAS_VEBOX(dev))
> +		intel_logical_ring_cleanup(&dev_priv->ring[VECS]);
>   cleanup_blt_ring:
> -	intel_logical_ring_cleanup(&dev_priv->ring[BCS]);
> +	if (HAS_BLT(dev))
> +		intel_logical_ring_cleanup(&dev_priv->ring[BCS]);
>   cleanup_bsd_ring:
> -	intel_logical_ring_cleanup(&dev_priv->ring[VCS]);
> +	if (HAS_BSD(dev))
> +		intel_logical_ring_cleanup(&dev_priv->ring[VCS]);
>   cleanup_render_ring:
>   	intel_logical_ring_cleanup(&dev_priv->ring[RCS]);
>   

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

  reply	other threads:[~2014-10-31 11:43 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-30 15:30 [PATCH] drm/i915: Fix execlist cleanup bug Dave Gordon
2014-10-31 11:43 ` John Harrison [this message]
2014-10-31 12:00   ` [PATCH] drm/i915: Fix null pointer dereference in ring cleanup code John.C.Harrison
2014-10-31 14:52     ` Damien Lespiau
2014-10-31 16:07       ` Chris Wilson
2014-11-03 12:54         ` Daniel Vetter
2014-11-03 20:39           ` Chris Wilson
2014-11-03 17:16       ` Dave Gordon

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=545375D7.6070205@Intel.com \
    --to=john.c.harrison@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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