leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau: remove PUSHBUF_CAL macro

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2010-02-12 09:05:42 +10:00
parent 9a391ad8a2
commit 2ccb04ecc7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/nouveau_gem.c
View File

@ -614,8 +614,6 @@ out:
return ret; return ret;
} }
#define PUSHBUF_CAL (dev_priv->card_type >= NV_20)
int int
nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data, nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data,
struct drm_file *file_priv) struct drm_file *file_priv)
@ -703,7 +701,7 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data,
/* If presumed return address doesn't match, we need to map the /* If presumed return address doesn't match, we need to map the
* push buffer and fix it.. * push buffer and fix it..
*/ */
if (!PUSHBUF_CAL) { if (dev_priv->card_type < NV_20) {
uint32_t retaddy; uint32_t retaddy;
if (chan->dma.free < 4 + NOUVEAU_DMA_SKIPS) { if (chan->dma.free < 4 + NOUVEAU_DMA_SKIPS) {
@ -741,7 +739,7 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data,
req->offset / 4, req->offset / 4,
pbvirt, is_iomem); pbvirt, is_iomem);
if (!PUSHBUF_CAL) { if (dev_priv->card_type < NV_20) {
nouveau_bo_wr32(pbbo, nouveau_bo_wr32(pbbo,
req->offset / 4 + req->nr_dwords - 2, req->offset / 4 + req->nr_dwords - 2,
req->suffix0); req->suffix0);
@ -763,7 +761,7 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data,
nv50_dma_push(chan, pbbo, req->offset, req->nr_dwords); nv50_dma_push(chan, pbbo, req->offset, req->nr_dwords);
} else } else
if (PUSHBUF_CAL) { if (dev_priv->card_type >= NV_20) {
ret = RING_SPACE(chan, 2); ret = RING_SPACE(chan, 2);
if (ret) { if (ret) {
NV_ERROR(dev, "cal_space: %d\n", ret); NV_ERROR(dev, "cal_space: %d\n", ret);
@ -805,7 +803,7 @@ out_next:
req->suffix0 = 0x00000000; req->suffix0 = 0x00000000;
req->suffix1 = 0x00000000; req->suffix1 = 0x00000000;
} else } else
if (PUSHBUF_CAL) { if (dev_priv->card_type >= NV_20) {
req->suffix0 = 0x00020000; req->suffix0 = 0x00020000;
req->suffix1 = 0x00000000; req->suffix1 = 0x00000000;
} else { } else {