From 37c772eada57969d06ba70421f6d284e5757a9e3 Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Wed, 7 Feb 2024 04:24:31 +0100 Subject: [PATCH] 6.7: misc-additions: Remove unneeded parts of the rdna3 reboot hang revert. Following https://gitlab.freedesktop.org/agd5f/linux/-/commit/7055c5856aa10a7f2d687557c50751a72080e4c8 --- .../6.7/0012-misc-additions.patch | 79 ------------------- 1 file changed, 79 deletions(-) diff --git a/linux-tkg-patches/6.7/0012-misc-additions.patch b/linux-tkg-patches/6.7/0012-misc-additions.patch index c1dbec9..618b53c 100644 --- a/linux-tkg-patches/6.7/0012-misc-additions.patch +++ b/linux-tkg-patches/6.7/0012-misc-additions.patch @@ -217,66 +217,10 @@ index f8b2e6cc2..e8329d157 100644 }; struct smu_baco_context { -diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h -index 95cb91971..cc02f979e 100644 ---- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h -+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h -@@ -299,7 +299,5 @@ int smu_v13_0_update_pcie_parameters(struct smu_context *smu, - uint8_t pcie_gen_cap, - uint8_t pcie_width_cap); - --int smu_v13_0_disable_pmfw_state(struct smu_context *smu); -- - #endif - #endif -diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c -index cf1b84060..a49e5adf7 100644 ---- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c -+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c -@@ -2477,16 +2477,3 @@ int smu_v13_0_update_pcie_parameters(struct smu_context *smu, - - return 0; - } -- --int smu_v13_0_disable_pmfw_state(struct smu_context *smu) --{ -- int ret; -- struct amdgpu_device *adev = smu->adev; -- -- WREG32_PCIE(MP1_Public | (smnMP1_FIRMWARE_FLAGS & 0xffffffff), 0); -- -- ret = RREG32_PCIE(MP1_Public | -- (smnMP1_FIRMWARE_FLAGS & 0xffffffff)); -- -- return ret == 0 ? 0 : -EINVAL; --} diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c index 82c4e1f1c..2ba77b1d1 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c -@@ -2574,20 +2574,14 @@ static int smu_v13_0_0_baco_enter(struct smu_context *smu) - static int smu_v13_0_0_baco_exit(struct smu_context *smu) - { - struct amdgpu_device *adev = smu->adev; -- int ret; - - if (adev->in_runpm && smu_cmn_is_audio_func_enabled(adev)) { - /* Wait for PMFW handling for the Dstate change */ - usleep_range(10000, 11000); -- ret = smu_v13_0_baco_set_armd3_sequence(smu, BACO_SEQ_ULPS); -+ return smu_v13_0_baco_set_armd3_sequence(smu, BACO_SEQ_ULPS); - } else { -- ret = smu_v13_0_baco_exit(smu); -+ return smu_v13_0_baco_exit(smu); - } -- -- if (!ret) -- adev->gfx.is_poweron = false; -- -- return ret; - } - - static bool smu_v13_0_0_is_mode1_reset_supported(struct smu_context *smu) @@ -2772,13 +2766,7 @@ static int smu_v13_0_0_set_mp1_state(struct smu_context *smu, switch (mp1_state) { @@ -311,26 +255,3 @@ index 81eafed76..19c1289d0 100644 break; default: /* Ignore others */ -@@ -2531,20 +2525,14 @@ static int smu_v13_0_7_baco_enter(struct smu_context *smu) - static int smu_v13_0_7_baco_exit(struct smu_context *smu) - { - struct amdgpu_device *adev = smu->adev; -- int ret; - - if (adev->in_runpm && smu_cmn_is_audio_func_enabled(adev)) { - /* Wait for PMFW handling for the Dstate change */ - usleep_range(10000, 11000); -- ret = smu_v13_0_baco_set_armd3_sequence(smu, BACO_SEQ_ULPS); -+ return smu_v13_0_baco_set_armd3_sequence(smu, BACO_SEQ_ULPS); - } else { -- ret = smu_v13_0_baco_exit(smu); -+ return smu_v13_0_baco_exit(smu); - } -- -- if (!ret) -- adev->gfx.is_poweron = false; -- -- return ret; - } - - static bool smu_v13_0_7_is_mode1_reset_supported(struct smu_context *smu)