Commit 7b05a7c0 authored by Danilo Krummrich's avatar Danilo Krummrich
Browse files

drm/nouveau: get vmm via nouveau_cli_vmm() 



Provide a getter function for the client's current vmm context. Since
we'll add a new (u)vmm context for UMD bindings in subsequent commits,
this will keep the code clean.

Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230804182406.5222-5-dakr@redhat.com
parent e0223899

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 domain, 
	struct nouveau_drm *drm = cli->drm;

	struct nouveau_bo *nvbo;

	struct nvif_mmu *mmu = &cli->mmu;

	struct nvif_vmm *vmm = cli->svm.cli ? &cli->svm.vmm : &cli->vmm.vmm;

	struct nvif_vmm *vmm = &nouveau_cli_vmm(cli)->vmm;

	int i, pi = -1;



	if (!*size) {

drivers/gpu/drm/nouveau/nouveau_chan.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device, 


	chan->device = device;

	chan->drm = drm;

	chan->vmm = cli->svm.cli ? &cli->svm : &cli->vmm;

	chan->vmm = nouveau_cli_vmm(cli);

	atomic_set(&chan->killed, 0);



	/* allocate memory for dma push buffer */

drivers/gpu/drm/nouveau/nouveau_drv.h

+9 −0
Original line number Diff line number Diff line
@@ -112,6 +112,15 @@ struct nouveau_cli_work { 
	struct dma_fence_cb cb;

};



static inline struct nouveau_vmm *

nouveau_cli_vmm(struct nouveau_cli *cli)

{

	if (cli->svm.cli)

		return &cli->svm;



	return &cli->vmm;

}



void nouveau_cli_work_queue(struct nouveau_cli *, struct dma_fence *,

			    struct nouveau_cli_work *);

drivers/gpu/drm/nouveau/nouveau_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv) 
	struct nouveau_bo *nvbo = nouveau_gem_object(gem);

	struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev);

	struct device *dev = drm->dev->dev;

	struct nouveau_vmm *vmm = cli->svm.cli ? &cli->svm : &cli->vmm;

	struct nouveau_vmm *vmm = nouveau_cli_vmm(cli);

	struct nouveau_vma *vma;

	int ret;
@@ -180,7 +180,7 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv) 
	struct nouveau_bo *nvbo = nouveau_gem_object(gem);

	struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev);

	struct device *dev = drm->dev->dev;

	struct nouveau_vmm *vmm = cli->svm.cli ? &cli->svm : & cli->vmm;

	struct nouveau_vmm *vmm = nouveau_cli_vmm(cli);

	struct nouveau_vma *vma;

	int ret;
@@ -269,7 +269,7 @@ nouveau_gem_info(struct drm_file *file_priv, struct drm_gem_object *gem, 
{

	struct nouveau_cli *cli = nouveau_cli(file_priv);

	struct nouveau_bo *nvbo = nouveau_gem_object(gem);

	struct nouveau_vmm *vmm = cli->svm.cli ? &cli->svm : &cli->vmm;

	struct nouveau_vmm *vmm = nouveau_cli_vmm(cli);

	struct nouveau_vma *vma;



	if (is_power_of_2(nvbo->valid_domains))