diff options
| author | Ben Skeggs <bskeggs@nvidia.com> | 2024-07-26 06:38:23 +0200 |
|---|---|---|
| committer | Danilo Krummrich <dakr@kernel.org> | 2024-07-27 03:05:46 +0200 |
| commit | 2eb58f22e2761b75e4f35847be03ddd425ae2b5e (patch) | |
| tree | 420165b3adc8b44b46dec644e8e0d88235a051b8 /drivers/gpu/drm/nouveau | |
| parent | drm/nouveau: pass cli to nouveau_channel_new() instead of drm+device (diff) | |
| download | linux-2eb58f22e2761b75e4f35847be03ddd425ae2b5e.tar.xz linux-2eb58f22e2761b75e4f35847be03ddd425ae2b5e.zip | |
drm/nouveau: remove nouveau_chan.device
nouveau_chan.device is always the same as nouveau_chan.cli.device,
so there's no need to store it separately.
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-33-bskeggs@nvidia.com
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_chan.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_chan.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index e18a80fda2ca..127bd518030d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -157,7 +157,6 @@ nouveau_channel_prep(struct nouveau_cli *cli, return -ENOMEM; chan->cli = cli; - chan->device = device; chan->drm = drm; chan->vmm = nouveau_cli_vmm(cli); atomic_set(&chan->killed, 0); @@ -364,8 +363,9 @@ nouveau_channel_ctor(struct nouveau_cli *cli, bool priv, u64 runm, static int nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart) { - struct nvif_device *device = chan->device; - struct nouveau_drm *drm = chan->drm; + struct nouveau_cli *cli = chan->cli; + struct nouveau_drm *drm = cli->drm; + struct nvif_device *device = &cli->device; struct nv_dma_v0 args = {}; int ret, i; diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.h b/drivers/gpu/drm/nouveau/nouveau_chan.h index 260febd634ee..18a9cbfef8ca 100644 --- 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 nvif_device *device; struct nouveau_drm *drm; struct nouveau_vmm *vmm; |