From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH v2 16/16] drm/i915: add i915_gem_context_get_reset_status_ioctl Date: Fri, 15 Mar 2013 10:01:06 +0000 Message-ID: <20130315100105.GF1204@cantiga.alporthouse.com> References: <1363276337-12509-1-git-send-email-mika.kuoppala@intel.com> <1363276337-12509-17-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 9FE18E5C05 for ; Fri, 15 Mar 2013 03:01:11 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1363276337-12509-17-git-send-email-mika.kuoppala@intel.com> 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: Mika Kuoppala Cc: intel-gfx@lists.freedesktop.org, miku@iki.fi List-Id: intel-gfx@lists.freedesktop.org On Thu, Mar 14, 2013 at 05:52:17PM +0200, Mika Kuoppala wrote: > This ioctl returns context reset status for specified context. > > Signed-off-by: Mika Kuoppala > CC: idr@freedesktop.org > --- > drivers/gpu/drm/i915/i915_dma.c | 1 + > drivers/gpu/drm/i915/i915_drv.c | 61 +++++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/i915/i915_drv.h | 2 ++ > include/uapi/drm/i915_drm.h | 28 ++++++++++++++++++ > 4 files changed, 92 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index 7902d97..c919832 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -1903,6 +1903,7 @@ struct drm_ioctl_desc i915_ioctls[] = { > DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE, i915_gem_context_create_ioctl, DRM_UNLOCKED), > DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_UNLOCKED), > DRM_IOCTL_DEF_DRV(I915_REG_READ, i915_reg_read_ioctl, DRM_UNLOCKED), > + DRM_IOCTL_DEF_DRV(I915_GET_RESET_STATUS, i915_gem_context_get_reset_status_ioctl, DRM_UNLOCKED), > }; > > int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls); > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 69c9856..a4d06f2 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1267,3 +1267,64 @@ int i915_reg_read_ioctl(struct drm_device *dev, > > return 0; > } > + > +int i915_gem_context_get_reset_status_ioctl(struct drm_device *dev, > + void *data, struct drm_file *file) > +{ > + struct drm_i915_private *dev_priv = dev->dev_private; > + struct intel_ring_buffer *ring; > + struct drm_i915_reset_status *args = data; > + struct ctx_reset_state *rs = NULL; > + unsigned long reset_cnt; > + u32 reset_status = I915_RESET_UNKNOWN; > + int ret; > + > + ret = mutex_lock_interruptible(&dev->struct_mutex); > + if (ret) > + return ret; > + > + ring = &dev_priv->ring[RCS]; > + > + ret = i915_gem_context_get_reset_state(ring, > + file, > + args->ctx_id, > + &rs); > + if (ret) > + goto out; See earlier comments. > + BUG_ON(!rs); > + > + reset_cnt = atomic_read(&dev_priv->gpu_error.reset_counter); > + > + if (reset_cnt & I915_RESET_IN_PROGRESS_FLAG || > + reset_cnt == I915_WEDGED) { > + goto out; I915_WEDGED & I915_RESET_IN_PROGRESS_FLAGS is defined as true. > + } > + > + /* Set guilty/innocent status if only one reset was > + * observed and if only one guilty was found > + */ > + if ((rs->reset_cnt + 2) == reset_cnt && > + (rs->guilty_cnt + 1) == dev_priv->gpu_error.guilty_cnt) { > + reset_status = 0; > + > + if (rs->guilty) > + reset_status |= I915_RESET_BATCH_ACTIVE; > + > + if (rs->innocent) > + reset_status |= I915_RESET_BATCH_PENDING; > + > + if (reset_status == 0) > + reset_status = I915_RESET_UNKNOWN; > + } else if (rs->reset_cnt == reset_cnt) { > + reset_status = I915_RESET_NO_ERROR; > + } This looks very fragile and time dependent. It is not an interface I can use... -Chris -- Chris Wilson, Intel Open Source Technology Centre