From patchwork Tue Aug 25 23:20:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 11736981 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CCA2814F6 for ; Tue, 25 Aug 2020 23:21:14 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A935620767 for ; Tue, 25 Aug 2020 23:21:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DBrajKJJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A935620767 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B94DC6E183; Tue, 25 Aug 2020 23:21:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB5B76E122 for ; Tue, 25 Aug 2020 23:21:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598397667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type; bh=xNdewgWH8gCx0lJ9ZMNVoHAdBDGRlASSw/JoCtrkyuQ=; b=DBrajKJJlIVh2Z9Y62mOqtofpt/sFrDaJIAfnbBcqSua/lIwp5Bsr1QFou1G5QFM1L2AT3 e2MUYAdoypaFOWOxAoars1AWd0MTIGJdIZPX8+ySC0CCBkdy9cSq/ujlXW1yLCPIovzGuT ib4kOIJ5oVE1s9ISfzM/zQOHMh1HccM= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-522-wcxfCUsENyqdYJb70kHoFA-1; Tue, 25 Aug 2020 19:21:05 -0400 X-MC-Unique: wcxfCUsENyqdYJb70kHoFA-1 Received: by mail-qk1-f200.google.com with SMTP id b207so28152qkc.12 for ; Tue, 25 Aug 2020 16:21:05 -0700 (PDT) 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=xNdewgWH8gCx0lJ9ZMNVoHAdBDGRlASSw/JoCtrkyuQ=; b=WL00a1QQZlTAAG92ue4CthhS55ELHEpEbFOw91+H/dA1FoeGJxkQ1rwg57LFBUD5co bGjdFyMvM8mH/pWVyB6+mLc1Iv7IjpcxHj/jyD7KD0q5JG5j+6v0jPjCdbmdlI/MDzSj Wejq4sn+NObwl3Fi1RxS7rGuap+uGYcHkWQCwNXwCm6d6Xl05SQIH/9OPguY5jjNdgwt bqahnVe/z4y1N9tGzhjQesion3/wqowYjVP912TXQrzEFnGO6mmEC9JbMUGyZyd62xey xINKNNmB/YYsb8oxwcK102Mcz5i/ClzLYZlNJmKoDxgCN48t/Fy1SLeyrqWsWQEpEXvG 1ebg== X-Gm-Message-State: AOAM533HTVKz88emXOYczG9for9P08zR9EIPZzwMUSnCgdequiaVdV1+ OhjLO2sx+gbNtgZmEf+zb4eEfRSwrVGLx741wMd6u6p+Eqt4W9qMUpcGUXbNST+YaDweX96pSsT 0Wnx/8A1kXANFgXzNyFEuuIDPsuLj X-Received: by 2002:ac8:17f1:: with SMTP id r46mr5963454qtk.135.1598397664839; Tue, 25 Aug 2020 16:21:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8I7EJn0X+Y1AjXauBs3W/d3tk01cGPGwK4MefHhs4PA5UeDTE8BAPGY84Kz1xBSI26HkGwA== X-Received: by 2002:ac8:17f1:: with SMTP id r46mr5963432qtk.135.1598397664642; Tue, 25 Aug 2020 16:21:04 -0700 (PDT) Received: from trix.remote.csb (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id g55sm494590qta.94.2020.08.25.16.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 16:21:04 -0700 (PDT) From: trix@redhat.com To: jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, airlied@linux.ie, daniel@ffwll.ch, jose.souza@intel.com, matthew.d.roper@intel.com, anusha.srivatsa@intel.com, pankaj.laxminarayan.bharadiya@intel.com, wambui.karugax@gmail.com, vivek.kasireddy@intel.com Subject: [PATCH] drm/i915/display: fix uninitialized variable Date: Tue, 25 Aug 2020 16:20:57 -0700 Message-Id: <20200825232057.31601-1-trix@redhat.com> X-Mailer: git-send-email 2.18.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tom Rix , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Tom Rix clang static analysis flags this error intel_combo_phy.c:268:7: warning: The left expression of the compound assignment is an uninitialized value. The computed value will also be garbage ret &= check_phy_reg(... ~~~ ^ ret has no initial values, in icl_combo_phy_verify_state() ret is set by the next statment and then updated by similar &= logic. Because the check_phy_req() are only register reads, reorder the statements. Fixes: 239bef676d8e ("drm/i915/display: Implement new combo phy initialization step") Signed-off-by: Tom Rix --- drivers/gpu/drm/i915/display/intel_combo_phy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_combo_phy.c b/drivers/gpu/drm/i915/display/intel_combo_phy.c index 6968de4f3477..7622ef66c987 100644 --- a/drivers/gpu/drm/i915/display/intel_combo_phy.c +++ b/drivers/gpu/drm/i915/display/intel_combo_phy.c @@ -264,6 +264,8 @@ static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv, if (!icl_combo_phy_enabled(dev_priv, phy)) return false; + ret = cnl_verify_procmon_ref_values(dev_priv, phy); + if (INTEL_GEN(dev_priv) >= 12) { ret &= check_phy_reg(dev_priv, phy, ICL_PORT_TX_DW8_LN0(phy), ICL_PORT_TX_DW8_ODCC_CLK_SEL | @@ -276,8 +278,6 @@ static bool icl_combo_phy_verify_state(struct drm_i915_private *dev_priv, DCC_MODE_SELECT_CONTINUOSLY); } - ret = cnl_verify_procmon_ref_values(dev_priv, phy); - if (phy_is_master(dev_priv, phy)) { ret &= check_phy_reg(dev_priv, phy, ICL_PORT_COMP_DW8(phy), IREFGEN, IREFGEN);