rtl88x2CE_WiFi_linux driver

hc

2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8

 kernel/drivers/gpu/drm/radeon/r600.c
..
..
@@ -25,19 +25,25 @@
25
25
  *          Alex Deucher
26
26
  *          Jerome Glisse
27
27
  */
28
-#include <linux/slab.h>
29
-#include <linux/seq_file.h>
28
+
30
29
 #include <linux/firmware.h>
31
30
 #include <linux/module.h>
32
-#include <drm/drmP.h>
31
+#include <linux/pci.h>
32
+#include <linux/slab.h>
33
+#include <linux/seq_file.h>
34
+
35
+#include <drm/drm_debugfs.h>
36
+#include <drm/drm_device.h>
37
+#include <drm/drm_vblank.h>
33
38
 #include <drm/radeon_drm.h>
39
+
40
+#include "atom.h"
41
+#include "avivod.h"
42
+#include "r600d.h"
34
43
 #include "radeon.h"
35
44
 #include "radeon_asic.h"
36
45
 #include "radeon_audio.h"
37
46
 #include "radeon_mode.h"
38
-#include "r600d.h"
39
-#include "atom.h"
40
-#include "avivod.h"
41
47
 #include "radeon_ucode.h"
42
48
 
43
49
 /* Firmware Names */
..
..
@@ -2840,7 +2846,7 @@
2840
2846
 		tmp = RREG32(scratch);
2841
2847
 		if (tmp == 0xDEADBEEF)
2842
2848
 			break;
2843
-		DRM_UDELAY(1);
2849
+		udelay(1);
2844
2850
 	}
2845
2851
 	if (i < rdev->usec_timeout) {
2846
2852
 		DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i);
..
..
@@ -2957,7 +2963,7 @@
2957
2963
 struct radeon_fence *r600_copy_cpdma(struct radeon_device *rdev,
2958
2964
 				     uint64_t src_offset, uint64_t dst_offset,
2959
2965
 				     unsigned num_gpu_pages,
2960
-				     struct reservation_object *resv)
2966
+				     struct dma_resv *resv)
2961
2967
 {
2962
2968
 	struct radeon_fence *fence;
2963
2969
 	struct radeon_sync sync;
..
..
@@ -3047,7 +3053,7 @@
3047
3053
 		 * there. So it is pointless to try to go through that code
3048
3054
 		 * hence why we disable uvd here.
3049
3055
 		 */
3050
-		rdev->has_uvd = 0;
3056
+		rdev->has_uvd = false;
3051
3057
 		return;
3052
3058
 	}
3053
3059
 	rdev->ring[R600_RING_TYPE_UVD_INDEX].ring_obj = NULL;
..
..
@@ -3185,7 +3191,7 @@
3185
3191
 	uint32_t temp;
3186
3192
 
3187
3193
 	temp = RREG32(CONFIG_CNTL);
3188
-	if (state == false) {
3194
+	if (!state) {
3189
3195
 		temp &= ~(1<<0);
3190
3196
 		temp |= (1<<1);
3191
3197
 	} else {
..
..
@@ -3433,7 +3439,7 @@
3433
3439
 		tmp = RREG32(scratch);
3434
3440
 		if (tmp == 0xDEADBEEF)
3435
3441
 			break;
3436
-		DRM_UDELAY(1);
3442
+		udelay(1);
3437
3443
 	}
3438
3444
 	if (i < rdev->usec_timeout) {
3439
3445
 		DRM_INFO("ib test on ring %d succeeded in %u usecs\n", ib.fence->ring, i);