From patchwork Thu Nov 21 15:47:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 3219751 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 822D49F26C for ; Thu, 21 Nov 2013 15:48:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 63DA520780 for ; Thu, 21 Nov 2013 15:48:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B741E20763 for ; Thu, 21 Nov 2013 15:48:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A22B8105B01 for ; Thu, 21 Nov 2013 07:48:42 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qe0-f49.google.com (mail-qe0-f49.google.com [209.85.128.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D8FF105ACA for ; Thu, 21 Nov 2013 07:48:05 -0800 (PST) Received: by mail-qe0-f49.google.com with SMTP id w7so1798364qeb.22 for ; Thu, 21 Nov 2013 07:48:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z2VbP7Dki1/Dod3yjw5KqciSp9eIg9Io8+nXKFPacMM=; b=KW6jKcC8I0RSFYV/g5z1PdZQCslELzEjqBSsebd31J68f4z52O8O4yP6sjOx2RvHFf AvI1g6j2KCIIx97HC+Kg3k1LvMl9vPswepJsxFJHAdJ7s2nCbGqwhNInlKu9jawU9HVW 7+AdwLuJ0RHffCDExasrhZ52TSEhWzoC0c5I6xJtXephtFX/9u+d8W3eTGQsaKrGtvQX e7bE31b/ndagxLfNupNlimhowsr0S2mbyXk6DKpSM1p234jrC+7aQ8ieiTMgZyof/L+K LyCPlkMgO9jWI/kibGepR8ephl1QrSBz3xm27TbIp9CpQENp0iAkgPTp6miNixM+0Mj7 7cjA== X-Received: by 10.49.36.233 with SMTP id t9mr12188542qej.3.1385048885192; Thu, 21 Nov 2013 07:48:05 -0800 (PST) Received: from localhost.localdomain (177.204.119.127.dynamic.adsl.gvt.net.br. [177.204.119.127]) by mx.google.com with ESMTPSA id x10sm26518341qas.5.2013.11.21.07.48.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Nov 2013 07:48:04 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Thu, 21 Nov 2013 13:47:24 -0200 Message-Id: <1385048853-1579-11-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1385048853-1579-1-git-send-email-przanoni@gmail.com> References: <1385048853-1579-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 10/19] drm/i915: do not assert DE_PCH_EVENT_IVB 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 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Paulo Zanoni The current code was checking if all bits of "val" were enabled and DE_PCH_EVENT_IVB was disabled. The new code doesn't care about the state of DE_PCH_EVENT_IVB: it just checks if everything else is 1. The goal is that future patches may completely disable interrupts, and the LCPLL-disabling code shouldn't care about the state of DE_PCH_EVENT_IVB. Signed-off-by: Paulo Zanoni Reviewed-by: Rodrigo Vivi --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 846f2de..95e8831 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6499,7 +6499,7 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv) spin_lock_irqsave(&dev_priv->irq_lock, irqflags); val = I915_READ(DEIMR); - WARN((val & ~DE_PCH_EVENT_IVB) != val, + WARN((val | DE_PCH_EVENT_IVB) != 0xffffffff, "Unexpected DEIMR bits enabled: 0x%x\n", val); val = I915_READ(SDEIMR); WARN((val | SDE_HOTPLUG_MASK_CPT) != 0xffffffff,