From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 1/9] drm/i915: ensure rps state is properly lock-protected Date: Tue, 24 Jul 2012 23:33:42 +0200 Message-ID: <1343165630-21604-2-git-send-email-daniel.vetter@ffwll.ch> References: <1343165630-21604-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id D88489E860 for ; Tue, 24 Jul 2012 14:17:22 -0700 (PDT) Received: by wibhm11 with SMTP id hm11so17324wib.12 for ; Tue, 24 Jul 2012 14:17:22 -0700 (PDT) In-Reply-To: <1343165630-21604-1-git-send-email-daniel.vetter@ffwll.ch> 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: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org Pure paranoia-induced patch as part of a large work to fix up the locking around intel_mark_busy/idle. At least for the gen6+ rps state, locking seems to be sane and the hw/sw state is protected by dev->struct_mutex. The only thing missing is a paranoid WARN_ON in sanitize_pm. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_pm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 85d1b1c..b6e8fbf 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3745,6 +3745,8 @@ static void gen6_sanitize_pm(struct drm_device *dev) gen6_gt_force_wake_get(dev_priv); + WARN_ON(!mutex_is_locked(&dev->struct_mutex)); + old = limits = I915_READ(GEN6_RP_INTERRUPT_LIMITS); /* Make sure we continue to get interrupts * until we hit the minimum or maximum frequencies. -- 1.7.10.4