This is a note to let you know that I've just added the patch titled
drm/amdgpu: add gfx support for GC 11.0.4
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-add-gfx-support-for-gc-11.0.4.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 1763cb65e870e783e26d2dc9def4edbeadcb1050 Mon Sep 17 00:00:00 2001
From: Yifan Zhang <yifan1.zhang@xxxxxxx>
Date: Wed, 12 Oct 2022 12:49:06 +0800
Subject: drm/amdgpu: add gfx support for GC 11.0.4
From: Yifan Zhang <yifan1.zhang@xxxxxxx>
commit 1763cb65e870e783e26d2dc9def4edbeadcb1050 upstream.
this patch to add GC 11.0.4 gfx support to gfx11 implementation.
Signed-off-by: Yifan Zhang <yifan1.zhang@xxxxxxx>
Reviewed-by: Aaron Liu <aaron.liu@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: "Limonciello, Mario" <Mario.Limonciello@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -77,6 +77,10 @@ MODULE_FIRMWARE("amdgpu/gc_11_0_3_pfp.bi
MODULE_FIRMWARE("amdgpu/gc_11_0_3_me.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_3_mec.bin");
MODULE_FIRMWARE("amdgpu/gc_11_0_3_rlc.bin");
+MODULE_FIRMWARE("amdgpu/gc_11_0_4_pfp.bin");
+MODULE_FIRMWARE("amdgpu/gc_11_0_4_me.bin");
+MODULE_FIRMWARE("amdgpu/gc_11_0_4_mec.bin");
+MODULE_FIRMWARE("amdgpu/gc_11_0_4_rlc.bin");
static const struct soc15_reg_golden golden_settings_gc_11_0_1[] =
{
@@ -262,6 +266,7 @@ static void gfx_v11_0_init_golden_regist
{
switch (adev->ip_versions[GC_HWIP][0]) {
case IP_VERSION(11, 0, 1):
+ case IP_VERSION(11, 0, 4):
soc15_program_register_sequence(adev,
golden_settings_gc_11_0_1,
(const u32)ARRAY_SIZE(golden_settings_gc_11_0_1));
@@ -856,6 +861,7 @@ static int gfx_v11_0_gpu_early_init(stru
adev->gfx.config.sc_earlyz_tile_fifo_size = 0x4C0;
break;
case IP_VERSION(11, 0, 1):
+ case IP_VERSION(11, 0, 4):
adev->gfx.config.max_hw_contexts = 8;
adev->gfx.config.sc_prim_fifo_size_frontend = 0x20;
adev->gfx.config.sc_prim_fifo_size_backend = 0x100;
@@ -1285,6 +1291,7 @@ static int gfx_v11_0_sw_init(void *handl
case IP_VERSION(11, 0, 1):
case IP_VERSION(11, 0, 2):
case IP_VERSION(11, 0, 3):
+ case IP_VERSION(11, 0, 4):
adev->gfx.me.num_me = 1;
adev->gfx.me.num_pipe_per_me = 1;
adev->gfx.me.num_queue_per_pipe = 1;
@@ -2486,7 +2493,8 @@ static int gfx_v11_0_wait_for_rlc_autolo
for (i = 0; i < adev->usec_timeout; i++) {
cp_status = RREG32_SOC15(GC, 0, regCP_STAT);
- if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(11, 0, 1))
+ if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(11, 0, 1) ||
+ adev->ip_versions[GC_HWIP][0] == IP_VERSION(11, 0, 4))
bootload_status = RREG32_SOC15(GC, 0,
regRLC_RLCS_BOOTLOAD_STATUS_gc_11_0_1);
else
Patches currently in stable-queue which might be from yifan1.zhang@xxxxxxx are
queue-6.1/drm-amdgpu-add-gmc-v11-support-for-gc-11.0.4.patch
queue-6.1/drm-amdgpu-discovery-add-psp-ip-v13.0.11-support.patch
queue-6.1/drm-amdgpu-set-gc-11.0.4-family.patch
queue-6.1/drm-amdgpu-discovery-enable-nbio-support-for-nbio-v7.7.1.patch
queue-6.1/drm-amdgpu-enable-psp-ip-v13.0.11-support.patch
queue-6.1/drm-amdgpu-add-gfx-support-for-gc-11.0.4.patch
queue-6.1/drm-amdgpu-pm-enable-swsmu-for-smu-ip-v13.0.11.patch
queue-6.1/drm-amdgpu-discovery-enable-soc21-common-for-gc-11.0.4.patch
queue-6.1/drm-amdgpu-pm-add-gfxoff-control-ip-version-check-for-smu-ip-v13.0.11.patch
queue-6.1/drm-amd-display-disable-s-g-display-on-dcn-3.1.5.patch
queue-6.1/drm-amdgpu-add-smu-13-support-for-smu-13.0.11.patch
queue-6.1/drm-amdgpu-soc21-add-mode2-asic-reset-for-smu-ip-v13.0.11.patch
queue-6.1/drm-amdgpu-discovery-enable-mes-support-for-gc-v11.0.4.patch
queue-6.1/drm-amdgpu-discovery-set-the-apu-flag-for-gc-11.0.4.patch
queue-6.1/drm-amd-display-disable-s-g-display-on-dcn-3.1.4.patch
queue-6.1/drm-amdgpu-discovery-enable-gfx-v11-for-gc-11.0.4.patch
queue-6.1/drm-amdgpu-add-tmz-support-for-gc-11.0.1.patch
queue-6.1/drm-amdgpu-correct-mec-number-for-gfx11-apus.patch
queue-6.1/drm-amdgpu-allow-multipipe-policy-on-asics-with-one-mec.patch
queue-6.1/drm-amdgpu-pm-use-the-specific-mailbox-registers-only-for-smu-ip-v13.0.4.patch
queue-6.1/drm-amdgpu-discovery-enable-gmc-v11-for-gc-11.0.4.patch
