From patchwork Fri Apr 9 09:53:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 418166 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1430177jai; Fri, 9 Apr 2021 03:07:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyS2eaMR7+PNFEbEeaOk9M1qUGJPQ/99FMolc/V7ABUjOOmgscYwn5GMRYiIVM6o+d1vG/1 X-Received: by 2002:a50:f29a:: with SMTP id f26mr16721974edm.13.1617962828418; Fri, 09 Apr 2021 03:07:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617962828; cv=none; d=google.com; s=arc-20160816; b=IXFdr2gU9/x+9ndPgLYJ8rfUoiE8M7QZGxzalzei4hVJaIWuDwjl3TxrKZXkec3EfK nS72Mwk1cNhzKz23vDOQ805GbPJiuCgJDhMlOf/Hm3BZKzwY49Ao/DrYyrs+w1lAa3FN LzwxlY8J8EDgDwFn9h1Wo4qkKs+q9V1aigc2cL7/pdAvqZZvWKYmWDeyAJ5Vvnq937Ni xamhdbPylk2XOKbePMQxii5W00T1V1wBAkrISRgUexlkn5wVYuLnfWSQvavAwNX54BMw tn06IGMcV7A0tEzvibZRP7zl5WGoon21KK1pWsYwBwGQD3ZFGHfQqJLfyMxZUX03N/Pl MAjQ== 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=oxVcCkLH4loqGRnPBGPouYqvlkt5un2f6muqwaeeWjo4iM4EVs4oENY60H7lFEhKVd 0kY44WGN3FIN3ZsWN4KhmyJqQfG+mEMew1in3DibwC6Evd529/cUE6QOD26cbNL+BOMi MDU7JLkjCEmlffjneWG/3HOEhP1oVa2kF0iiRVSrEHK3FNth8AWm+tJZZZNCp2sbdPEM FbxY2pSeZ0ETWgKaXa6fGcgV9QlCKZzdZ10JTq37f4T6/8XrthBxOq6tjyDAVXynt3sv k6ueVXYWnxJ10q77ibfeGNRIn+M/dvaJ+XCZYkn/l0smyAywDlhMtLtbTIWDbN3QEoY+ LYSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=GeYvSzdc; 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 gf19si1636716ejb.462.2021.04.09.03.07.08; Fri, 09 Apr 2021 03:07:08 -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=GeYvSzdc; 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 S232144AbhDIKHH (ORCPT + 12 others); Fri, 9 Apr 2021 06:07:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:51552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233744AbhDIKDg (ORCPT ); Fri, 9 Apr 2021 06:03:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 932EF61262; Fri, 9 Apr 2021 10:00:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617962433; bh=v4HVMH8P0XU+UNZSlncd7TW3fcqSlA++Hzi42gsu7PI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GeYvSzdc4s8TtssQkTYHpUfJqgvTdP3lEcnoDw8bzPU1pNBnMWKE/k4p8C0Uxxj9N ZriaQBGszOMTPKsEI7i4x1qb3GweyQ6qJIuzcV4u2RWjsqyZHTAkG87jGFwVcbEeUj HLUt9uInwZoX9l9L48b+kzCJPH6+NOhVCVnkLGWg= 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.11 14/45] drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate Date: Fri, 9 Apr 2021 11:53:40 +0200 Message-Id: <20210409095305.861177874@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210409095305.397149021@linuxfoundation.org> References: <20210409095305.397149021@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);