From patchwork Wed Jul 11 14:28:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1184221 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 09A583FC5A for ; Wed, 11 Jul 2012 16:26:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CB447A0EE8 for ; Wed, 11 Jul 2012 09:26:53 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id A640E9ED99 for ; Wed, 11 Jul 2012 08:36:41 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dr1so946426wgb.12 for ; Wed, 11 Jul 2012 08:36:41 -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=PoNZGu4GEg8bdoV6hseyd2wEkSnNrtnqOVCdccUNsV4=; b=O7lLAPZcprbxYAVwL9lQ03CE9ESdI8JS9tBvPVXhrLZ/s4fryD9sbs7LMtSOCmlPxP kIHqDbO0eBSBQXTjb1wWsmpukNZYrCzM1AJn6MsKK0ZVAuRMJEwjd+/rDUzrwAQ978Go B7clsrdVqrNOefqjyI+X8aCSXImyOqHU4eJI0= 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=PoNZGu4GEg8bdoV6hseyd2wEkSnNrtnqOVCdccUNsV4=; b=Kudv0DWfN3ehPZXawkcF0NfJYIlcJ+1bOUAOArgg+sNYN7OZzXtmtW+c8Qf+7wSgv+ 9ZwdNUMXb0Tl82BjLqAk39L3Ryya9rpyN+qWmRFFsAqLcvMfdVZDxIyeAPTyT7t2gQ1m 1JabCWV/qFmKwoPvGhh3ndskznoRJaJpTLF9/BIB9/Jc2mI542YIAMGnv+6lN1r4nRiS XJmqQC3GM80rfcxwW+gUFDBKXmx3PJ1TIGekgloXMKZGDLM0j7Oh+mr/kFvWgIe9kd1l fKWBpNBG6gYXA09BBsGuqHTWQpgVDYj++7KX/l37GJdPWy9nPoN/2oZOs9OApsFkEB+y 2EWQ== Received: by 10.216.208.87 with SMTP id p65mr20596082weo.162.1342021001408; Wed, 11 Jul 2012 08:36:41 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id bc2sm5777080wib.0.2012.07.11.08.36.40 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 08:36:40 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 16:28:50 +0200 Message-Id: <1342016944-23395-68-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnzd0h9Zdy6DjVry44zFa9wg24gvHHtJGRRpp129L3llT7lgUBcV9FL+53WzNIVydb9FMeA Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 67/81] drm/i915: WARN if the pipe won't turn off 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 This seems to be the symptom of a few neat bugs, hence be more obnoxious when this fails. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b479755..03f3cd3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1005,7 +1005,7 @@ void intel_wait_for_pipe_off(struct drm_device *dev, int pipe) /* Wait for the Pipe State to go off */ if (wait_for((I915_READ(reg) & I965_PIPECONF_ACTIVE) == 0, 100)) - DRM_DEBUG_KMS("pipe_off wait timed out\n"); + WARN(1, "pipe_off wait timed out\n"); } else { u32 last_line, line_mask; int reg = PIPEDSL(pipe); @@ -1023,7 +1023,7 @@ void intel_wait_for_pipe_off(struct drm_device *dev, int pipe) } while (((I915_READ(reg) & line_mask) != last_line) && time_after(timeout, jiffies)); if (time_after(jiffies, timeout)) - DRM_DEBUG_KMS("pipe_off wait timed out\n"); + WARN(1, "pipe_off wait timed out\n"); } }