From patchwork Thu Oct 13 05:42:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1689364 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mnz2G1yT8z23k3 for ; Thu, 13 Oct 2022 16:43:00 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oiqzW-0004Mp-8d; Thu, 13 Oct 2022 05:42:46 +0000 Received: from mail-pj1-f44.google.com ([209.85.216.44]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oiqzU-0004MS-SO for kernel-team@lists.ubuntu.com; Thu, 13 Oct 2022 05:42:45 +0000 Received: by mail-pj1-f44.google.com with SMTP id fw14so1010237pjb.3 for ; Wed, 12 Oct 2022 22:42:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sxr6elUTxjAed9ZNJtml6QJjaZp2cu1hX3hKq8mBv3Y=; b=AQMs68mAW6S7KLTc7fivigENyV+HDQHjThqAWpOOeEH/jgH2e69qoMh2UvNwkMFRXJ tFnxAGATh73wgCdOwk64LZAwUHYedy9BpcXrc9/QlSWeFWbZuWugHcVHSpJBfhV5IEKq nTFQpLkeWeVpfrZDdTK/1wxduVLvBcwx39EfoFuSW+95ZwxpgXMRNK33CqaKABj4RR0m rw4z4rhS+OtVPnfjtxb5jy278k8Dsev/astudIaLfWkEc1AAuRyI7FsUAzeyONMqN3O4 NpPTRQZDLFMeWZqieZg4Qk2aGr0xwE+oTGaLEBDXJAmMJvPMFuZXQ5w2qfiYgaquA58z suUg== X-Gm-Message-State: ACrzQf3kLAeY6TF90NpY0uWO4z9tRPKajOS0XQNt+IIZNBSdRrK69RcB OU+YfGf7fU9g752U09SDN2wnfB+G178= X-Google-Smtp-Source: AMsMyM5ktmDpGJQTN2r1fdsLAazmnWmp/tMzAs8hCD1WDywjcTw+MEqMGFw8IaO8u6ekLJhfA4BF1A== X-Received: by 2002:a17:90b:3ece:b0:20a:ea98:b93e with SMTP id rm14-20020a17090b3ece00b0020aea98b93emr9287060pjb.123.1665639762706; Wed, 12 Oct 2022 22:42:42 -0700 (PDT) Received: from yewun.. (61-227-123-125.dynamic-ip.hinet.net. [61.227.123.125]) by smtp.gmail.com with ESMTPSA id m15-20020a170902f64f00b00172751a2fa4sm5468373plg.80.2022.10.12.22.42.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 22:42:42 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][SRU][OEM-6.0/Unstable] UBUNTU: SAUCE: drm/amd/display: Enable dpia support for dcn314 Date: Thu, 13 Oct 2022 13:42:37 +0800 Message-Id: <20221013054237.1127443-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221013054237.1127443-1-vicamo.yang@canonical.com> References: <20221013054237.1127443-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.44; envelope-from=vicamo@gmail.com; helo=mail-pj1-f44.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Roman Li BugLink: https://bugs.launchpad.net/bugs/1992723 [Why] DCN 3.1.4 supports DPIA. [How] - Set dpia_supported flag for dcn314 in dmub_hw_init() - Remove comment that becomes irrelevant after this change. Signed-off-by: Roman Li Reviewed-by: Nicholas Kazlauskas Reviewed-by: Mario Limonciello Cc: stable@vger.kernel.org # 6.0 (cherry picked from commit https://gitlab.freedesktop.org/agd5f/linux/-/commit/6fc6c3a991c2a983336ed230938937617a1394ab) Signed-off-by: You-Sheng Yang (vicamo) --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 513a6c4f68be..23f9e1d2ab70 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1109,7 +1109,8 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev) hw_params.fb[i] = &fb_info->fb[i]; switch (adev->ip_versions[DCE_HWIP][0]) { - case IP_VERSION(3, 1, 3): /* Only for this asic hw internal rev B0 */ + case IP_VERSION(3, 1, 3): + case IP_VERSION(3, 1, 4): hw_params.dpia_supported = true; hw_params.disable_dpia = adev->dm.dc->debug.dpia_debug.bits.disable_dpia; break;