From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nick Hoath Subject: [PATCH] drm/i915: Remove unecessary per execlist queue item pm reference Date: Mon, 20 Oct 2014 11:31:36 +0100 Message-ID: <1413801096-17706-1-git-send-email-nicholas.hoath@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 5ED5089581 for ; Mon, 20 Oct 2014 03:31:47 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org 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 --- 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