From patchwork Sun Aug 19 19:13:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1345281 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 B6E873FC33 for ; Sun, 19 Aug 2012 20:56:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B52459F304 for ; Sun, 19 Aug 2012 13:56:49 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FCF3A1030 for ; Sun, 19 Aug 2012 13:21:27 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id r3so3851112wey.36 for ; Sun, 19 Aug 2012 13:21:27 -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=7g7yIulivu7DzScnl9gcA3Qj0cUPStvPlol+kDqUTJE=; b=J6IFTAbrDPDDTDiXmXe6Mnm+o+xEX/fCn7oNN7DFUUWe2/fnewR6c7gAW8rb+7fBvC 8yKYq0gkkzEZ531h28vgMDQNyzHDHq4NeUCzp74i3MuExOhekHJg0gd6Gub3zHuxx2Fc I8nCjSdZNjBwUJWGMbMPkB8KFRl3htj+sU/js= 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=7g7yIulivu7DzScnl9gcA3Qj0cUPStvPlol+kDqUTJE=; b=QGzBJwmRAnKHTQbk+iTtLeQofmf6nRPXE7zpFkqFDzfJq+EnKPgV75PQ5g9NZCRD8c FCpe2c1mTnzb15PUfN5LE2FQq9dKuFKRHtWcpP6z246SW7MipQoaC4K8tIEEbAAmnapO l08xdpygYMUBtqFn36S+Y8Klf9JTZXvwWOKIC7xisWg2i21lCcUGq9WuYTDQWpVhtXMM DB4pbLVYIb1hSrcCPvfghu5I1FeAi8pBUWE0H96vp21tE/K6EqQnx2WnWpryKjfU2uwy SodV3r5OQSwMWapN3JaBiQ9/PAjVyejJI+A3PmYdw+nyEzGTXc2fvR46SVK3JEbQequZ +1hg== Received: by 10.216.54.212 with SMTP id i62mr5606559wec.98.1345407687220; Sun, 19 Aug 2012 13:21:27 -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 fu8sm24194367wib.5.2012.08.19.13.21.25 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 19 Aug 2012 13:21:26 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sun, 19 Aug 2012 21:13:11 +0200 Message-Id: <1345403595-9678-55-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> References: <1345403595-9678-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQl9h/NPW+AB7N88ufsSACky08ZM5Mx3YUnfFPbY6EvjruXB48k++GqZhjvtlWnmIzu8SaI/ Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 54/58] 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 Reviewed-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a716893..da45d39 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1006,7 +1006,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); @@ -1024,7 +1024,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"); } }