kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
..
..
@@ -1,4 +1,4 @@
1
-/* SPDX-License-Identifier: GPL-2.0 */
1
+/* SPDX-License-Identifier: MIT */
2
2
 #ifndef __NVKM_TIMER_H__
3
3
 #define __NVKM_TIMER_H__
4
4
 #include <core/subdev.h>
..
..
@@ -28,6 +28,18 @@
28
28
 u64 nvkm_timer_read(struct nvkm_timer *);
29
29
 void nvkm_timer_alarm(struct nvkm_timer *, u32 nsec, struct nvkm_alarm *);
30
30
 
31
+struct nvkm_timer_wait {
32
+	struct nvkm_timer *tmr;
33
+	u64 limit;
34
+	u64 time0;
35
+	u64 time1;
36
+	int reads;
37
+};
38
+
39
+void nvkm_timer_wait_init(struct nvkm_device *, u64 nsec,
40
+			  struct nvkm_timer_wait *);
41
+s64 nvkm_timer_wait_test(struct nvkm_timer_wait *);
42
+
31
43
 /* Delay based on GPU time (ie. PTIMER).
32
44
  *
33
45
  * Will return -ETIMEDOUT unless the loop was terminated with 'break',
..
..
@@ -38,25 +50,21 @@
38
50
  */
39
51
 #define NVKM_DELAY _warn = false;
40
52
 #define nvkm_nsec(d,n,cond...) ({                                              \
41
-	struct nvkm_device *_device = (d);                                     \
42
-	struct nvkm_timer *_tmr = _device->timer;                              \
43
-	u64 _nsecs = (n), _time0 = nvkm_timer_read(_tmr);                      \
44
-	s64 _taken = 0;                                                        \
53
+	struct nvkm_timer_wait _wait;                                          \
45
54
 	bool _warn = true;                                                     \
55
+	s64 _taken = 0;                                                        \
46
56
                                                                                \
57
+	nvkm_timer_wait_init((d), (n), &_wait);                                \
47
58
 	do {                                                                   \
48
59
 		cond                                                           \
49
-	} while (_taken = nvkm_timer_read(_tmr) - _time0, _taken < _nsecs);    \
60
+	} while ((_taken = nvkm_timer_wait_test(&_wait)) >= 0);                \
50
61
                                                                                \
51
-	if (_taken >= _nsecs) {                                                \
52
-		if (_warn)                                                     \
53
-			dev_WARN(_device->dev, "timeout\n");                   \
54
-		_taken = -ETIMEDOUT;                                           \
55
-	}                                                                      \
62
+	if (_warn && _taken < 0)                                               \
63
+		dev_WARN(_wait.tmr->subdev.device->dev, "timeout\n");          \
56
64
 	_taken;                                                                \
57
65
 })
58
-#define nvkm_usec(d,u,cond...) nvkm_nsec((d), (u) * 1000, ##cond)
59
-#define nvkm_msec(d,m,cond...) nvkm_usec((d), (m) * 1000, ##cond)
66
+#define nvkm_usec(d, u, cond...) nvkm_nsec((d), (u) * 1000ULL, ##cond)
67
+#define nvkm_msec(d, m, cond...) nvkm_usec((d), (m) * 1000ULL, ##cond)
60
68
 
61
69
 #define nvkm_wait_nsec(d,n,addr,mask,data)                                     \
62
70
 	nvkm_nsec(d, n,                                                        \