public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Nick Hoath <nicholas.hoath@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH] drm/i915: Remove unecessary per execlist queue item pm reference
Date: Mon, 20 Oct 2014 11:31:36 +0100	[thread overview]
Message-ID: <1413801096-17706-1-git-send-email-nicholas.hoath@intel.com> (raw)

The execlist code was holding a pm reference for the lifetime of an
execlist queue item. Having this pm reference is required when getting
force wakes during execlists_elsp_write. As this happens inside an interrupt
handler and retrieving the reference can sleep, it can't be done more fine
grained. However, the matching execbuffer already holds a pm reference which
covers this timeframe.

Issue: VIZ-4274
Signed-off-by: Nick Hoath <nicholas.hoath@intel.com>
---
 drivers/gpu/drm/i915/intel_lrc.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 1be836a..dc096de 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -297,7 +297,7 @@ static void execlists_elsp_write(struct intel_engine_cs *ring,
 	 *
 	 * The other problem is that we can't just call gen6_gt_force_wake_get()
 	 * because that function calls intel_runtime_pm_get(), which might sleep.
-	 * Instead, we do the runtime_pm_get/put when creating/destroying requests.
+	 * Instead, we rely on the requests pm get/put.
 	 */
 	spin_lock_irqsave(&dev_priv->uncore.lock, flags);
 	if (IS_CHERRYVIEW(dev_priv->dev)) {
@@ -519,8 +519,6 @@ static void execlists_free_request_task(struct work_struct *work)
 	struct drm_device *dev = req->ring->dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	intel_runtime_pm_put(dev_priv);
-
 	mutex_lock(&dev->struct_mutex);
 	i915_gem_context_unreference(req->ctx);
 	mutex_unlock(&dev->struct_mutex);
@@ -546,8 +544,6 @@ static int execlists_context_queue(struct intel_engine_cs *ring,
 	req->tail = tail;
 	INIT_WORK(&req->work, execlists_free_request_task);
 
-	intel_runtime_pm_get(dev_priv);
-
 	spin_lock_irqsave(&ring->execlist_lock, flags);
 
 	list_for_each_entry(cursor, &ring->execlist_queue, execlist_link)
-- 
2.1.1

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

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-20 10:31 Nick Hoath [this message]
2014-10-20 16:30 ` [PATCH] drm/i915: Remove unecessary per execlist queue item pm reference Daniel Vetter

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=1413801096-17706-1-git-send-email-nicholas.hoath@intel.com \
    --to=nicholas.hoath@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