Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2537744pxj; Mon, 10 May 2021 05:27:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnwXvAGd3xhtSL1SyIRk3MsboJ1lDYDyICmONhz7gG4zd82iiaAfSMeC+s+4UVGbkaYgH/ X-Received: by 2002:a5d:8441:: with SMTP id w1mr18094694ior.210.1620649635329; Mon, 10 May 2021 05:27:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620649635; cv=none; d=google.com; s=arc-20160816; b=nv0fTZzptqHFR3chFrpdpo0BMQYfAWwArJJfH7ftIfkMHRUqeUkjnMJVHNBn54UqC1 7YFAspm7Ruza6yeqoRXQ4ncldnekOBoitfQ+5V/eC9UfmL0LjbGtFX4rlwVi8owKe0gI RXFCVP6MyszpQT+xgNDzTzCu0dy4fMHJFpf9gEu/vZdGKd+0iiw584OylVQmbGU/qcdu Rqc4uERCcXWRLGTwmPM9A5Ttxk4syotymQ9tWeMdEib1d5U3Tdw/QAj8PiG2Xpi0596i R8Tk9E6FmRJNS9Ztt70pwfhNvrZhC4KkHtiMEbNhZpsJfhI8wVhK2u1zb4eGd/vOINPR 3rmg== 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=9iB4ld4dUFtN5JWmAXAYNccziWtEUC5yw4YueUJqT9U=; b=hnu0KspnY+Spfr4NJbrBqfKGrAFX8kRINwc9kPsj4frVSa0f7DBMu/f6ifT3FNNYia K6VjyT9EzcmSokKmCvkQHMexJN0qc1/WGt3aEG+P4V0VUKM7kK1QwQYYP++mPDPWRD6L 3bSnpTbbOLrFzzWOs9WlBd+yr0NLs3a/9tG0qSTx189pSiMbPT+MIEvD778HFVlZ1q+K tUGHog/AtYeBUyOFprgoPTqAo8Vc+vr3d+daKKV1aWuniGPIT3upAoinbbhT7xtmwJQM TKlTUNJ7Okxk4VikYscawuE9NAJmCAiNTBTa7ZDxOf955zG4/dUd6f2uTcGe500+LWiX GbRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BVozzfH8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 p15si17750055ilo.83.2021.05.10.05.27.03; Mon, 10 May 2021 05:27:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=BVozzfH8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1345799AbhEJMZ3 (ORCPT + 99 others); Mon, 10 May 2021 08:25:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:53306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237045AbhEJLLN (ORCPT ); Mon, 10 May 2021 07:11:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8A17B6157F; Mon, 10 May 2021 11:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644798; bh=KprGEgi2SnO1s/mKEo8xVV/ncCKSK03eyLB1dOpN8Ro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BVozzfH8mVgQw2PipVP1F55bH8ZghAj9JXpz4Opj8KbZqTzBwgsCAGIJ8iGVc5thj NHbag+0t+MOIRAaHyHZka/QdoQfOrwtwvChYWQxMGGx2LoKujZ1N1bzLv9L/+cM+Xr PQKHYAyetu92JrWQJzWUbZuyau6LTffVM+Jpz8CM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Wheeler , Dmytro Laktyushkin , Eric Bernstein , Solomon Chiu , Alex Deucher , Sasha Levin Subject: [PATCH 5.12 193/384] drm/amd/display: fix dml prefetch validation Date: Mon, 10 May 2021 12:19:42 +0200 Message-Id: <20210510102021.244124692@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmytro Laktyushkin [ Upstream commit 8ee0fea4baf90e43efe2275de208a7809f9985bc ] Incorrect variable used, missing initialization during validation. Tested-by: Daniel Wheeler Signed-off-by: Dmytro Laktyushkin Reviewed-by: Eric Bernstein Acked-by: Solomon Chiu Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c | 1 + drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c index 0f3f510fd83b..9729cf292e84 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c @@ -3437,6 +3437,7 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.DCCEnabledInAnyPlane = true; } } + mode_lib->vba.UrgentLatency = mode_lib->vba.UrgentLatencyPixelDataOnly; for (i = 0; i <= mode_lib->vba.soc.num_states; i++) { locals->FabricAndDRAMBandwidthPerState[i] = dml_min( mode_lib->vba.DRAMSpeedPerState[i] * mode_lib->vba.NumberOfChannels diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c index 210c96cd5b03..51098c2c9854 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c @@ -3544,6 +3544,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode mode_lib->vba.DCCEnabledInAnyPlane = true; } } + mode_lib->vba.UrgentLatency = mode_lib->vba.UrgentLatencyPixelDataOnly; for (i = 0; i <= mode_lib->vba.soc.num_states; i++) { locals->FabricAndDRAMBandwidthPerState[i] = dml_min( mode_lib->vba.DRAMSpeedPerState[i] * mode_lib->vba.NumberOfChannels -- 2.30.2