Commit 0df26c0d authored by Ben Skeggs's avatar Ben Skeggs Committed by Danilo Krummrich
Browse files

drm/nouveau: remove push pointer from nouveau_channel 



The struct itself lives in nouveau_channel already, just use that.

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-36-bskeggs@nvidia.com
parent 034142a3

drivers/gpu/drm/nouveau/dispnv04/crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -1115,7 +1115,7 @@ nv04_page_flip_emit(struct nouveau_channel *chan, 
	struct nouveau_fence_chan *fctx = chan->fence;

	struct nouveau_drm *drm = chan->cli->drm;

	struct drm_device *dev = drm->dev;

	struct nvif_push *push = chan->chan.push;

	struct nvif_push *push = &chan->chan.push;

	unsigned long flags;

	int ret;
@@ -1173,7 +1173,7 @@ nv04_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, 
	if (!chan)

		return -ENODEV;

	cli = chan->cli;

	push = chan->chan.push;

	push = &chan->chan.push;



	s = kzalloc(sizeof(*s), GFP_KERNEL);

	if (!s)

drivers/gpu/drm/nouveau/nouveau_bo0039.c

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ int 
nv04_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo,

		  struct ttm_resource *old_reg, struct ttm_resource *new_reg)

{

	struct nvif_push *push = chan->chan.push;

	struct nvif_push *push = &chan->chan.push;

	u32 src_ctxdma = nouveau_bo_mem_ctxdma(bo, chan, old_reg);

	u32 src_offset = old_reg->start << PAGE_SHIFT;

	u32 dst_ctxdma = nouveau_bo_mem_ctxdma(bo, chan, new_reg);
@@ -96,7 +96,7 @@ nv04_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 
int

nv04_bo_move_init(struct nouveau_channel *chan, u32 handle)

{

	struct nvif_push *push = chan->chan.push;

	struct nvif_push *push = &chan->chan.push;

	int ret;



	ret = PUSH_WAIT(push, 4);

drivers/gpu/drm/nouveau/nouveau_bo5039.c

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 
		  struct ttm_resource *old_reg, struct ttm_resource *new_reg)

{

	struct nouveau_mem *mem = nouveau_mem(old_reg);

	struct nvif_push *push = chan->chan.push;

	struct nvif_push *push = &chan->chan.push;

	u64 length = new_reg->size;

	u64 src_offset = mem->vma[0].addr;

	u64 dst_offset = mem->vma[1].addr;
@@ -136,7 +136,7 @@ nv50_bo_move_m2mf(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 
int

nv50_bo_move_init(struct nouveau_channel *chan, u32 handle)

{

	struct nvif_push *push = chan->chan.push;

	struct nvif_push *push = &chan->chan.push;

	int ret;



	ret = PUSH_WAIT(push, 6);

drivers/gpu/drm/nouveau/nouveau_bo74c1.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ nv84_bo_move_exec(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 
		  struct ttm_resource *old_reg, struct ttm_resource *new_reg)

{

	struct nouveau_mem *mem = nouveau_mem(old_reg);

	struct nvif_push *push = chan->chan.push;

	struct nvif_push *push = &chan->chan.push;

	int ret;



	ret = PUSH_WAIT(push, 7);

drivers/gpu/drm/nouveau/nouveau_bo85b5.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ nva3_bo_move_copy(struct nouveau_channel *chan, struct ttm_buffer_object *bo, 
		  struct ttm_resource *old_reg, struct ttm_resource *new_reg)

{

	struct nouveau_mem *mem = nouveau_mem(old_reg);

	struct nvif_push *push = chan->chan.push;

	struct nvif_push *push = &chan->chan.push;

	u64 src_offset = mem->vma[0].addr;

	u64 dst_offset = mem->vma[1].addr;

	u32 page_count = PFN_UP(new_reg->size);