Commit 2eb58f22 authored by Ben Skeggs's avatar Ben Skeggs Committed by Danilo Krummrich
Browse files

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: default avatarBen Skeggs <bskeggs@nvidia.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240726043828.58966-33-bskeggs@nvidia.com
parent 5cca41ac

drivers/gpu/drm/nouveau/nouveau_chan.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/nouveau/nouveau_chan.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ struct nouveau_channel { 
	} chan;



	struct nouveau_cli *cli;

	struct nvif_device *device;

	struct nouveau_drm *drm;

	struct nouveau_vmm *vmm;