disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp100.c
..
..
@@ -21,31 +21,48 @@
21
21
  */
22
22
 #include "priv.h"
23
23
 
24
-#include <subdev/mmu.h>
24
+#include <core/memory.h>
25
+#include <subdev/mc.h>
25
26
 
26
-static void
27
+#include <nvif/class.h>
28
+
29
+void
30
+gp100_fault_buffer_intr(struct nvkm_fault_buffer *buffer, bool enable)
31
+{
32
+	struct nvkm_device *device = buffer->fault->subdev.device;
33
+	nvkm_mc_intr_mask(device, NVKM_SUBDEV_FAULT, enable);
34
+}
35
+
36
+void
27
37
 gp100_fault_buffer_fini(struct nvkm_fault_buffer *buffer)
28
38
 {
29
39
 	struct nvkm_device *device = buffer->fault->subdev.device;
30
40
 	nvkm_mask(device, 0x002a70, 0x00000001, 0x00000000);
31
41
 }
32
42
 
33
-static void
43
+void
34
44
 gp100_fault_buffer_init(struct nvkm_fault_buffer *buffer)
35
45
 {
36
46
 	struct nvkm_device *device = buffer->fault->subdev.device;
37
-	nvkm_wr32(device, 0x002a74, upper_32_bits(buffer->vma->addr));
38
-	nvkm_wr32(device, 0x002a70, lower_32_bits(buffer->vma->addr));
47
+	nvkm_wr32(device, 0x002a74, upper_32_bits(buffer->addr));
48
+	nvkm_wr32(device, 0x002a70, lower_32_bits(buffer->addr));
39
49
 	nvkm_mask(device, 0x002a70, 0x00000001, 0x00000001);
40
50
 }
41
51
 
42
-static u32
43
-gp100_fault_buffer_entries(struct nvkm_fault_buffer *buffer)
52
+u64 gp100_fault_buffer_pin(struct nvkm_fault_buffer *buffer)
44
53
 {
45
-	return nvkm_rd32(buffer->fault->subdev.device, 0x002a78);
54
+	return nvkm_memory_bar2(buffer->mem);
46
55
 }
47
56
 
48
-static void
57
+void
58
+gp100_fault_buffer_info(struct nvkm_fault_buffer *buffer)
59
+{
60
+	buffer->entries = nvkm_rd32(buffer->fault->subdev.device, 0x002a78);
61
+	buffer->get = 0x002a7c;
62
+	buffer->put = 0x002a80;
63
+}
64
+
65
+void
49
66
 gp100_fault_intr(struct nvkm_fault *fault)
50
67
 {
51
68
 	nvkm_event_send(&fault->event, 1, 0, NULL, 0);
..
..
@@ -56,9 +73,12 @@
56
73
 	.intr = gp100_fault_intr,
57
74
 	.buffer.nr = 1,
58
75
 	.buffer.entry_size = 32,
59
-	.buffer.entries = gp100_fault_buffer_entries,
76
+	.buffer.info = gp100_fault_buffer_info,
77
+	.buffer.pin = gp100_fault_buffer_pin,
60
78
 	.buffer.init = gp100_fault_buffer_init,
61
79
 	.buffer.fini = gp100_fault_buffer_fini,
80
+	.buffer.intr = gp100_fault_buffer_intr,
81
+	.user = { { 0, 0, MAXWELL_FAULT_BUFFER_A }, 0 },
62
82
 };
63
83
 
64
84
 int