From: Ben Widawsky <benjamin.widawsky@intel.com>
To: Intel GFX <intel-gfx@lists.freedesktop.org>
Subject: [PATCH 1/6] drm/i915: Prevent signals from interrupting close()
Date: Mon, 23 Jun 2014 18:48:41 -0700 [thread overview]
Message-ID: <1403574526-15585-1-git-send-email-benjamin.widawsky@intel.com> (raw)
From: Chris Wilson <chris@chris-wilson.co.uk>
We neither report any unfinished operations during releasing GEM objects
associated with the file, and even if we did, it is bad form to report
-EINTR from a close().
The root cause of the bug that first showed itself during close is that
we do not do proper live tracking of vma and contexts under full-ppgtt,
but this is useful piece of defensive programming enforcing our
userspace API contract.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
---
drivers/gpu/drm/i915/i915_dma.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 5e583a1..f6aca71 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1959,9 +1959,18 @@ void i915_driver_lastclose(struct drm_device *dev)
void i915_driver_preclose(struct drm_device *dev, struct drm_file *file_priv)
{
+ struct drm_i915_private *dev_priv = to_i915(dev);
+ bool was_interruptible;
+
mutex_lock(&dev->struct_mutex);
+ was_interruptible = dev_priv->mm.interruptible;
+ WARN_ON(!was_interruptible);
+ dev_priv->mm.interruptible = false;
+
i915_gem_context_close(dev, file_priv);
i915_gem_release(dev, file_priv);
+
+ dev_priv->mm.interruptible = was_interruptible;
mutex_unlock(&dev->struct_mutex);
}
--
2.0.0
next reply other threads:[~2014-06-24 1:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-24 1:48 Ben Widawsky [this message]
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
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=1403574526-15585-1-git-send-email-benjamin.widawsky@intel.com \
--to=benjamin.widawsky@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