hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8
kernel/drivers/gpu/drm/r128/r128_state.c
....@@ -28,8 +28,15 @@
2828 * Gareth Hughes <gareth@valinux.com>
2929 */
3030
31
-#include <drm/drmP.h>
31
+#include <linux/pci.h>
32
+#include <linux/slab.h>
33
+#include <linux/uaccess.h>
34
+
35
+#include <drm/drm_device.h>
36
+#include <drm/drm_file.h>
37
+#include <drm/drm_print.h>
3238 #include <drm/r128_drm.h>
39
+
3340 #include "r128_drv.h"
3441
3542 /* ================================================================
....@@ -824,7 +831,7 @@
824831
825832 if (buf->file_priv != file_priv) {
826833 DRM_ERROR("process %d using buffer owned by %p\n",
827
- DRM_CURRENTPID, buf->file_priv);
834
+ task_pid_nr(current), buf->file_priv);
828835 return -EINVAL;
829836 }
830837 if (buf->pending) {
....@@ -1317,7 +1324,7 @@
13171324 DEV_INIT_TEST_WITH_RETURN(dev_priv);
13181325
13191326 DRM_DEBUG("pid=%d index=%d count=%d discard=%d\n",
1320
- DRM_CURRENTPID, vertex->idx, vertex->count, vertex->discard);
1327
+ task_pid_nr(current), vertex->idx, vertex->count, vertex->discard);
13211328
13221329 if (vertex->idx < 0 || vertex->idx >= dma->buf_count) {
13231330 DRM_ERROR("buffer index %d (of %d max)\n",
....@@ -1338,7 +1345,7 @@
13381345
13391346 if (buf->file_priv != file_priv) {
13401347 DRM_ERROR("process %d using buffer owned by %p\n",
1341
- DRM_CURRENTPID, buf->file_priv);
1348
+ task_pid_nr(current), buf->file_priv);
13421349 return -EINVAL;
13431350 }
13441351 if (buf->pending) {
....@@ -1369,7 +1376,7 @@
13691376
13701377 DEV_INIT_TEST_WITH_RETURN(dev_priv);
13711378
1372
- DRM_DEBUG("pid=%d buf=%d s=%d e=%d d=%d\n", DRM_CURRENTPID,
1379
+ DRM_DEBUG("pid=%d buf=%d s=%d e=%d d=%d\n", task_pid_nr(current),
13731380 elts->idx, elts->start, elts->end, elts->discard);
13741381
13751382 if (elts->idx < 0 || elts->idx >= dma->buf_count) {
....@@ -1391,7 +1398,7 @@
13911398
13921399 if (buf->file_priv != file_priv) {
13931400 DRM_ERROR("process %d using buffer owned by %p\n",
1394
- DRM_CURRENTPID, buf->file_priv);
1401
+ task_pid_nr(current), buf->file_priv);
13951402 return -EINVAL;
13961403 }
13971404 if (buf->pending) {
....@@ -1432,7 +1439,7 @@
14321439
14331440 DEV_INIT_TEST_WITH_RETURN(dev_priv);
14341441
1435
- DRM_DEBUG("pid=%d index=%d\n", DRM_CURRENTPID, blit->idx);
1442
+ DRM_DEBUG("pid=%d index=%d\n", task_pid_nr(current), blit->idx);
14361443
14371444 if (blit->idx < 0 || blit->idx >= dma->buf_count) {
14381445 DRM_ERROR("buffer index %d (of %d max)\n",
....@@ -1532,7 +1539,7 @@
15321539
15331540 if (buf->file_priv != file_priv) {
15341541 DRM_ERROR("process %d using buffer owned by %p\n",
1535
- DRM_CURRENTPID, buf->file_priv);
1542
+ task_pid_nr(current), buf->file_priv);
15361543 return -EINVAL;
15371544 }
15381545 if (buf->pending) {
....@@ -1579,7 +1586,7 @@
15791586
15801587 DEV_INIT_TEST_WITH_RETURN(dev_priv);
15811588
1582
- DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
1589
+ DRM_DEBUG("pid=%d\n", task_pid_nr(current));
15831590
15841591 switch (param->param) {
15851592 case R128_PARAM_IRQ_NR: