From patchwork Fri Aug 24 15:26:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1371831 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 36318DF28C for ; Fri, 24 Aug 2012 15:26:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0EE92A0E66 for ; Fri, 24 Aug 2012 08:26:56 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-bk0-f49.google.com (mail-bk0-f49.google.com [209.85.214.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FA3BA02FA for ; Fri, 24 Aug 2012 08:26:04 -0700 (PDT) Received: by bkcji2 with SMTP id ji2so654338bkc.36 for ; Fri, 24 Aug 2012 08:26:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=+xEBGIrt1aiXWJxWrNK8QQMxw4g3GGNVFEyFbkbPcqs=; b=PeYqUY+QOfpBGukDKyFzLUAk6dcMNaVT0Qhcq3Gf5Aq5tu6lyVryKfjWUZWtjTg7qZ lUU/YK8atoTejPSGNJDuQSJ3wZB7nClbHzby9gLT9N8rNMFBNrPJ+O+gF7I3fHKA2biz sxg0LoiZa53OB9AaeFG0Ly3X86KyGz05wtRgM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=+xEBGIrt1aiXWJxWrNK8QQMxw4g3GGNVFEyFbkbPcqs=; b=Iijp0IQc62FUqpXNzQjcRHoFmbuoXHWem1i/f7CPW4VMfq1fU+m8Vt+1OXHLtWnLUk y8IGcjIItkpGR+X1A01ukKVATSLxGEEEdY8bPaKsS4IIKLKNICX/WdcUO3blmdgmgtFl wTSGBV4fII7TJa4YQv2Inh5ie2M7rS588/U0Gf/R4lYDXFQGl1TRhU9hziWhB+sLSRjV +lPIQ1IK7DmS9xzR/CyBzHX4INO+e87dY90GqjfLshxiE2ySF63mK5cgcxBn5vuxVyFJ W8ki34MZ3vl55GkMkauOSa3JiYl2Ir5I4SxgVOp1aF5RCmBXNAI+DvXDvbJiz3vytqjl SvRQ== Received: by 10.204.152.27 with SMTP id e27mr2106198bkw.56.1345821963474; Fri, 24 Aug 2012 08:26:03 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id 14sm6583860bkq.12.2012.08.24.08.26.02 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 24 Aug 2012 08:26:02 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 24 Aug 2012 17:26:21 +0200 Message-Id: <1345821981-8208-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1345821981-8208-1-git-send-email-daniel.vetter@ffwll.ch> References: <1345821981-8208-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQkW0XgkHvNyyeTWnedwJor5UilBzctCeIx4EJzLMR3yzbbwtKSgdgUwIA4DwwvmMY7f6LUO Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 2/2] drm/i915: differe error message between forcwake timeouts X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org danvet: in the force wake, both DRM_ERRORs have the same string. useful for .txt shrinkage, horrible for debugging Signed-off-by: Daniel Vetter Acked-by: Paul Menzel Reviewed-by: Ben Widawsky --- drivers/gpu/drm/i915/intel_pm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 1a197da..1e4d25e 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3969,13 +3969,13 @@ static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv) forcewake_ack = FORCEWAKE_ACK; if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1) == 0, 500)) - DRM_ERROR("Force wake wait timed out\n"); + DRM_ERROR("Timed out waiting for forcewake old ack to clear.\n"); I915_WRITE_NOTRACE(FORCEWAKE, 1); POSTING_READ(FORCEWAKE); if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1), 500)) - DRM_ERROR("Force wake wait timed out\n"); + DRM_ERROR("Timed out waiting for forcewake to ack request.\n"); __gen6_gt_wait_for_thread_c0(dev_priv); } @@ -3990,13 +3990,13 @@ static void __gen6_gt_force_wake_mt_get(struct drm_i915_private *dev_priv) forcewake_ack = FORCEWAKE_MT_ACK; if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1) == 0, 500)) - DRM_ERROR("Force wake wait timed out\n"); + DRM_ERROR("Timed out waiting for forcewake old ack to clear.\n"); I915_WRITE_NOTRACE(FORCEWAKE_MT, _MASKED_BIT_ENABLE(1)); POSTING_READ(FORCEWAKE_MT); if (wait_for_atomic_us((I915_READ_NOTRACE(forcewake_ack) & 1), 500)) - DRM_ERROR("Force wake wait timed out\n"); + DRM_ERROR("Timed out waiting for forcewake to ack request.\n"); __gen6_gt_wait_for_thread_c0(dev_priv); } @@ -4076,12 +4076,12 @@ int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv) static void vlv_force_wake_get(struct drm_i915_private *dev_priv) { if (wait_for_atomic_us((I915_READ_NOTRACE(FORCEWAKE_ACK_VLV) & 1) == 0, 500)) - DRM_ERROR("Force wake wait timed out\n"); + DRM_ERROR("Timed out waiting for forcewake old ack to clear.\n"); I915_WRITE_NOTRACE(FORCEWAKE_VLV, _MASKED_BIT_ENABLE(1)); if (wait_for_atomic_us((I915_READ_NOTRACE(FORCEWAKE_ACK_VLV) & 1), 500)) - DRM_ERROR("Force wake wait timed out\n"); + DRM_ERROR("Timed out waiting for forcewake to ack request.\n"); __gen6_gt_wait_for_thread_c0(dev_priv); }