From patchwork Wed Dec 20 04:35:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dhinakaran Pandiyan X-Patchwork-Id: 10124959 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E1F536019C for ; Wed, 20 Dec 2017 04:35:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D23562969F for ; Wed, 20 Dec 2017 04:35:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C23EF296A9; Wed, 20 Dec 2017 04:35:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A87AB2969F for ; Wed, 20 Dec 2017 04:35:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B4FA86E038; Wed, 20 Dec 2017 04:35:35 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-io0-x242.google.com (mail-io0-x242.google.com [IPv6:2607:f8b0:4001:c06::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 106D46E038 for ; Wed, 20 Dec 2017 04:35:33 +0000 (UTC) Received: by mail-io0-x242.google.com with SMTP id g70so3353698ioj.6 for ; Tue, 19 Dec 2017 20:35:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=uoPPnEq/LbN9JHNwRlfGKBxr1t85tBOYJZhdHCGNOok=; b=oiSbEdKWJiJeY+NBXGbIPz+XVt0rufsXIwV11KzaUTSUAlgW1O0zHu+Xyoj3U4Lp4O 5oBWMSyQM0iRiZSmhTGhQmb8Ty4APS+S6ezneZJbGVtbuczrCtgVCI1qafEQjX/dhZWg ho298Ayd3GGTRbxR4DYbRIXFP0wq2ZAjsCyOauONj6AUd24GPvV94snq0AGJejMrU1lg Sbwb0RzMUdrznaTV1h2VUzq/t5MX8eVz4J+ojAOfJN4N1bByNlvmg5We6MGimzglGBC6 mYtIHWUU3nMLNgpN/EhJZAZe9c3FmYW0TbUCzvCtc0U6vD+n74MedQU3YJKKnn9NZd9+ ktLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uoPPnEq/LbN9JHNwRlfGKBxr1t85tBOYJZhdHCGNOok=; b=ikDNsnoYzVfI36P6s0a+KsylGvQV87LRWrPsGyF9oSp+rsvt5ht8Wq0YPS/hneWRl9 IblP/sDxYhiLGRZfkTGH7DP5DiFf9NnL4LlpyNtY9d6hHrD46NNT5Zc+PZPp45Jley2U IakzDXG2cF5wgGCfnhTgbnvWol8VOJQhGbdAMj8I3ofNGvm2Y4RzrB0BqbM/Lquclqwe A3j2DuLZHCAOcXg5o/kPMRX92RjQtHWLOpjBYj2UyIgSIBkOM8kcXbLx11Q2JMwXEa1t /jVEayDZiKNCqaDRj+lk7nqtZLGJceZzBvSYdhtOkZ8+kqWWYmclQl9tCyPmJiAaRlUw IIxw== X-Gm-Message-State: AKGB3mIIfiatQnvVgRZIDJPq4d+ouO/uvVjg2aRJCM2jII85wnLgO3Zs e+vi4HdirScluIflMJYN7i9P3g== X-Google-Smtp-Source: ACJfBosRKEE8DO/g5cElJGMSeHPLq8ptCrld4+gsmAN2qdAOFuSO67oaEa+AAllF5f3aL82n6apERg== X-Received: by 10.107.36.11 with SMTP id k11mr7315199iok.196.1513744532802; Tue, 19 Dec 2017 20:35:32 -0800 (PST) Received: from localhost.localdomain ([2601:1c0:5402:5a00:f4fb:d44c:cd77:2f79]) by smtp.gmail.com with ESMTPSA id g79sm1942613itb.29.2017.12.19.20.35.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Dec 2017 20:35:31 -0800 (PST) From: Dhinakaran Pandiyan X-Google-Original-From: Dhinakaran Pandiyan To: intel-gfx@lists.freedesktop.org Date: Tue, 19 Dec 2017 20:35:20 -0800 Message-Id: <20171220043520.2599-1-dhinakaran.pandiyan@intel.com> X-Mailer: git-send-email 2.11.0 Cc: Rodrigo Vivi , Dhinakaran Pandiyan Subject: [Intel-gfx] [PATCH] drm/i915/psr: Fix register name mess up. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Commit 77affa31722b ("drm/i915/psr: Fix compiler warnings for hsw_psr_disable()") swapped status and control registers while fixing indentation. The _ctl at the end of the status register name must have to led to this. Cc: Chris Wilson Cc: Rodrigo Vivi Signed-off-by: Dhinakaran Pandiyan Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/intel_psr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c index 095e0a5a8574..863650366425 100644 --- a/drivers/gpu/drm/i915/intel_psr.c +++ b/drivers/gpu/drm/i915/intel_psr.c @@ -580,7 +580,7 @@ static void hsw_psr_disable(struct intel_dp *intel_dp, struct drm_i915_private *dev_priv = to_i915(dev); if (dev_priv->psr.active) { - i915_reg_t psr_ctl; + i915_reg_t psr_status; u32 psr_status_mask; if (dev_priv->psr.aux_frame_sync) @@ -589,24 +589,24 @@ static void hsw_psr_disable(struct intel_dp *intel_dp, 0); if (dev_priv->psr.psr2_support) { - psr_ctl = EDP_PSR2_CTL; + psr_status = EDP_PSR2_STATUS_CTL; psr_status_mask = EDP_PSR2_STATUS_STATE_MASK; - I915_WRITE(psr_ctl, - I915_READ(psr_ctl) & + I915_WRITE(EDP_PSR2_CTL, + I915_READ(EDP_PSR2_CTL) & ~(EDP_PSR2_ENABLE | EDP_SU_TRACK_ENABLE)); } else { - psr_ctl = EDP_PSR_STATUS_CTL; + psr_status = EDP_PSR_STATUS_CTL; psr_status_mask = EDP_PSR_STATUS_STATE_MASK; - I915_WRITE(psr_ctl, - I915_READ(psr_ctl) & ~EDP_PSR_ENABLE); + I915_WRITE(EDP_PSR_CTL, + I915_READ(EDP_PSR_CTL) & ~EDP_PSR_ENABLE); } /* Wait till PSR is idle */ if (intel_wait_for_register(dev_priv, - psr_ctl, psr_status_mask, 0, + psr_status, psr_status_mask, 0, 2000)) DRM_ERROR("Timed out waiting for PSR Idle State\n");