mirror of
https://github.com/torvalds/linux.git
synced 2026-04-30 12:32:31 -04:00
drm/nouveau/gsp: remove gsp-specific chid allocation path
In order to specify a channel ID to RM during channel allocation, the channel ID is broken down into a "userd page" index and an index into that page. It was assumed that RM would enforce that the same physical block of memory be used for all CHIDs within a "userd page", and the GSP paths override NVKM's normal CHID allocation to handle this. However, none of that turns out to be necessary. Remove the GSP-specific code and use the regular CHID allocation path. Signed-off-by: Ben Skeggs <bskeggs@nvidia.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
@@ -349,8 +349,6 @@ nvkm_fifo_dtor(struct nvkm_engine *engine)
|
||||
nvkm_chid_unref(&fifo->cgid);
|
||||
nvkm_chid_unref(&fifo->chid);
|
||||
|
||||
mutex_destroy(&fifo->userd.mutex);
|
||||
|
||||
nvkm_event_fini(&fifo->nonstall.event);
|
||||
mutex_destroy(&fifo->mutex);
|
||||
|
||||
@@ -391,8 +389,5 @@ nvkm_fifo_new_(const struct nvkm_fifo_func *func, struct nvkm_device *device,
|
||||
spin_lock_init(&fifo->lock);
|
||||
mutex_init(&fifo->mutex);
|
||||
|
||||
INIT_LIST_HEAD(&fifo->userd.list);
|
||||
mutex_init(&fifo->userd.mutex);
|
||||
|
||||
return nvkm_engine_ctor(&nvkm_fifo, device, type, inst, true, &fifo->engine);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user