disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/gpu/drm/mga/mga_dma.c
..
..
@@ -35,8 +35,8 @@
35
35
  * \author Gareth Hughes <gareth@valinux.com>
36
36
  */
37
37
 
38
-#include <drm/drmP.h>
39
-#include <drm/mga_drm.h>
38
+#include <linux/delay.h>
39
+
40
40
 #include "mga_drv.h"
41
41
 
42
42
 #define MGA_DEFAULT_USEC_TIMEOUT	10000
..
..
@@ -62,7 +62,7 @@
62
62
 			MGA_WRITE8(MGA_CRTC_INDEX, 0);
63
63
 			return 0;
64
64
 		}
65
-		DRM_UDELAY(1);
65
+		udelay(1);
66
66
 	}
67
67
 
68
68
 #if MGA_DMA_DEBUG
..
..
@@ -114,7 +114,7 @@
114
114
 		status = MGA_READ(MGA_STATUS) & MGA_ENGINE_IDLE_MASK;
115
115
 		if (status == MGA_ENDPRDMASTS)
116
116
 			break;
117
-		DRM_UDELAY(1);
117
+		udelay(1);
118
118
 	}
119
119
 
120
120
 	if (primary->tail == primary->last_flush) {
..
..
@@ -1120,7 +1120,7 @@
1120
1120
 	 */
1121
1121
 	if (d->send_count != 0) {
1122
1122
 		DRM_ERROR("Process %d trying to send %d buffers via drmDMA\n",
1123
-			  DRM_CURRENTPID, d->send_count);
1123
+			  task_pid_nr(current), d->send_count);
1124
1124
 		return -EINVAL;
1125
1125
 	}
1126
1126
 
..
..
@@ -1128,7 +1128,8 @@
1128
1128
 	 */
1129
1129
 	if (d->request_count < 0 || d->request_count > dma->buf_count) {
1130
1130
 		DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
1131
-			  DRM_CURRENTPID, d->request_count, dma->buf_count);
1131
+			  task_pid_nr(current), d->request_count,
1132
+			  dma->buf_count);
1132
1133
 		return -EINVAL;
1133
1134
 	}
1134
1135