hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/gpu/drm/radeon/radeon_gart.c
....@@ -25,7 +25,10 @@
2525 * Alex Deucher
2626 * Jerome Glisse
2727 */
28
-#include <drm/drmP.h>
28
+
29
+#include <linux/pci.h>
30
+#include <linux/vmalloc.h>
31
+
2932 #include <drm/radeon_drm.h>
3033 #ifdef CONFIG_X86
3134 #include <asm/set_memory.h>
....@@ -69,8 +72,8 @@
6972 {
7073 void *ptr;
7174
72
- ptr = pci_alloc_consistent(rdev->pdev, rdev->gart.table_size,
73
- &rdev->gart.table_addr);
75
+ ptr = dma_alloc_coherent(&rdev->pdev->dev, rdev->gart.table_size,
76
+ &rdev->gart.table_addr, GFP_KERNEL);
7477 if (ptr == NULL) {
7578 return -ENOMEM;
7679 }
....@@ -82,7 +85,6 @@
8285 }
8386 #endif
8487 rdev->gart.ptr = ptr;
85
- memset((void *)rdev->gart.ptr, 0, rdev->gart.table_size);
8688 return 0;
8789 }
8890
....@@ -107,9 +109,8 @@
107109 rdev->gart.table_size >> PAGE_SHIFT);
108110 }
109111 #endif
110
- pci_free_consistent(rdev->pdev, rdev->gart.table_size,
111
- (void *)rdev->gart.ptr,
112
- rdev->gart.table_addr);
112
+ dma_free_coherent(&rdev->pdev->dev, rdev->gart.table_size,
113
+ (void *)rdev->gart.ptr, rdev->gart.table_addr);
113114 rdev->gart.ptr = NULL;
114115 rdev->gart.table_addr = 0;
115116 }