From patchwork Wed Aug 21 21:38:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2847937 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 60B69BF546 for ; Wed, 21 Aug 2013 21:51:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 583CD20565 for ; Wed, 21 Aug 2013 21:51:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6C740201F5 for ; Wed, 21 Aug 2013 21:51:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B8A4E77AD for ; Wed, 21 Aug 2013 14:51:07 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f172.google.com (mail-ea0-f172.google.com [209.85.215.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B681E6757 for ; Wed, 21 Aug 2013 14:38:01 -0700 (PDT) Received: by mail-ea0-f172.google.com with SMTP id r16so541514ead.31 for ; Wed, 21 Aug 2013 14:38:00 -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:in-reply-to:references; bh=7TWWVDY9ZGfcVMAy3ymonBf/FpLqll+yK+eiKzJ1zB8=; b=DYVZioedICC3hfx/f6u1R4g8MIo6nd+Y1+EOFs868KUwI5HBW76Pp8yLEusojxpNcs HUHGX/WM6iyu375tTNcu/ip/0xAQ56fvRIVcx0Jy59hI0xA9ve7hDKfy3tjLClhmFkSn 7ucrqA6vvSAXB4tB6dpoVi64b8BGaEUc6QBeg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7TWWVDY9ZGfcVMAy3ymonBf/FpLqll+yK+eiKzJ1zB8=; b=ANAUjG6Hs94cJzNA2iRzLu13EVrTPv5WoKsy+TudOE8twx2b9vvrIJjfgtQDCpYoaA ZRjK7whUjDFQTGmJ+Wi9S8m+viUQ2WN/d+1T5W8QfstfcqKLV2Br53wOqg+Rjrvq+yDl Y986l/457dyJRcjemopVC6ZuKnbJLgcz1J9qc5xAb0d1NYqG/dQrI/2NCP3NroTueQVX UsvhnYesdBd4D2i6P4fi1Us13SwKLC/PaVN1x0SQVADCT1WD5trkC4kGxsRz0BWCEJTE cIMkpDah3XoIEPwrXtYtns8927gbj5N2nOoCST3Ear9xJnS1A6DWgg7a/W3Vn+ZBMxv3 6Exg== X-Gm-Message-State: ALoCoQlCyP986Ks/aOsZRy0ngTZiKIvYdS/H8BgPQChFJmfOdXdk2VB9YXyNWcoCVVRzw9iqoLDK X-Received: by 10.14.205.72 with SMTP id i48mr230484eeo.78.1377121080747; Wed, 21 Aug 2013 14:38:00 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id d8sm12818682eeh.8.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 21 Aug 2013 14:37:59 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 21 Aug 2013 23:38:08 +0200 Message-Id: <1377121088-14467-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <20130821213100.GK26909@phenom.ffwll.local> References: <20130821213100.GK26909@phenom.ffwll.local> Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: Use POSTING_READ in lcpll code 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=-6.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 If we don't use the return value of a mmio read our coding style is to use the POSTING_READ macro. This avoids cluttering the mmio traces. While at it add the missing posting read in the lcpll enable function that Paulo spotted. v2: Drop the _NOTRACE changes, tracing such wait_for loops in the modeset code might actually be rather useful! Cc: Paulo Zanoni Signed-off-by: Daniel Vetter Reviewed-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 7a40427..937fc5a6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6036,13 +6036,14 @@ void hsw_restore_lcpll(struct drm_i915_private *dev_priv) if (val & LCPLL_POWER_DOWN_ALLOW) { val &= ~LCPLL_POWER_DOWN_ALLOW; I915_WRITE(LCPLL_CTL, val); + POSTING_READ(LCPLL_CTL); } val = I915_READ(D_COMP); val |= D_COMP_COMP_FORCE; val &= ~D_COMP_COMP_DISABLE; I915_WRITE(D_COMP, val); - I915_READ(D_COMP); + POSTING_READ(D_COMP); val = I915_READ(LCPLL_CTL); val &= ~LCPLL_PLL_DISABLE;