From patchwork Wed Mar 6 23:03:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 2228701 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 774113FCF6 for ; Wed, 6 Mar 2013 23:11:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5AAD5E5C7E for ; Wed, 6 Mar 2013 15:11:10 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f47.google.com (mail-yh0-f47.google.com [209.85.213.47]) by gabe.freedesktop.org (Postfix) with ESMTP id 380B6E6756 for ; Wed, 6 Mar 2013 15:04:21 -0800 (PST) Received: by mail-yh0-f47.google.com with SMTP id w68so1300249yhw.34 for ; Wed, 06 Mar 2013 15:04:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=LifT3WE5nu/v8S5R9CkUXQUzWMbmWdLbHFNKQxduO2M=; b=LvvHrzY84IrRkPtKyvpZnsX6rmMqD0sw8KAtHiSnosSzXDzbadiMXqq7AM6HKfxu4l iu5ZZMCXYzs+ZFag73clh0ZEt/PYrzXWSdXCDEm1emdmS5xcxK5DvzrGT75fa8ljPYkx JZQOWzjgmG66cAM+lVru04LUoW4D22MmFJA2HPJ1ENOiVAm7xiY3rX1KzqEv6rNpd/I/ 9Cw1sv/jRqZswD2hMh0P1qQnPbCkStcam16/pwTZbIvLyZ8O/1G5/QsE3y0hOogxB+qO 157L9deF7agDAPQD22bsw6GVnQbb6zBljSvHb+5eMm3UJWrQNHxfkVPPzUZhKHWi25DL 4d5w== X-Received: by 10.236.125.201 with SMTP id z49mr22631430yhh.93.1362611060481; Wed, 06 Mar 2013 15:04:20 -0800 (PST) Received: from localhost.localdomain ([177.96.26.48]) by mx.google.com with ESMTPS id g69sm15216327yhh.17.2013.03.06.15.04.18 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Mar 2013 15:04:20 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Wed, 6 Mar 2013 20:03:21 -0300 Message-Id: <1362611003-4823-15-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362611003-4823-1-git-send-email-przanoni@gmail.com> References: <1362611003-4823-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 14/15] drm/i915: check the power well on i915_pipe_enabled 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 From: Paulo Zanoni This fixes "unclaimed register" messages when the power well is disabled and there's a GPU hang. Signed-off-by: Paulo Zanoni Reviewed-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_irq.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 29b1bb1..aefc674 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -129,6 +129,9 @@ i915_pipe_enabled(struct drm_device *dev, int pipe) enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, pipe); + if (intel_power_well_is_down(dev) && cpu_transcoder != TRANSCODER_EDP) + return false; + return I915_READ(PIPECONF(cpu_transcoder)) & PIPECONF_ENABLE; }