]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
drm/amd/powerplay: drop unnecessary sw smu check
authorEvan Quan <evan.quan@amd.com>
Fri, 10 May 2019 08:56:27 +0000 (16:56 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 24 May 2019 17:20:59 +0000 (12:20 -0500)
There is already sw smu check on IP block adding.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c

index 52d919a8b70aae7f693997b6b920ee4cc2c73ada..ed8840026e59c98b0e909077b824763b03b64925 100644 (file)
@@ -436,9 +436,6 @@ static int smu_sw_init(void *handle)
        struct smu_context *smu = &adev->smu;
        int ret;
 
-       if (!is_support_sw_smu(adev))
-               return -EINVAL;
-
        smu->pool_size = adev->pm.smu_prv_buffer_size;
        smu->smu_feature.feature_num = SMU_FEATURE_MAX;
        mutex_init(&smu->smu_feature.mutex);
@@ -490,9 +487,6 @@ static int smu_sw_fini(void *handle)
        struct smu_context *smu = &adev->smu;
        int ret;
 
-       if (!is_support_sw_smu(adev))
-               return -EINVAL;
-
        ret = smu_smc_table_sw_fini(smu);
        if (ret) {
                pr_err("Failed to sw fini smc table!\n");
@@ -818,9 +812,6 @@ static int smu_hw_init(void *handle)
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        struct smu_context *smu = &adev->smu;
 
-       if (!is_support_sw_smu(adev))
-               return -EINVAL;
-
        if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
                ret = smu_load_microcode(smu);
                if (ret)
@@ -879,9 +870,6 @@ static int smu_hw_fini(void *handle)
        struct smu_table_context *table_context = &smu->smu_table;
        int ret = 0;
 
-       if (!is_support_sw_smu(adev))
-               return -EINVAL;
-
        kfree(table_context->driver_pptable);
        table_context->driver_pptable = NULL;
 
@@ -936,9 +924,6 @@ static int smu_suspend(void *handle)
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        struct smu_context *smu = &adev->smu;
 
-       if (!is_support_sw_smu(adev))
-               return -EINVAL;
-
        ret = smu_system_features_control(smu, false);
        if (ret)
                return ret;
@@ -954,9 +939,6 @@ static int smu_resume(void *handle)
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        struct smu_context *smu = &adev->smu;
 
-       if (!is_support_sw_smu(adev))
-               return -EINVAL;
-
        pr_info("SMU is resuming...\n");
 
        mutex_lock(&smu->mutex);