mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
drm/nouveau: remove PUSHBUF_CAL macro
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
9a391ad8a2
commit
2ccb04ecc7
1 changed files with 4 additions and 6 deletions
|
@ -614,8 +614,6 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
|
|||
return ret;
|
||||
}
|
||||
|
||||
#define PUSHBUF_CAL (dev_priv->card_type >= NV_20)
|
||||
|
||||
int
|
||||
nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data,
|
||||
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
|
||||
* push buffer and fix it..
|
||||
*/
|
||||
if (!PUSHBUF_CAL) {
|
||||
if (dev_priv->card_type < NV_20) {
|
||||
uint32_t retaddy;
|
||||
|
||||
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,
|
||||
pbvirt, is_iomem);
|
||||
|
||||
if (!PUSHBUF_CAL) {
|
||||
if (dev_priv->card_type < NV_20) {
|
||||
nouveau_bo_wr32(pbbo,
|
||||
req->offset / 4 + req->nr_dwords - 2,
|
||||
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);
|
||||
} else
|
||||
if (PUSHBUF_CAL) {
|
||||
if (dev_priv->card_type >= NV_20) {
|
||||
ret = RING_SPACE(chan, 2);
|
||||
if (ret) {
|
||||
NV_ERROR(dev, "cal_space: %d\n", ret);
|
||||
|
@ -805,7 +803,7 @@ nouveau_gem_ioctl_pushbuf_call(struct drm_device *dev, void *data,
|
|||
req->suffix0 = 0x00000000;
|
||||
req->suffix1 = 0x00000000;
|
||||
} else
|
||||
if (PUSHBUF_CAL) {
|
||||
if (dev_priv->card_type >= NV_20) {
|
||||
req->suffix0 = 0x00020000;
|
||||
req->suffix1 = 0x00000000;
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue