public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Rodrigo Vivi <rodrigo.vivi@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 7/9] drm/i915: Hold pc8 lock around toggling pc8.gpu_idle
Date: Mon, 18 Nov 2013 18:32:36 -0800	[thread overview]
Message-ID: <1384828358-31563-8-git-send-email-rodrigo.vivi@gmail.com> (raw)
In-Reply-To: <1384828358-31563-1-git-send-email-rodrigo.vivi@gmail.com>

From: Chris Wilson <chris@chris-wilson.co.uk>

We need to hold the pc8 lock around toggling the value of gpu_idle.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
---
 drivers/gpu/drm/i915/intel_display.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index be810c5..cfcad82 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6540,18 +6540,22 @@ done:
 
 static void hsw_package_c8_gpu_idle(struct drm_i915_private *dev_priv)
 {
+	mutex_lock(&dev_priv->pc8.lock);
 	if (!dev_priv->pc8.gpu_idle) {
 		dev_priv->pc8.gpu_idle = true;
-		hsw_enable_package_c8(dev_priv);
+		__hsw_enable_package_c8(dev_priv);
 	}
+	mutex_unlock(&dev_priv->pc8.lock);
 }
 
 static void hsw_package_c8_gpu_busy(struct drm_i915_private *dev_priv)
 {
+	mutex_lock(&dev_priv->pc8.lock);
 	if (dev_priv->pc8.gpu_idle) {
 		dev_priv->pc8.gpu_idle = false;
-		hsw_disable_package_c8(dev_priv);
+		__hsw_disable_package_c8(dev_priv);
 	}
+	mutex_unlock(&dev_priv->pc8.lock);
 }
 
 #define for_each_power_domain(domain, mask)				\
-- 
1.8.3.1

  parent reply	other threads:[~2013-11-19  2:32 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-19  2:32 [PATCH 0/9] drm-intel-collector - update Rodrigo Vivi
2013-11-19  2:32 ` [PATCH 1/9] drm/i915: Asynchronously perform the set-base for a simple modeset Rodrigo Vivi
2013-11-19  2:32 ` [PATCH 2/9] drm/i915: Fix gen3/4 vblank counter wraparound Rodrigo Vivi
2013-11-19 13:51   ` Chris Wilson
2013-11-19  2:32 ` [PATCH 3/9] drm/i915: Use frame counter for intel_wait_for_vblank() on CTG Rodrigo Vivi
2013-11-19 13:46   ` Chris Wilson
2013-11-19 16:38     ` Daniel Vetter
2013-11-19 17:26       ` Rodrigo Vivi
2013-11-19  2:32 ` [PATCH 4/9] drm/i915: Do hw quiescing first during unload Rodrigo Vivi
2013-11-19 17:43   ` Rodrigo Vivi
2013-11-19  2:32 ` [PATCH 5/9] drm/i915: print object bindings in debugfs Rodrigo Vivi
2013-11-19 13:52   ` Chris Wilson
2013-11-19 17:37     ` Rodrigo Vivi
2013-11-20 11:03       ` Chris Wilson
2013-11-20 16:52         ` Rodrigo Vivi
2013-11-19  2:32 ` [PATCH 6/9] drm/i915/vlv: enable HDMI audio for Valleyview2 Rodrigo Vivi
2013-11-19  2:32 ` Rodrigo Vivi [this message]
2013-11-19  2:32 ` [PATCH 8/9] drm/i915: Do not enable package C8 on unsupported hardware Rodrigo Vivi
2013-11-19 12:02   ` Daniel Vetter
2013-11-19  2:32 ` [PATCH 9/9] drm/i915: Enable pipe gamma for sprites Rodrigo Vivi
2013-11-19 17:42   ` Rodrigo Vivi
2013-11-21  8:10     ` Daniel Vetter
2013-11-19  2:35 ` [PATCH 0/9] drm-intel-collector - update Rodrigo Vivi
2013-11-19  3:28 ` Ausmus, James
2013-11-19 17:25   ` Rodrigo Vivi
2013-11-19 17:44     ` Rodrigo Vivi

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=1384828358-31563-8-git-send-email-rodrigo.vivi@gmail.com \
    --to=rodrigo.vivi@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=paulo.r.zanoni@intel.com \
    /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