diff options
Diffstat (limited to 'meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4719-drm-amdgpu-pp-smu7-use-a-local-variable-for-toc-inde.patch')
| -rw-r--r-- | meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4719-drm-amdgpu-pp-smu7-use-a-local-variable-for-toc-inde.patch | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4719-drm-amdgpu-pp-smu7-use-a-local-variable-for-toc-inde.patch b/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4719-drm-amdgpu-pp-smu7-use-a-local-variable-for-toc-inde.patch deleted file mode 100644 index 5653d36d..00000000 --- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/4719-drm-amdgpu-pp-smu7-use-a-local-variable-for-toc-inde.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 229563b0db31cb197e63197b5324b4c3ff8728ae Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Thu, 12 Jul 2018 08:38:09 -0500 -Subject: [PATCH 4719/5725] drm/amdgpu/pp/smu7: use a local variable for toc - indexing -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Rather than using the index variable stored in vram. If -the device fails to come back online after a resume cycle, -reads from vram will return all 1s which will cause a -segfault. Based on a patch from Thomas Martitz <kugel@rockbox.org>. -This avoids the segfault, but we still need to sort out -why the GPU does not come back online after a resume. - -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=105760 -Acked-by: Christian König <christian.koenig@amd.com> -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> -Cc: stable@vger.kernel.org ---- - drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 23 +++++++++++----------- - 1 file changed, 12 insertions(+), 11 deletions(-) - -diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c -index 64d33b7..e131add 100644 ---- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c -+++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c -@@ -383,6 +383,7 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr) - uint32_t fw_to_load; - int result = 0; - struct SMU_DRAMData_TOC *toc; -+ uint32_t num_entries = 0; - - if (!hwmgr->reload_fw) { - pr_info("skip reloading...\n"); -@@ -424,41 +425,41 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr) - } - - toc = (struct SMU_DRAMData_TOC *)smu_data->header; -- toc->num_entries = 0; - toc->structure_version = 1; - - PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr, -- UCODE_ID_RLC_G, &toc->entry[toc->num_entries++]), -+ UCODE_ID_RLC_G, &toc->entry[num_entries++]), - "Failed to Get Firmware Entry.", return -EINVAL); - PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr, -- UCODE_ID_CP_CE, &toc->entry[toc->num_entries++]), -+ UCODE_ID_CP_CE, &toc->entry[num_entries++]), - "Failed to Get Firmware Entry.", return -EINVAL); - PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr, -- UCODE_ID_CP_PFP, &toc->entry[toc->num_entries++]), -+ UCODE_ID_CP_PFP, &toc->entry[num_entries++]), - "Failed to Get Firmware Entry.", return -EINVAL); - PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr, -- UCODE_ID_CP_ME, &toc->entry[toc->num_entries++]), -+ UCODE_ID_CP_ME, &toc->entry[num_entries++]), - "Failed to Get Firmware Entry.", return -EINVAL); - PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr, -- UCODE_ID_CP_MEC, &toc->entry[toc->num_entries++]), -+ UCODE_ID_CP_MEC, &toc->entry[num_entries++]), - "Failed to Get Firmware Entry.", return -EINVAL); - PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr, -- UCODE_ID_CP_MEC_JT1, &toc->entry[toc->num_entries++]), -+ UCODE_ID_CP_MEC_JT1, &toc->entry[num_entries++]), - "Failed to Get Firmware Entry.", return -EINVAL); - PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr, -- UCODE_ID_CP_MEC_JT2, &toc->entry[toc->num_entries++]), -+ UCODE_ID_CP_MEC_JT2, &toc->entry[num_entries++]), - "Failed to Get Firmware Entry.", return -EINVAL); - PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr, -- UCODE_ID_SDMA0, &toc->entry[toc->num_entries++]), -+ UCODE_ID_SDMA0, &toc->entry[num_entries++]), - "Failed to Get Firmware Entry.", return -EINVAL); - PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr, -- UCODE_ID_SDMA1, &toc->entry[toc->num_entries++]), -+ UCODE_ID_SDMA1, &toc->entry[num_entries++]), - "Failed to Get Firmware Entry.", return -EINVAL); - if (!hwmgr->not_vf) - PP_ASSERT_WITH_CODE(0 == smu7_populate_single_firmware_entry(hwmgr, -- UCODE_ID_MEC_STORAGE, &toc->entry[toc->num_entries++]), -+ UCODE_ID_MEC_STORAGE, &toc->entry[num_entries++]), - "Failed to Get Firmware Entry.", return -EINVAL); - -+ toc->num_entries = num_entries; - smu7_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_DRV_DRAM_ADDR_HI, upper_32_bits(smu_data->header_buffer.mc_addr)); - smu7_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_DRV_DRAM_ADDR_LO, lower_32_bits(smu_data->header_buffer.mc_addr)); - --- -2.7.4 - |