5f03a507b2
Recent patches to the DRM scheduler [1][2] allow for a variable number of run-queues and add support for (shared) workqueues rather than dedicated kthreads per scheduler. This allows us to create a 1:1 relationship between a GPU scheduler and a scheduler entity, in order to properly support firmware schedulers being able to handle an arbitrary amount of dynamically allocated command ring buffers. This perfectly matches Nouveau's needs, hence make use of it. Topology wise we create one scheduler instance per client (handling VM_BIND jobs) and one scheduler instance per channel (handling EXEC jobs). All channel scheduler instances share a workqueue, but every client scheduler instance has a dedicated workqueue. The latter is required to ensure that for VM_BIND job's free_job() work and run_job() work can always run concurrently and hence, free_job() work can never stall run_job() work. For EXEC jobs we don't have this requirement, since EXEC job's free_job() does not require to take any locks which indirectly or directly are held for allocations elsewhere. [1] https://lore.kernel.org/all/8f53f7ef-7621-4f0b-bdef-d8d20bc497ff@redhat.com/T/ [2] https://lore.kernel.org/all/20231031032439.1558703-1-matthew.brost@intel.com/T/ Signed-off-by: Danilo Krummrich <dakr@redhat.com> Reviewed-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231114002728.3491-1-dakr@redhat.com
99 lines
1.9 KiB
C
99 lines
1.9 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
|
|
#ifndef __NOUVEAU_UVMM_H__
|
|
#define __NOUVEAU_UVMM_H__
|
|
|
|
#include <drm/drm_gpuvm.h>
|
|
|
|
#include "nouveau_drv.h"
|
|
|
|
struct nouveau_uvmm {
|
|
struct drm_gpuvm base;
|
|
struct nouveau_vmm vmm;
|
|
struct maple_tree region_mt;
|
|
struct mutex mutex;
|
|
};
|
|
|
|
struct nouveau_uvma_region {
|
|
struct nouveau_uvmm *uvmm;
|
|
|
|
struct {
|
|
u64 addr;
|
|
u64 range;
|
|
} va;
|
|
|
|
struct kref kref;
|
|
|
|
struct completion complete;
|
|
bool dirty;
|
|
};
|
|
|
|
struct nouveau_uvma {
|
|
struct drm_gpuva va;
|
|
|
|
struct nouveau_uvma_region *region;
|
|
u8 kind;
|
|
};
|
|
|
|
#define uvmm_from_gpuvm(x) container_of((x), struct nouveau_uvmm, base)
|
|
#define uvma_from_va(x) container_of((x), struct nouveau_uvma, va)
|
|
|
|
#define to_uvmm(x) uvmm_from_gpuvm((x)->va.vm)
|
|
|
|
struct nouveau_uvmm_bind_job {
|
|
struct nouveau_job base;
|
|
|
|
struct kref kref;
|
|
struct completion complete;
|
|
|
|
/* struct bind_job_op */
|
|
struct list_head ops;
|
|
};
|
|
|
|
struct nouveau_uvmm_bind_job_args {
|
|
struct drm_file *file_priv;
|
|
struct nouveau_sched *sched;
|
|
|
|
unsigned int flags;
|
|
|
|
struct {
|
|
struct drm_nouveau_sync *s;
|
|
u32 count;
|
|
} in_sync;
|
|
|
|
struct {
|
|
struct drm_nouveau_sync *s;
|
|
u32 count;
|
|
} out_sync;
|
|
|
|
struct {
|
|
struct drm_nouveau_vm_bind_op *s;
|
|
u32 count;
|
|
} op;
|
|
};
|
|
|
|
#define to_uvmm_bind_job(job) container_of((job), struct nouveau_uvmm_bind_job, base)
|
|
|
|
void nouveau_uvmm_fini(struct nouveau_uvmm *uvmm);
|
|
|
|
void nouveau_uvmm_bo_map_all(struct nouveau_bo *nvbov, struct nouveau_mem *mem);
|
|
void nouveau_uvmm_bo_unmap_all(struct nouveau_bo *nvbo);
|
|
|
|
int nouveau_uvmm_ioctl_vm_init(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
|
|
int nouveau_uvmm_ioctl_vm_bind(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv);
|
|
|
|
static inline void nouveau_uvmm_lock(struct nouveau_uvmm *uvmm)
|
|
{
|
|
mutex_lock(&uvmm->mutex);
|
|
}
|
|
|
|
static inline void nouveau_uvmm_unlock(struct nouveau_uvmm *uvmm)
|
|
{
|
|
mutex_unlock(&uvmm->mutex);
|
|
}
|
|
|
|
#endif
|