From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 11/18] drm/i915: switch to default context on idle Date: Thu, 29 Mar 2012 21:29:05 +0200 Message-ID: <20120329192905.GE27737@phenom.ffwll.local> References: <1332103198-25852-1-git-send-email-ben@bwidawsk.net> <1332103198-25852-12-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id B95769E78C for ; Thu, 29 Mar 2012 12:28:22 -0700 (PDT) Received: by wgbdr12 with SMTP id dr12so1556141wgb.12 for ; Thu, 29 Mar 2012 12:28:21 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1332103198-25852-12-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Ben Widawsky Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Sun, Mar 18, 2012 at 01:39:51PM -0700, Ben Widawsky wrote: > To keep things as sane as possible, switch to the default context before > idling. This should help free context objects, as well as put things in > a more well defined state before suspending. > > Signed-off-by: Ben Widawsky Context are yet another thing that will nicely fragment our global gtt space. You don't pin them to mappable, which is a start, but I wonder whether we should integrate this into our evict_something code? Although that project is more involved with the current evict code, so maybe just add a fixme. > --- > drivers/gpu/drm/i915/i915_gem.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index 0985aa5..c1aab45 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -3685,6 +3685,8 @@ int > i915_gem_idle(struct drm_device *dev) > { > drm_i915_private_t *dev_priv = dev->dev_private; > + struct intel_ring_buffer *ring = &dev_priv->ring[RCS]; > + u32 seqno; > int ret; > > mutex_lock(&dev->struct_mutex); > @@ -3694,6 +3696,10 @@ i915_gem_idle(struct drm_device *dev) > return 0; > } > > + seqno = i915_gem_next_request_seqno(ring); > + i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID, seqno, 0); > + WARN_ON(i915_wait_request(ring, seqno, false)); This can block and potentially return early due to a signal, i.e. you need to properly handle this (like the i915_gpu_idle below). > + > ret = i915_gpu_idle(dev, true); > if (ret) { > mutex_unlock(&dev->struct_mutex); > -- > 1.7.9.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48