From patchwork Wed Dec 15 06:57:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1568051 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JDQzs6xdsz9sVq for ; Wed, 15 Dec 2021 17:57:45 +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 1mxOEN-00025d-Cl; Wed, 15 Dec 2021 06:57:39 +0000 Received: from mail-pj1-f53.google.com ([209.85.216.53]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mxOEL-00023Q-Rq for kernel-team@lists.ubuntu.com; Wed, 15 Dec 2021 06:57:38 +0000 Received: by mail-pj1-f53.google.com with SMTP id mj19so1598401pjb.3 for ; Tue, 14 Dec 2021 22:57:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=98PMVgpnHsub6vnbFZsBzAneWcZR6V1nIjwwoHHiBOo=; b=Kkje/V5wL1IY37c/v9poLEmiAoSjYhSRYrqmOoMeivsWWjbw6JCTlpg1zZgKTZekfH 8HKRS/5Mc0aSDTDcjEwU1hEUCh1fA4bnYDJKxjRsKG7c6hkwJOdSdQ1favbWf4pLP+Jm 5/qUf0LBNBgCEu6iHJ5NbG9TaKo1FGcvMes/e6q6UQyJkWuG5thaybFDeVVuRNU2aee0 5zY7LEh7/tA1r+Zp198YVZNgYH4WbFi6unWA6GxdPykoQdTvRMtuv+HOA0lYIRYufcEO 20hG7RdVk9CbPstE1GNNRxlVk5vsCWH4AvcjS0crWfJihmbbQLl4CO6oFPhl5bG7m1ry Jf9Q== X-Gm-Message-State: AOAM533eFlf+mRMQltMaes4gar/2s9LGxs08fV/52cXiOPG0Awyc8/OT 8ipGN++L+qBe6zlMA3AhghGsPxBmKOw= X-Google-Smtp-Source: ABdhPJzM4lBWHYj76j/oXHbAK6y0U7ebbSi7SF5tQ66mD29D4zLfkCD4JJPTAwUtoFZQmmE/f7SR9w== X-Received: by 2002:a17:902:ce92:b0:148:a2e8:2c24 with SMTP id f18-20020a170902ce9200b00148a2e82c24mr3108838plg.115.1639551455667; Tue, 14 Dec 2021 22:57:35 -0800 (PST) Received: from localhost (218-173-164-169.dynamic-ip.hinet.net. [218.173.164.169]) by smtp.gmail.com with ESMTPSA id l1sm4301044pjh.28.2021.12.14.22.57.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 22:57:35 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/9][SRU][Jammy] UBUNTU: SAUCE: drm/amd/display: Fixup previous PSR policy commit Date: Wed, 15 Dec 2021 14:57:23 +0800 Message-Id: <20211215065730.390346-3-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215065730.390346-1-vicamo.yang@canonical.com> References: <20211215065730.390346-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.53; envelope-from=vicamo@gmail.com; helo=mail-pj1-f53.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: Mario Limonciello BugLink: https://bugs.launchpad.net/bugs/1953008 Commit 9470620e99e9 ("drm/amd/display: Enable PSR by default on newer DCN") relies upon IP version harvesting which isn't available until 5.16. For the backport of this commit, modify it to instead use chip types (matching Van Gogh and Yellow Carp). Signed-off-by: Mario Limonciello Change-Id: Ib50a2b278d644ad95c8cd7eeadcc496f6571c598 Signed-off-by: You-Sheng Yang --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 3819b0c1c1ec..353c38898d47 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3971,9 +3971,9 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) /* Determine whether to enable PSR support by default. */ if (!(amdgpu_dc_debug_mask & DC_DISABLE_PSR)) { - switch (adev->ip_versions[DCE_HWIP][0]) { - case IP_VERSION(3, 1, 2): - case IP_VERSION(3, 1, 3): + switch (adev->asic_type) { + case CHIP_VANGOGH: + case CHIP_YELLOW_CARP: psr_feature_enabled = true; break; default: