| .. | .. |
|---|
| 28 | 28 | * Gareth Hughes <gareth@valinux.com> |
|---|
| 29 | 29 | */ |
|---|
| 30 | 30 | |
|---|
| 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> |
|---|
| 32 | 38 | #include <drm/r128_drm.h> |
|---|
| 39 | + |
|---|
| 33 | 40 | #include "r128_drv.h" |
|---|
| 34 | 41 | |
|---|
| 35 | 42 | /* ================================================================ |
|---|
| .. | .. |
|---|
| 824 | 831 | |
|---|
| 825 | 832 | if (buf->file_priv != file_priv) { |
|---|
| 826 | 833 | DRM_ERROR("process %d using buffer owned by %p\n", |
|---|
| 827 | | - DRM_CURRENTPID, buf->file_priv); |
|---|
| 834 | + task_pid_nr(current), buf->file_priv); |
|---|
| 828 | 835 | return -EINVAL; |
|---|
| 829 | 836 | } |
|---|
| 830 | 837 | if (buf->pending) { |
|---|
| .. | .. |
|---|
| 1317 | 1324 | DEV_INIT_TEST_WITH_RETURN(dev_priv); |
|---|
| 1318 | 1325 | |
|---|
| 1319 | 1326 | 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); |
|---|
| 1321 | 1328 | |
|---|
| 1322 | 1329 | if (vertex->idx < 0 || vertex->idx >= dma->buf_count) { |
|---|
| 1323 | 1330 | DRM_ERROR("buffer index %d (of %d max)\n", |
|---|
| .. | .. |
|---|
| 1338 | 1345 | |
|---|
| 1339 | 1346 | if (buf->file_priv != file_priv) { |
|---|
| 1340 | 1347 | DRM_ERROR("process %d using buffer owned by %p\n", |
|---|
| 1341 | | - DRM_CURRENTPID, buf->file_priv); |
|---|
| 1348 | + task_pid_nr(current), buf->file_priv); |
|---|
| 1342 | 1349 | return -EINVAL; |
|---|
| 1343 | 1350 | } |
|---|
| 1344 | 1351 | if (buf->pending) { |
|---|
| .. | .. |
|---|
| 1369 | 1376 | |
|---|
| 1370 | 1377 | DEV_INIT_TEST_WITH_RETURN(dev_priv); |
|---|
| 1371 | 1378 | |
|---|
| 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), |
|---|
| 1373 | 1380 | elts->idx, elts->start, elts->end, elts->discard); |
|---|
| 1374 | 1381 | |
|---|
| 1375 | 1382 | if (elts->idx < 0 || elts->idx >= dma->buf_count) { |
|---|
| .. | .. |
|---|
| 1391 | 1398 | |
|---|
| 1392 | 1399 | if (buf->file_priv != file_priv) { |
|---|
| 1393 | 1400 | DRM_ERROR("process %d using buffer owned by %p\n", |
|---|
| 1394 | | - DRM_CURRENTPID, buf->file_priv); |
|---|
| 1401 | + task_pid_nr(current), buf->file_priv); |
|---|
| 1395 | 1402 | return -EINVAL; |
|---|
| 1396 | 1403 | } |
|---|
| 1397 | 1404 | if (buf->pending) { |
|---|
| .. | .. |
|---|
| 1432 | 1439 | |
|---|
| 1433 | 1440 | DEV_INIT_TEST_WITH_RETURN(dev_priv); |
|---|
| 1434 | 1441 | |
|---|
| 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); |
|---|
| 1436 | 1443 | |
|---|
| 1437 | 1444 | if (blit->idx < 0 || blit->idx >= dma->buf_count) { |
|---|
| 1438 | 1445 | DRM_ERROR("buffer index %d (of %d max)\n", |
|---|
| .. | .. |
|---|
| 1532 | 1539 | |
|---|
| 1533 | 1540 | if (buf->file_priv != file_priv) { |
|---|
| 1534 | 1541 | DRM_ERROR("process %d using buffer owned by %p\n", |
|---|
| 1535 | | - DRM_CURRENTPID, buf->file_priv); |
|---|
| 1542 | + task_pid_nr(current), buf->file_priv); |
|---|
| 1536 | 1543 | return -EINVAL; |
|---|
| 1537 | 1544 | } |
|---|
| 1538 | 1545 | if (buf->pending) { |
|---|
| .. | .. |
|---|
| 1579 | 1586 | |
|---|
| 1580 | 1587 | DEV_INIT_TEST_WITH_RETURN(dev_priv); |
|---|
| 1581 | 1588 | |
|---|
| 1582 | | - DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); |
|---|
| 1589 | + DRM_DEBUG("pid=%d\n", task_pid_nr(current)); |
|---|
| 1583 | 1590 | |
|---|
| 1584 | 1591 | switch (param->param) { |
|---|
| 1585 | 1592 | case R128_PARAM_IRQ_NR: |
|---|