mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
drm/r128: drop drm_os_linux dependencies
Drop use of drm_os_linux macros. Simple 1:1 replacements of - DRM_UDELAY - DRM_CURRENTPID - DRM_READ - DRM_WRITE With this change we do not need to introduce the deprecated drm_os_linux.h header when we drop use of drmP.h. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Daniel Vetter <daniel@ffwll.ch> Cc: David Airlie <airlied@linux.ie> Link: https://patchwork.freedesktop.org/patch/msgid/20190605141321.17819-2-sam@ravnborg.org
This commit is contained in:
parent
ac0ac21020
commit
3c1aa3b387
3 changed files with 21 additions and 21 deletions
|
@ -85,7 +85,7 @@ static int r128_do_pixcache_flush(drm_r128_private_t *dev_priv)
|
|||
for (i = 0; i < dev_priv->usec_timeout; i++) {
|
||||
if (!(R128_READ(R128_PC_NGUI_CTLSTAT) & R128_PC_BUSY))
|
||||
return 0;
|
||||
DRM_UDELAY(1);
|
||||
udelay(1);
|
||||
}
|
||||
|
||||
#if R128_FIFO_DEBUG
|
||||
|
@ -102,7 +102,7 @@ static int r128_do_wait_for_fifo(drm_r128_private_t *dev_priv, int entries)
|
|||
int slots = R128_READ(R128_GUI_STAT) & R128_GUI_FIFOCNT_MASK;
|
||||
if (slots >= entries)
|
||||
return 0;
|
||||
DRM_UDELAY(1);
|
||||
udelay(1);
|
||||
}
|
||||
|
||||
#if R128_FIFO_DEBUG
|
||||
|
@ -124,7 +124,7 @@ static int r128_do_wait_for_idle(drm_r128_private_t *dev_priv)
|
|||
r128_do_pixcache_flush(dev_priv);
|
||||
return 0;
|
||||
}
|
||||
DRM_UDELAY(1);
|
||||
udelay(1);
|
||||
}
|
||||
|
||||
#if R128_FIFO_DEBUG
|
||||
|
@ -211,7 +211,7 @@ int r128_do_cce_idle(drm_r128_private_t *dev_priv)
|
|||
return r128_do_pixcache_flush(dev_priv);
|
||||
}
|
||||
}
|
||||
DRM_UDELAY(1);
|
||||
udelay(1);
|
||||
}
|
||||
|
||||
#if R128_FIFO_DEBUG
|
||||
|
@ -838,7 +838,7 @@ static struct drm_buf *r128_freelist_get(struct drm_device * dev)
|
|||
return buf;
|
||||
}
|
||||
}
|
||||
DRM_UDELAY(1);
|
||||
udelay(1);
|
||||
}
|
||||
|
||||
DRM_DEBUG("returning NULL!\n");
|
||||
|
@ -870,7 +870,7 @@ int r128_wait_ring(drm_r128_private_t *dev_priv, int n)
|
|||
r128_update_ring_snapshot(dev_priv);
|
||||
if (ring->space >= n)
|
||||
return 0;
|
||||
DRM_UDELAY(1);
|
||||
udelay(1);
|
||||
}
|
||||
|
||||
/* FIXME: This is being ignored... */
|
||||
|
@ -916,7 +916,7 @@ int r128_cce_buffers(struct drm_device *dev, void *data, struct drm_file *file_p
|
|||
*/
|
||||
if (d->send_count != 0) {
|
||||
DRM_ERROR("Process %d trying to send %d buffers via drmDMA\n",
|
||||
DRM_CURRENTPID, d->send_count);
|
||||
task_pid_nr(current), d->send_count);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -924,7 +924,7 @@ int r128_cce_buffers(struct drm_device *dev, void *data, struct drm_file *file_p
|
|||
*/
|
||||
if (d->request_count < 0 || d->request_count > dma->buf_count) {
|
||||
DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
|
||||
DRM_CURRENTPID, d->request_count, dma->buf_count);
|
||||
task_pid_nr(current), d->request_count, dma->buf_count);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
|
@ -397,10 +397,10 @@ extern long r128_compat_ioctl(struct file *filp, unsigned int cmd,
|
|||
|
||||
#define R128_PCIGART_TABLE_SIZE 32768
|
||||
|
||||
#define R128_READ(reg) DRM_READ32(dev_priv->mmio, (reg))
|
||||
#define R128_WRITE(reg, val) DRM_WRITE32(dev_priv->mmio, (reg), (val))
|
||||
#define R128_READ8(reg) DRM_READ8(dev_priv->mmio, (reg))
|
||||
#define R128_WRITE8(reg, val) DRM_WRITE8(dev_priv->mmio, (reg), (val))
|
||||
#define R128_READ(reg) readl(((void __iomem *)dev_priv->mmio->handle) + (reg))
|
||||
#define R128_WRITE(reg, val) writel(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))
|
||||
#define R128_READ8(reg) readb(((void __iomem *)dev_priv->mmio->handle) + (reg))
|
||||
#define R128_WRITE8(reg, val) writeb(val, ((void __iomem *)dev_priv->mmio->handle) + (reg))
|
||||
|
||||
#define R128_WRITE_PLL(addr, val) \
|
||||
do { \
|
||||
|
@ -445,7 +445,7 @@ do { \
|
|||
r128_update_ring_snapshot(dev_priv); \
|
||||
if (ring->space >= ring->high_mark) \
|
||||
goto __ring_space_done; \
|
||||
DRM_UDELAY(1); \
|
||||
udelay(1); \
|
||||
} \
|
||||
DRM_ERROR("ring space check failed!\n"); \
|
||||
return -EBUSY; \
|
||||
|
|
|
@ -824,7 +824,7 @@ static int r128_cce_dispatch_blit(struct drm_device *dev,
|
|||
|
||||
if (buf->file_priv != file_priv) {
|
||||
DRM_ERROR("process %d using buffer owned by %p\n",
|
||||
DRM_CURRENTPID, buf->file_priv);
|
||||
task_pid_nr(current), buf->file_priv);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (buf->pending) {
|
||||
|
@ -1317,7 +1317,7 @@ static int r128_cce_vertex(struct drm_device *dev, void *data, struct drm_file *
|
|||
DEV_INIT_TEST_WITH_RETURN(dev_priv);
|
||||
|
||||
DRM_DEBUG("pid=%d index=%d count=%d discard=%d\n",
|
||||
DRM_CURRENTPID, vertex->idx, vertex->count, vertex->discard);
|
||||
task_pid_nr(current), vertex->idx, vertex->count, vertex->discard);
|
||||
|
||||
if (vertex->idx < 0 || vertex->idx >= dma->buf_count) {
|
||||
DRM_ERROR("buffer index %d (of %d max)\n",
|
||||
|
@ -1338,7 +1338,7 @@ static int r128_cce_vertex(struct drm_device *dev, void *data, struct drm_file *
|
|||
|
||||
if (buf->file_priv != file_priv) {
|
||||
DRM_ERROR("process %d using buffer owned by %p\n",
|
||||
DRM_CURRENTPID, buf->file_priv);
|
||||
task_pid_nr(current), buf->file_priv);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (buf->pending) {
|
||||
|
@ -1369,7 +1369,7 @@ static int r128_cce_indices(struct drm_device *dev, void *data, struct drm_file
|
|||
|
||||
DEV_INIT_TEST_WITH_RETURN(dev_priv);
|
||||
|
||||
DRM_DEBUG("pid=%d buf=%d s=%d e=%d d=%d\n", DRM_CURRENTPID,
|
||||
DRM_DEBUG("pid=%d buf=%d s=%d e=%d d=%d\n", task_pid_nr(current),
|
||||
elts->idx, elts->start, elts->end, elts->discard);
|
||||
|
||||
if (elts->idx < 0 || elts->idx >= dma->buf_count) {
|
||||
|
@ -1391,7 +1391,7 @@ static int r128_cce_indices(struct drm_device *dev, void *data, struct drm_file
|
|||
|
||||
if (buf->file_priv != file_priv) {
|
||||
DRM_ERROR("process %d using buffer owned by %p\n",
|
||||
DRM_CURRENTPID, buf->file_priv);
|
||||
task_pid_nr(current), buf->file_priv);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (buf->pending) {
|
||||
|
@ -1432,7 +1432,7 @@ static int r128_cce_blit(struct drm_device *dev, void *data, struct drm_file *fi
|
|||
|
||||
DEV_INIT_TEST_WITH_RETURN(dev_priv);
|
||||
|
||||
DRM_DEBUG("pid=%d index=%d\n", DRM_CURRENTPID, blit->idx);
|
||||
DRM_DEBUG("pid=%d index=%d\n", task_pid_nr(current), blit->idx);
|
||||
|
||||
if (blit->idx < 0 || blit->idx >= dma->buf_count) {
|
||||
DRM_ERROR("buffer index %d (of %d max)\n",
|
||||
|
@ -1532,7 +1532,7 @@ static int r128_cce_indirect(struct drm_device *dev, void *data, struct drm_file
|
|||
|
||||
if (buf->file_priv != file_priv) {
|
||||
DRM_ERROR("process %d using buffer owned by %p\n",
|
||||
DRM_CURRENTPID, buf->file_priv);
|
||||
task_pid_nr(current), buf->file_priv);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (buf->pending) {
|
||||
|
@ -1579,7 +1579,7 @@ int r128_getparam(struct drm_device *dev, void *data, struct drm_file *file_priv
|
|||
|
||||
DEV_INIT_TEST_WITH_RETURN(dev_priv);
|
||||
|
||||
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
|
||||
DRM_DEBUG("pid=%d\n", task_pid_nr(current));
|
||||
|
||||
switch (param->param) {
|
||||
case R128_PARAM_IRQ_NR:
|
||||
|
|
Loading…
Reference in a new issue