diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3813-drm-amdgpu-Delete-dead-code-when-early-init.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3813-drm-amdgpu-Delete-dead-code-when-early-init.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3813-drm-amdgpu-Delete-dead-code-when-early-init.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3813-drm-amdgpu-Delete-dead-code-when-early-init.patch new file mode 100644 index 00000000..cf4c9615 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3813-drm-amdgpu-Delete-dead-code-when-early-init.patch @@ -0,0 +1,63 @@ +From b7a3f4eeb94e378c2c938c36ce07fbc9a4abe596 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Fri, 16 Mar 2018 12:40:16 +0800 +Subject: [PATCH 3813/4131] drm/amdgpu: Delete dead code when early init + +Change-Id: I8b19a94a059e70ce735074275189568382620d12 +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Reviewed-by: Evan Quan <evan.quan@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/soc15.c | 5 ----- + drivers/gpu/drm/amd/amdgpu/vi.c | 5 ----- + 2 files changed, 10 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c +index c6e8573..242c30b 100644 +--- a/drivers/gpu/drm/amd/amdgpu/soc15.c ++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c +@@ -608,7 +608,6 @@ static const struct amdgpu_asic_funcs soc15_asic_funcs = + + static int soc15_common_early_init(void *handle) + { +- bool psp_enabled = false; + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + adev->smc_rreg = NULL; +@@ -626,10 +625,6 @@ static int soc15_common_early_init(void *handle) + + adev->asic_funcs = &soc15_asic_funcs; + +- if (amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_PSP) && +- (amdgpu_ip_block_mask & (1 << AMD_IP_BLOCK_TYPE_PSP))) +- psp_enabled = true; +- + adev->rev_id = soc15_get_rev_id(adev); + adev->external_rev_id = 0xFF; + switch (adev->asic_type) { +diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c +index d710bd5..ba2a06c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vi.c ++++ b/drivers/gpu/drm/amd/amdgpu/vi.c +@@ -939,7 +939,6 @@ static const struct amdgpu_asic_funcs vi_asic_funcs = + + static int vi_common_early_init(void *handle) + { +- bool smc_enabled = false; + struct amdgpu_device *adev = (struct amdgpu_device *)handle; + + if (adev->flags & AMD_IS_APU) { +@@ -960,10 +959,6 @@ static int vi_common_early_init(void *handle) + + adev->asic_funcs = &vi_asic_funcs; + +- if (amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_SMC) && +- (amdgpu_ip_block_mask & (1 << AMD_IP_BLOCK_TYPE_SMC))) +- smc_enabled = true; +- + adev->rev_id = vi_get_rev_id(adev); + adev->external_rev_id = 0xFF; + switch (adev->asic_type) { +-- +2.7.4 + |