diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv10_fifo.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv10_fifo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv10_fifo.c b/drivers/gpu/drm/nouveau/nv10_fifo.c index 7a4069cf5d0b..ccb07fb701ca 100644 --- a/drivers/gpu/drm/nouveau/nv10_fifo.c +++ b/drivers/gpu/drm/nouveau/nv10_fifo.c | |||
@@ -48,7 +48,7 @@ nv10_fifo_create_context(struct nouveau_channel *chan) | |||
48 | 48 | ||
49 | ret = nouveau_gpuobj_new_fake(dev, NV10_RAMFC(chan->id), ~0, | 49 | ret = nouveau_gpuobj_new_fake(dev, NV10_RAMFC(chan->id), ~0, |
50 | NV10_RAMFC__SIZE, NVOBJ_FLAG_ZERO_ALLOC | | 50 | NV10_RAMFC__SIZE, NVOBJ_FLAG_ZERO_ALLOC | |
51 | NVOBJ_FLAG_ZERO_FREE, NULL, &chan->ramfc); | 51 | NVOBJ_FLAG_ZERO_FREE, &chan->ramfc); |
52 | if (ret) | 52 | if (ret) |
53 | return ret; | 53 | return ret; |
54 | 54 | ||
@@ -57,7 +57,7 @@ nv10_fifo_create_context(struct nouveau_channel *chan) | |||
57 | */ | 57 | */ |
58 | nv_wi32(dev, fc + 0, chan->pushbuf_base); | 58 | nv_wi32(dev, fc + 0, chan->pushbuf_base); |
59 | nv_wi32(dev, fc + 4, chan->pushbuf_base); | 59 | nv_wi32(dev, fc + 4, chan->pushbuf_base); |
60 | nv_wi32(dev, fc + 12, chan->pushbuf->instance >> 4); | 60 | nv_wi32(dev, fc + 12, chan->pushbuf->pinst >> 4); |
61 | nv_wi32(dev, fc + 20, NV_PFIFO_CACHE1_DMA_FETCH_TRIG_128_BYTES | | 61 | nv_wi32(dev, fc + 20, NV_PFIFO_CACHE1_DMA_FETCH_TRIG_128_BYTES | |
62 | NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES | | 62 | NV_PFIFO_CACHE1_DMA_FETCH_SIZE_128_BYTES | |
63 | NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_8 | | 63 | NV_PFIFO_CACHE1_DMA_FETCH_MAX_REQS_8 | |
@@ -80,7 +80,7 @@ nv10_fifo_destroy_context(struct nouveau_channel *chan) | |||
80 | nv_wr32(dev, NV04_PFIFO_MODE, | 80 | nv_wr32(dev, NV04_PFIFO_MODE, |
81 | nv_rd32(dev, NV04_PFIFO_MODE) & ~(1 << chan->id)); | 81 | nv_rd32(dev, NV04_PFIFO_MODE) & ~(1 << chan->id)); |
82 | 82 | ||
83 | nouveau_gpuobj_ref_del(dev, &chan->ramfc); | 83 | nouveau_gpuobj_ref(NULL, &chan->ramfc); |
84 | } | 84 | } |
85 | 85 | ||
86 | static void | 86 | static void |