drm/nouveau: remove chan->drm

The nouveau_cli that owns the channel is now stored in nouveau_chan, and
it has a pointer to the drm device already.

Signed-off-by: Ben Skeggs <bskeggs@nvidia.com>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-34-bskeggs@nvidia.com

diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 2ac5b6b904dbc369c4fa451b2466007571e24497..33ff21d40cfb4268fc356a609bb0bc4170729c2b 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -1057,7 +1057,7 @@ nv04_finish_page_flip(struct nouveau_channel *chan,
                      struct nv04_page_flip_state *ps)
 {
        struct nouveau_fence_chan *fctx = chan->fence;
-       struct nouveau_drm *drm = chan->drm;
+       struct nouveau_drm *drm = chan->cli->drm;
        struct drm_device *dev = drm->dev;
        struct nv04_page_flip_state *s;
        unsigned long flags;
@@ -1113,7 +1113,7 @@ nv04_page_flip_emit(struct nouveau_channel *chan,
                    struct nouveau_fence **pfence)
 {
        struct nouveau_fence_chan *fctx = chan->fence;
-       struct nouveau_drm *drm = chan->drm;
+       struct nouveau_drm *drm = chan->cli->drm;
        struct drm_device *dev = drm->dev;
        struct nvif_push *push = chan->chan.push;
        unsigned long flags;

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo0039.c b/drivers/gpu/drm/nouveau/nouveau_bo0039.c
index e2ce44adaa5c4d58dfa2b8e0e884fa24b675b561..2babc6c47241b4fb55751ea9c93d6716f3bc105e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo0039.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo0039.c
@@ -104,6 +104,6 @@ nv04_bo_move_init(struct nouveau_channel *chan, u32 handle)
                return ret;
 
        PUSH_MTHD(push, NV039, SET_OBJECT, handle);
-       PUSH_MTHD(push, NV039, SET_CONTEXT_DMA_NOTIFIES, chan->drm->ntfy.handle);
+       PUSH_MTHD(push, NV039, SET_CONTEXT_DMA_NOTIFIES, chan->cli->drm->ntfy.handle);
        return 0;
 }

diff --git a/drivers/gpu/drm/nouveau/nouveau_bo5039.c b/drivers/gpu/drm/nouveau/nouveau_bo5039.c
index c6cf3629a9f93736148d16d1d2fec6ea730d4156..0a6b1fce11084aefa9027ca93b78621b5ce62058 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo5039.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo5039.c
@@ -144,7 +144,7 @@ nv50_bo_move_init(struct nouveau_channel *chan, u32 handle)
                return ret;
 
        PUSH_MTHD(push, NV5039, SET_OBJECT, handle);
-       PUSH_MTHD(push, NV5039, SET_CONTEXT_DMA_NOTIFY, chan->drm->ntfy.handle,
+       PUSH_MTHD(push, NV5039, SET_CONTEXT_DMA_NOTIFY, chan->cli->drm->ntfy.handle,
                                SET_CONTEXT_DMA_BUFFER_IN, chan->vram.handle,
                                SET_CONTEXT_DMA_BUFFER_OUT, chan->vram.handle);
        return 0;

diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index 127bd518030d6d3b0ab783e9b8a77ac06a192dff..e95b8092dae39411f85b58cb4fb17916fad23962 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -90,12 +90,10 @@ nouveau_channel_del(struct nouveau_channel **pchan)
 {
        struct nouveau_channel *chan = *pchan;
        if (chan) {
-               struct nouveau_cli *cli = (void *)chan->user.client;
-
                if (chan->fence)
-                       nouveau_fence(chan->drm)->context_del(chan);
+                       nouveau_fence(chan->cli->drm)->context_del(chan);
 
-               if (cli)
+               if (nvif_object_constructed(&chan->user))
                        nouveau_svmm_part(chan->vmm->svmm, chan->inst);
 
                nvif_object_dtor(&chan->blit);
@@ -157,7 +155,6 @@ nouveau_channel_prep(struct nouveau_cli *cli,
                return -ENOMEM;
 
        chan->cli = cli;
-       chan->drm = drm;
        chan->vmm = nouveau_cli_vmm(cli);
        atomic_set(&chan->killed, 0);
 
@@ -228,12 +225,11 @@ nouveau_channel_prep(struct nouveau_cli *cli,
                        args.limit = device->info.ram_user - 1;
                }
        } else {
-               if (chan->drm->agp.bridge) {
+               if (drm->agp.bridge) {
                        args.target = NV_DMA_V0_TARGET_AGP;
                        args.access = NV_DMA_V0_ACCESS_RDWR;
-                       args.start = chan->drm->agp.base;
-                       args.limit = chan->drm->agp.base +
-                                    chan->drm->agp.size - 1;
+                       args.start = drm->agp.base;
+                       args.limit = drm->agp.base + drm->agp.size - 1;
                } else {
                        args.target = NV_DMA_V0_TARGET_VM;
                        args.access = NV_DMA_V0_ACCESS_RDWR;
@@ -420,12 +416,11 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
                        args.start = 0;
                        args.limit = chan->vmm->vmm.limit - 1;
                } else
-               if (chan->drm->agp.bridge) {
+               if (drm->agp.bridge) {
                        args.target = NV_DMA_V0_TARGET_AGP;
                        args.access = NV_DMA_V0_ACCESS_RDWR;
-                       args.start = chan->drm->agp.base;
-                       args.limit = chan->drm->agp.base +
-                                    chan->drm->agp.size - 1;
+                       args.start = drm->agp.base;
+                       args.limit = drm->agp.base + drm->agp.size - 1;
                } else {
                        args.target = NV_DMA_V0_TARGET_VM;
                        args.access = NV_DMA_V0_ACCESS_RDWR;
@@ -490,7 +485,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
        }
 
        /* initialise synchronisation */
-       return nouveau_fence(chan->drm)->context_new(chan);
+       return nouveau_fence(drm)->context_new(chan);
 }
 
 int

diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.h b/drivers/gpu/drm/nouveau/nouveau_chan.h
index 18a9cbfef8ca323050dc25ef6d787494056bd14a..3ce9832c9528bc5e40c61018e082cd722436c942 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_chan.h
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.h
@@ -13,7 +13,6 @@ struct nouveau_channel {
        } chan;
 
        struct nouveau_cli *cli;
-       struct nouveau_drm *drm;
        struct nouveau_vmm *vmm;
 
        struct nvif_mem mem_userd;

diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c
index b01c029f3a9034a62feedd7dfa39fe737b339365..a1f329ef0641e6458474e83b4086afdd74bffcc0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -72,7 +72,7 @@ void
 nv50_dma_push(struct nouveau_channel *chan, u64 offset, u32 length,
              bool no_prefetch)
 {
-       struct nvif_user *user = &chan->drm->client.device.user;
+       struct nvif_user *user = &chan->cli->drm->client.device.user;
        struct nouveau_bo *pb = chan->push.buffer;
        int ip = (chan->dma.ib_put * 2) + chan->dma.ib_base;
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 1450fb8c57c33512eca28385dd76b59a92ee121c..6407bb4a3be95ae1c371b4662d2c125bac450f74 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -181,8 +181,9 @@ nouveau_fence_wait_uevent_handler(struct nvif_event *event, void *repv, u32 repc
 void
 nouveau_fence_context_new(struct nouveau_channel *chan, struct nouveau_fence_chan *fctx)
 {
-       struct nouveau_fence_priv *priv = (void*)chan->drm->fence;
-       struct nouveau_cli *cli = (void *)chan->user.client;
+       struct nouveau_cli *cli = chan->cli;
+       struct nouveau_drm *drm = cli->drm;
+       struct nouveau_fence_priv *priv = (void*)drm->fence;
        struct {
                struct nvif_event_v0 base;
                struct nvif_chan_event_v0 host;
@@ -193,11 +194,11 @@ nouveau_fence_context_new(struct nouveau_channel *chan, struct nouveau_fence_cha
        INIT_LIST_HEAD(&fctx->flip);
        INIT_LIST_HEAD(&fctx->pending);
        spin_lock_init(&fctx->lock);
-       fctx->context = chan->drm->runl[chan->runlist].context_base + chan->chid;
+       fctx->context = drm->runl[chan->runlist].context_base + chan->chid;
 
-       if (chan == chan->drm->cechan)
+       if (chan == drm->cechan)
                strcpy(fctx->name, "copy engine channel");
-       else if (chan == chan->drm->channel)
+       else if (chan == drm->channel)
                strcpy(fctx->name, "generic kernel channel");
        else
                strcpy(fctx->name, cli->name);
@@ -221,7 +222,7 @@ nouveau_fence_emit(struct nouveau_fence *fence)
 {
        struct nouveau_channel *chan = unrcu_pointer(fence->channel);
        struct nouveau_fence_chan *fctx = chan->fence;
-       struct nouveau_fence_priv *priv = (void*)chan->drm->fence;
+       struct nouveau_fence_priv *priv = (void*)chan->cli->drm->fence;
        int ret;
 
        fence->timeout  = jiffies + (15 * HZ);
@@ -354,7 +355,7 @@ nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan,
                        if (i == 0 && usage == DMA_RESV_USAGE_WRITE)
                                continue;
 
-                       f = nouveau_local_fence(fence, chan->drm);
+                       f = nouveau_local_fence(fence, chan->cli->drm);
                        if (f) {
                                struct nouveau_channel *prev;
                                bool must_wait = true;

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 2e535caa7d6ea2ecc2582755fb1c271f99b94346..7b6f611a28b1de1024b8bc3bca27e22cbe1013bd 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -567,10 +567,11 @@ retry:
 }
 
 static int
-validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli,
+validate_list(struct nouveau_channel *chan,
              struct list_head *list, struct drm_nouveau_gem_pushbuf_bo *pbbo)
 {
-       struct nouveau_drm *drm = chan->drm;
+       struct nouveau_cli *cli = chan->cli;
+       struct nouveau_drm *drm = cli->drm;
        struct nouveau_bo *nvbo;
        int ret, relocs = 0;
 
@@ -642,7 +643,7 @@ nouveau_gem_pushbuf_validate(struct nouveau_channel *chan,
                return ret;
        }
 
-       ret = validate_list(chan, cli, &op->list, pbbo);
+       ret = validate_list(chan, &op->list, pbbo);
        if (unlikely(ret < 0)) {
                if (ret != -ERESTARTSYS)
                        NV_PRINTK(err, cli, "validating bo list\n");

diff --git a/drivers/gpu/drm/nouveau/nv17_fence.c b/drivers/gpu/drm/nouveau/nv17_fence.c
index 2c99f2c1ddcdb9a4870ec061dc7ae1c7870799d5..51fcac894146d04e8c2771b7300fc20104ad08ad 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv17_fence.c
+++ b/drivers/gpu/drm/nouveau/nv17_fence.c
@@ -36,8 +36,8 @@ int
 nv17_fence_sync(struct nouveau_fence *fence,
                struct nouveau_channel *prev, struct nouveau_channel *chan)
 {
-       struct nouveau_cli *cli = (void *)prev->user.client;
-       struct nv10_fence_priv *priv = chan->drm->fence;
+       struct nouveau_cli *cli = prev->cli;
+       struct nv10_fence_priv *priv = cli->drm->fence;
        struct nv10_fence_chan *fctx = chan->fence;
        struct nvif_push *ppush = prev->chan.push;
        struct nvif_push *npush = chan->chan.push;
@@ -76,7 +76,7 @@ nv17_fence_sync(struct nouveau_fence *fence,
 static int
 nv17_fence_context_new(struct nouveau_channel *chan)
 {
-       struct nv10_fence_priv *priv = chan->drm->fence;
+       struct nv10_fence_priv *priv = chan->cli->drm->fence;
        struct ttm_resource *reg = priv->bo->bo.resource;
        struct nv10_fence_chan *fctx;
        u32 start = reg->start * PAGE_SIZE;

diff --git a/drivers/gpu/drm/nouveau/nv50_fence.c b/drivers/gpu/drm/nouveau/nv50_fence.c
index 6fa18f9d26b608dd66079b7aab69dfaee3587cb9..62e28dddf87c1719d8f6f13a0f1fb63b7c461900 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_fence.c
+++ b/drivers/gpu/drm/nouveau/nv50_fence.c
@@ -35,7 +35,7 @@
 static int
 nv50_fence_context_new(struct nouveau_channel *chan)
 {
-       struct nv10_fence_priv *priv = chan->drm->fence;
+       struct nv10_fence_priv *priv = chan->cli->drm->fence;
        struct nv10_fence_chan *fctx;
        struct ttm_resource *reg = priv->bo->bo.resource;
        u32 start = reg->start * PAGE_SIZE;

diff --git a/drivers/gpu/drm/nouveau/nv84_fence.c b/drivers/gpu/drm/nouveau/nv84_fence.c
index 9ce4c2d60fe382dfb474d87637990d3efcd1ebad..1f5a02a9239f498cadf943a1081504278febc402 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv84_fence.c
+++ b/drivers/gpu/drm/nouveau/nv84_fence.c
@@ -79,7 +79,7 @@ nv84_fence_sync32(struct nouveau_channel *chan, u64 virtual, u32 sequence)
 static inline u32
 nv84_fence_chid(struct nouveau_channel *chan)
 {
-       return chan->drm->runl[chan->runlist].chan_id_base + chan->chid;
+       return chan->cli->drm->runl[chan->runlist].chan_id_base + chan->chid;
 }
 
 static int
@@ -105,14 +105,14 @@ nv84_fence_sync(struct nouveau_fence *fence,
 static u32
 nv84_fence_read(struct nouveau_channel *chan)
 {
-       struct nv84_fence_priv *priv = chan->drm->fence;
+       struct nv84_fence_priv *priv = chan->cli->drm->fence;
        return nouveau_bo_rd32(priv->bo, nv84_fence_chid(chan) * 16/4);
 }
 
 static void
 nv84_fence_context_del(struct nouveau_channel *chan)
 {
-       struct nv84_fence_priv *priv = chan->drm->fence;
+       struct nv84_fence_priv *priv = chan->cli->drm->fence;
        struct nv84_fence_chan *fctx = chan->fence;
 
        nouveau_bo_wr32(priv->bo, nv84_fence_chid(chan) * 16 / 4, fctx->base.sequence);
@@ -127,7 +127,7 @@ nv84_fence_context_del(struct nouveau_channel *chan)
 int
 nv84_fence_context_new(struct nouveau_channel *chan)
 {
-       struct nv84_fence_priv *priv = chan->drm->fence;
+       struct nv84_fence_priv *priv = chan->cli->drm->fence;
        struct nv84_fence_chan *fctx;
        int ret;