diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2018-12-11 14:50:02 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2018-12-11 15:37:48 +1000 |
| commit | fb80ad15f86f9e7eb510930b1e02dfa86adffa8f (patch) | |
| tree | be5bcf9a56f7ddad014805585b0ba9090888a07b /drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | |
| parent | efa44c664f6aef0a2b94cffd197c501b0965db97 (diff) | |
drm/nouveau/fifo/gk104-: group pbdma functions together
We're about to be adding more of them.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c index 5480f12dede2..1a6bafbc53ca 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c @@ -249,6 +249,10 @@ gk104_fifo_runlist = { .commit = gk104_fifo_runlist_commit, }; +const struct gk104_fifo_pbdma_func +gk104_fifo_pbdma = { +}; + static void gk104_fifo_recover_work(struct work_struct *w) { @@ -1004,8 +1008,8 @@ gk104_fifo_init(struct nvkm_fifo *base) nvkm_wr32(device, 0x002254, 0x10000000 | fifo->user.bar->addr >> 12); - if (fifo->func->init_pbdma_timeout) - fifo->func->init_pbdma_timeout(fifo); + if (fifo->func->pbdma->init_timeout) + fifo->func->pbdma->init_timeout(fifo); nvkm_wr32(device, 0x002100, 0xffffffff); nvkm_wr32(device, 0x002140, 0x7fffffff); @@ -1184,6 +1188,7 @@ gk104_fifo_fault_gpcclient[] = { static const struct gk104_fifo_func gk104_fifo = { + .pbdma = &gk104_fifo_pbdma, .fault.access = gk104_fifo_fault_access, .fault.engine = gk104_fifo_fault_engine, .fault.reason = gk104_fifo_fault_reason, |