diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_dma.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dma.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c index eb24e2b05193..82581e600dcd 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dma.c +++ b/drivers/gpu/drm/nouveau/nouveau_dma.c | |||
@@ -73,16 +73,6 @@ nouveau_dma_init(struct nouveau_channel *chan) | |||
73 | if (ret) | 73 | if (ret) |
74 | return ret; | 74 | return ret; |
75 | 75 | ||
76 | /* Create an NV_SW object for various sync purposes */ | ||
77 | ret = nouveau_gpuobj_sw_new(chan, NV_SW, &obj); | ||
78 | if (ret) | ||
79 | return ret; | ||
80 | |||
81 | ret = nouveau_ramht_insert(chan, NvSw, obj); | ||
82 | nouveau_gpuobj_ref(NULL, &obj); | ||
83 | if (ret) | ||
84 | return ret; | ||
85 | |||
86 | /* NV_MEMORY_TO_MEMORY_FORMAT requires a notifier object */ | 76 | /* NV_MEMORY_TO_MEMORY_FORMAT requires a notifier object */ |
87 | ret = nouveau_notifier_alloc(chan, NvNotify0, 32, &chan->m2mf_ntfy); | 77 | ret = nouveau_notifier_alloc(chan, NvNotify0, 32, &chan->m2mf_ntfy); |
88 | if (ret) | 78 | if (ret) |
@@ -110,13 +100,6 @@ nouveau_dma_init(struct nouveau_channel *chan) | |||
110 | BEGIN_RING(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 1); | 100 | BEGIN_RING(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 1); |
111 | OUT_RING(chan, NvNotify0); | 101 | OUT_RING(chan, NvNotify0); |
112 | 102 | ||
113 | /* Initialise NV_SW */ | ||
114 | ret = RING_SPACE(chan, 2); | ||
115 | if (ret) | ||
116 | return ret; | ||
117 | BEGIN_RING(chan, NvSubSw, 0, 1); | ||
118 | OUT_RING(chan, NvSw); | ||
119 | |||
120 | /* Sit back and pray the channel works.. */ | 103 | /* Sit back and pray the channel works.. */ |
121 | FIRE_RING(chan); | 104 | FIRE_RING(chan); |
122 | 105 | ||