drm/amdgpu: Verify dpm setting for enabling smu with direct fw loading

Ensure that amdgpu_dpm kernel module parameter is set to 1
when enabling smu with direct firmware loading

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Likun Gao <Likun.Gao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 87588d0c8a13b915da03b535fbfbdce8a8d3cb71..9799e645b6bcc1916cda4a225a5f15f2e9340e42 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -3213,8 +3213,10 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
                return r;
 
        if ((adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT &&
-            !amdgpu_sriov_vf(adev)) ||
-           (adev->firmware.load_type == AMDGPU_FW_LOAD_RLC_BACKDOOR_AUTO && amdgpu_dpm == 1)) {
+            !amdgpu_sriov_vf(adev) &&
+            amdgpu_dpm == 1) ||
+           (adev->firmware.load_type == AMDGPU_FW_LOAD_RLC_BACKDOOR_AUTO &&
+            amdgpu_dpm == 1)) {
                r = amdgpu_discovery_set_smu_ip_blocks(adev);
                if (r)
                        return r;