From patchwork Fri Apr 9 09:53:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 418163 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1424745jai; Fri, 9 Apr 2021 03:00:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/rZs6bk35aW4XBYo5aA4dTi2YnN4zl0LxQrKOlbV+Rfh4AluVmCnTv4Vy5stXbIfDOb6T X-Received: by 2002:a17:906:7257:: with SMTP id n23mr15582990ejk.412.1617962446998; Fri, 09 Apr 2021 03:00:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617962446; cv=none; d=google.com; s=arc-20160816; b=KvnQ+JL4RYbhmgBUA0pY1kCQkxW0YIPPbmpA/vCnvzFYf5vi8yhL+hYRB8FhnIE++m AW+/kk+IyPCSrnYMSGTdLF0k6UApxAQmAfrnECkCED3DLI4jrrHT3/6tHYviQP5w0CgL L3xEov2Yd/33Zfx8n8crr6ViXeQDTs3056Uyf6wQya66rSsvXwX0/7McFw9vDE9++KXa aLVjv0DpZzBVqsTcAYvmWCd+Y3tANfwKOj2Tpjvdy/syMFrXmxrEmvpIwN4o4IeMvRan 9NEbiOrhxucnjOvvg2pYoitNbjBMSmq4l0rKYego61O3f2I9bwiym5zxbKKwEgU6K2I4 0+Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5OVrPA7iHJONkWp8g1cil++HaIGIG6QDRst6xf9Wlhc=; b=sRmG9OF5BugQAMEsvA+L5ZyO65XpDjkhFyQevhoYb+jcp6T2vTH7VyrNOF9AtEZ17o ysofKjX3xA+imvjS/qNplry6R6Ashp+GT4XVXlYvvsa6GhR5drg/nW/AxIIZGDGmZtjg qw1AMpMDKQ1m9r/aWdG/CROP4dkX9Cfy8pTJP4Q8fK3AoDW8ABxS02Pj6MN8HrvhP4j1 22ROnoxN7qmUFR1eirHZMrEchAjGUCQYiDs42/5TPUwObkPVH4a/WfAqT4zQye5tEByH 8bQ1UZWod5nhFo7fRkFLDrJngk3vCjRxoo5LIKsbpO/Tc1Disnov7K7v7dI0mFnSKm3g eh3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2hp26nUQ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s20si1877786edu.53.2021.04.09.03.00.46; Fri, 09 Apr 2021 03:00:46 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2hp26nUQ; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233238AbhDIKA4 (ORCPT + 12 others); Fri, 9 Apr 2021 06:00:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:45450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233887AbhDIJ7D (ORCPT ); Fri, 9 Apr 2021 05:59:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 89BA46120A; Fri, 9 Apr 2021 09:58:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617962312; bh=v4HVMH8P0XU+UNZSlncd7TW3fcqSlA++Hzi42gsu7PI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2hp26nUQODsBqGJy/Me6zj/OnVw3Fc6OUff2P28oCkS0BsmZOZXkSq4bU1v+EOqwn fSulZ4F98WZ/jXduVFJa6e51IbqUzaSBGI+R4TCHoNJYrvONFdn0MabmdGAHflFulG Ppzi/GUtqLQoIztEE/Rx3/qwnE8WIjbrW6ca2kFU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Baryshkov , Abhinav Kumar , Rob Clark , Sasha Levin Subject: [PATCH 5.10 11/41] drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate Date: Fri, 9 Apr 2021 11:53:33 +0200 Message-Id: <20210409095305.190066803@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210409095304.818847860@linuxfoundation.org> References: <20210409095304.818847860@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dmitry Baryshkov [ Upstream commit 9daaf31307856defb1070685418ce5a484ecda3a ] The PLL_LOCKDET_RATE_1 was being programmed with a hardcoded value directly, but the same value was also being specified in the dsi_pll_regs struct pll_lockdet_rate variable: let's use it! Based on 362cadf34b9f ("drm/msm/dsi_pll_10nm: Fix variable usage for pll_lockdet_rate") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c index c1f6708367ae..c1c41846b6b2 100644 --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_7nm.c @@ -325,7 +325,7 @@ static void dsi_pll_commit(struct dsi_pll_7nm *pll) pll_write(base + REG_DSI_7nm_PHY_PLL_FRAC_DIV_START_LOW_1, reg->frac_div_start_low); pll_write(base + REG_DSI_7nm_PHY_PLL_FRAC_DIV_START_MID_1, reg->frac_div_start_mid); pll_write(base + REG_DSI_7nm_PHY_PLL_FRAC_DIV_START_HIGH_1, reg->frac_div_start_high); - pll_write(base + REG_DSI_7nm_PHY_PLL_PLL_LOCKDET_RATE_1, 0x40); + pll_write(base + REG_DSI_7nm_PHY_PLL_PLL_LOCKDET_RATE_1, reg->pll_lockdet_rate); pll_write(base + REG_DSI_7nm_PHY_PLL_PLL_LOCK_DELAY, 0x06); pll_write(base + REG_DSI_7nm_PHY_PLL_CMODE_1, 0x10); /* TODO: 0x00 for CPHY */ pll_write(base + REG_DSI_7nm_PHY_PLL_CLOCK_INVERTERS, reg->pll_clock_inverters);