diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1904-drm-amdgpu-delete-dead-code-about-fw-load-check.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1904-drm-amdgpu-delete-dead-code-about-fw-load-check.patch | 161 |
1 files changed, 161 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1904-drm-amdgpu-delete-dead-code-about-fw-load-check.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1904-drm-amdgpu-delete-dead-code-about-fw-load-check.patch new file mode 100644 index 00000000..55c11a62 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1904-drm-amdgpu-delete-dead-code-about-fw-load-check.patch @@ -0,0 +1,161 @@ +From be87dc04cb87e3872c3e390df51a8a0251acd264 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Mon, 25 Sep 2017 17:50:13 +0800 +Subject: [PATCH 1904/4131] drm/amdgpu: delete dead code about fw load check + +Change-Id: I93c1eedbbc5c7dd9183d4c6b767a553122663425 +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 60 ++++++++-------------------------- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 20 +++--------- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 21 +++--------- + 3 files changed, 23 insertions(+), 78 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +index e752f37..d29a27b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +@@ -4135,18 +4135,12 @@ static int gfx_v8_0_rlc_resume(struct amdgpu_device *adev) + gfx_v8_0_rlc_reset(adev); + gfx_v8_0_init_pg(adev); + +- if (!adev->pp_enabled) { +- if (adev->firmware.load_type != AMDGPU_FW_LOAD_SMU) { +- /* legacy rlc firmware loading */ +- r = gfx_v8_0_rlc_load_microcode(adev); +- if (r) +- return r; +- } else { +- r = adev->smu.smumgr_funcs->check_fw_load_finish(adev, +- AMDGPU_UCODE_ID_RLC_G); +- if (r) +- return -EINVAL; +- } ++ ++ if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) { ++ /* legacy rlc firmware loading */ ++ r = gfx_v8_0_rlc_load_microcode(adev); ++ if (r) ++ return r; + } + + gfx_v8_0_rlc_start(adev); +@@ -4962,43 +4956,15 @@ static int gfx_v8_0_cp_resume(struct amdgpu_device *adev) + if (!(adev->flags & AMD_IS_APU)) + gfx_v8_0_enable_gui_idle_interrupt(adev, false); + +- if (!adev->pp_enabled) { +- if (adev->firmware.load_type != AMDGPU_FW_LOAD_SMU) { ++ if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) { + /* legacy firmware loading */ +- r = gfx_v8_0_cp_gfx_load_microcode(adev); +- if (r) +- return r; ++ r = gfx_v8_0_cp_gfx_load_microcode(adev); ++ if (r) ++ return r; + +- r = gfx_v8_0_cp_compute_load_microcode(adev); +- if (r) +- return r; +- } else { +- r = adev->smu.smumgr_funcs->check_fw_load_finish(adev, +- AMDGPU_UCODE_ID_CP_CE); +- if (r) +- return -EINVAL; +- +- r = adev->smu.smumgr_funcs->check_fw_load_finish(adev, +- AMDGPU_UCODE_ID_CP_PFP); +- if (r) +- return -EINVAL; +- +- r = adev->smu.smumgr_funcs->check_fw_load_finish(adev, +- AMDGPU_UCODE_ID_CP_ME); +- if (r) +- return -EINVAL; +- +- if (adev->asic_type == CHIP_TOPAZ) { +- r = gfx_v8_0_cp_compute_load_microcode(adev); +- if (r) +- return r; +- } else { +- r = adev->smu.smumgr_funcs->check_fw_load_finish(adev, +- AMDGPU_UCODE_ID_CP_MEC1); +- if (r) +- return -EINVAL; +- } +- } ++ r = gfx_v8_0_cp_compute_load_microcode(adev); ++ if (r) ++ return r; + } + + r = gfx_v8_0_cp_gfx_resume(adev); +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +index 4c9f8d8..a9c1845 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +@@ -561,21 +561,11 @@ static int sdma_v2_4_start(struct amdgpu_device *adev) + { + int r; + +- if (!adev->pp_enabled) { +- if (adev->firmware.load_type != AMDGPU_FW_LOAD_SMU) { +- r = sdma_v2_4_load_microcode(adev); +- if (r) +- return r; +- } else { +- r = adev->smu.smumgr_funcs->check_fw_load_finish(adev, +- AMDGPU_UCODE_ID_SDMA0); +- if (r) +- return -EINVAL; +- r = adev->smu.smumgr_funcs->check_fw_load_finish(adev, +- AMDGPU_UCODE_ID_SDMA1); +- if (r) +- return -EINVAL; +- } ++ ++ if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) { ++ r = sdma_v2_4_load_microcode(adev); ++ if (r) ++ return r; + } + + /* halt the engine before programing */ +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +index 10a0ceb..1c5de2e 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +@@ -819,23 +819,12 @@ static int sdma_v3_0_load_microcode(struct amdgpu_device *adev) + */ + static int sdma_v3_0_start(struct amdgpu_device *adev) + { +- int r, i; ++ int r; + +- if (!adev->pp_enabled) { +- if (adev->firmware.load_type != AMDGPU_FW_LOAD_SMU) { +- r = sdma_v3_0_load_microcode(adev); +- if (r) +- return r; +- } else { +- for (i = 0; i < adev->sdma.num_instances; i++) { +- r = adev->smu.smumgr_funcs->check_fw_load_finish(adev, +- (i == 0) ? +- AMDGPU_UCODE_ID_SDMA0 : +- AMDGPU_UCODE_ID_SDMA1); +- if (r) +- return -EINVAL; +- } +- } ++ if (adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) { ++ r = sdma_v3_0_load_microcode(adev); ++ if (r) ++ return r; + } + + /* disable sdma engine before programing it */ +-- +2.7.4 + |