OSDN Git Service

drm/amdgpu: Delete dead code when early init
authorRex Zhu <Rex.Zhu@amd.com>
Fri, 16 Mar 2018 04:40:16 +0000 (12:40 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 19 Mar 2018 18:34:46 +0000 (13:34 -0500)
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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/soc15.c
drivers/gpu/drm/amd/amdgpu/vi.c

index c6e8573..242c30b 100644 (file)
@@ -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) {
index e7fb165..126f127 100644 (file)
@@ -896,7 +896,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) {
@@ -917,10 +916,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) {