Commit c546656f authored by Ben Skeggs's avatar Ben Skeggs Committed by Karol Herbst
Browse files

drm/nouveau/fifo: remove left-over references to nvkm_fifo_chan 



This was renamed to nvkm_chan in the host rework.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarKarol Herbst <kherbst@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarKarol Herbst <kherbst@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230525003106.3853741-5-skeggsb@gmail.com
parent 8829a562

drivers/gpu/drm/nouveau/include/nvkm/core/engine.h

+2 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#define __NVKM_ENGINE_H__

#define nvkm_engine(p) container_of((p), struct nvkm_engine, subdev)

#include <core/subdev.h>

struct nvkm_fifo_chan;

struct nvkm_chan;

struct nvkm_fb_tile;



extern const struct nvkm_subdev_func nvkm_engine;
@@ -32,8 +32,7 @@ struct nvkm_engine_func { 
	} base;



	struct {

		int (*cclass)(struct nvkm_fifo_chan *,

			      const struct nvkm_oclass *,

		int (*cclass)(struct nvkm_chan *, const struct nvkm_oclass *,

			      struct nvkm_object **);

		int (*sclass)(struct nvkm_oclass *, int index);

	} fifo;

drivers/gpu/drm/nouveau/include/nvkm/core/os.h

+0 −5
Original line number Diff line number Diff line
@@ -49,9 +49,4 @@ nvkm_blob_dtor(struct nvkm_blob *blob) 
	(p = container_of((h), typeof(*p), m), nvkm_list_find_next(p, (h), m, (c)))

#define nvkm_list_foreach(p,h,m,c)                                                           \

	for (p = nvkm_list_find(p, (h), m, (c)); p; p = nvkm_list_find_next(p, (h), m, (c)))



/*FIXME: remove after */

#define nvkm_fifo_chan nvkm_chan

#define nvkm_fifo_chan_func nvkm_chan_func

#define nvkm_fifo_cgrp nvkm_cgrp

#endif

drivers/gpu/drm/nouveau/include/nvkm/engine/falcon.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#define __NVKM_FLCNEN_H__

#define nvkm_falcon(p) container_of((p), struct nvkm_falcon, engine)

#include <core/engine.h>

struct nvkm_fifo_chan;

struct nvkm_chan;



enum nvkm_falcon_dmaidx {

	FALCON_DMAIDX_UCODE		= 0,

drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#define __NVKM_CE_PRIV_H__

#include <engine/ce.h>



void gt215_ce_intr(struct nvkm_falcon *, struct nvkm_fifo_chan *);

void gt215_ce_intr(struct nvkm_falcon *, struct nvkm_chan *);

void gk104_ce_intr(struct nvkm_engine *);

void gp100_ce_intr(struct nvkm_engine *);

drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c

+1 −2
Original line number Diff line number Diff line
@@ -109,8 +109,7 @@ nvkm_gr_oclass_get(struct nvkm_oclass *oclass, int index) 
}



static int

nvkm_gr_cclass_new(struct nvkm_fifo_chan *chan,

		   const struct nvkm_oclass *oclass,

nvkm_gr_cclass_new(struct nvkm_chan *chan, const struct nvkm_oclass *oclass,

		   struct nvkm_object **pobject)

{

	struct nvkm_gr *gr = nvkm_gr(oclass->engine);