drm/amdgpu: only add uvd_v3_1_ip_block for Oland when pm_suspend_via_s2idle() is false

dmesg: [drm:uvd_v3_1_hw_init [amdgpu]] *ERROR* amdgpu: UVD Firmware validate fail (-22).

Oland uvd firmware do not support s2idle, only add uvd_v3_1_ip_block for Oland when
pm_suspend_via_s2idle() is false.

Signed-off-by: hongao <hongao@uniontech.com>
Signed-off-by: luozhijia <luozhijia@uniontech.com>
Signed-off-by: WangYuli <wangyuli@uniontech.com>

Author: hongaoo

drivers/gpu/drm/amd/amdgpu/si.c

@@ -25,9 +25,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/pci.h>
-
-#include <drm/amdgpu_drm.h>
-
+#include <linux/suspend.h>
 #include "amdgpu.h"
 #include "amdgpu_atombios.h"
 #include "amdgpu_ih.h"
@@ -2750,7 +2748,8 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
 #endif
 		else
 			amdgpu_device_ip_block_add(adev, &dce_v6_0_ip_block);
-		amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block);
+		if (!pm_suspend_default_s2idle())
+			amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block);
 		/* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */
 		break;
 	case CHIP_OLAND:
@@ -2768,7 +2767,8 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
 #endif
 		else
 			amdgpu_device_ip_block_add(adev, &dce_v6_4_ip_block);
-		amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block);
+		if (!pm_suspend_default_s2idle())
+			amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block);
 		/* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */
 		break;
 	case CHIP_HAINAN: