Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fed3ea9 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gr/gm204: initial init+ctx code 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 990b4547

drivers/gpu/drm/nouveau/include/nvif/class.h

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
#define KEPLER_C                                                     0x0000a297



#define MAXWELL_A                                                    0x0000b097

#define MAXWELL_B                                                    0x0000b197



#define FERMI_COMPUTE_A                                              0x000090c0

#define FERMI_COMPUTE_B                                              0x000091c0
@@ -100,6 +101,7 @@ 
#define KEPLER_COMPUTE_B                                             0x0000a1c0



#define MAXWELL_COMPUTE_A                                            0x0000b0c0

#define MAXWELL_COMPUTE_B                                            0x0000b1c0





/*******************************************************************************

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

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ extern struct nvkm_oclass *gk110_gr_oclass; 
extern struct nvkm_oclass *gk110b_gr_oclass;

extern struct nvkm_oclass *gk208_gr_oclass;

extern struct nvkm_oclass *gm107_gr_oclass;

extern struct nvkm_oclass *gm204_gr_oclass;



#include <core/enum.h>

drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c

+1 −3
Original line number Diff line number Diff line
@@ -129,9 +129,7 @@ gm100_identify(struct nvkm_device *device) 
		device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] =  gm204_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] =  gf100_sw_oclass;

#if 0

		device->oclass[NVDEV_ENGINE_GR     ] =  gm107_gr_oclass;

#endif

		device->oclass[NVDEV_ENGINE_GR     ] =  gm204_gr_oclass;

		device->oclass[NVDEV_ENGINE_DISP   ] =  gm204_disp_oclass;

		device->oclass[NVDEV_ENGINE_CE0    ] = &gm204_ce0_oclass;

		device->oclass[NVDEV_ENGINE_CE1    ] = &gm204_ce1_oclass;

drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ nvkm-y += nvkm/engine/gr/ctxgk110.o 
nvkm-y += nvkm/engine/gr/ctxgk110b.o

nvkm-y += nvkm/engine/gr/ctxgk208.o

nvkm-y += nvkm/engine/gr/ctxgm107.o

nvkm-y += nvkm/engine/gr/ctxgm204.o

nvkm-y += nvkm/engine/gr/nv04.o

nvkm-y += nvkm/engine/gr/nv10.o

nvkm-y += nvkm/engine/gr/nv20.o
@@ -34,3 +35,4 @@ nvkm-y += nvkm/engine/gr/gk110.o 
nvkm-y += nvkm/engine/gr/gk110b.o

nvkm-y += nvkm/engine/gr/gk208.o

nvkm-y += nvkm/engine/gr/gm107.o

nvkm-y += nvkm/engine/gr/gm204.o

drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h

+10 −0
Original line number Diff line number Diff line
@@ -90,10 +90,17 @@ void gk104_grctx_generate_unkn(struct gf100_gr_priv *); 
void gk104_grctx_generate_r418bb8(struct gf100_gr_priv *);

void gk104_grctx_generate_rop_active_fbps(struct gf100_gr_priv *);





extern struct nvkm_oclass *gk110_grctx_oclass;

extern struct nvkm_oclass *gk110b_grctx_oclass;

extern struct nvkm_oclass *gk208_grctx_oclass;



extern struct nvkm_oclass *gm107_grctx_oclass;

void gm107_grctx_generate_bundle(struct gf100_grctx *);

void gm107_grctx_generate_pagepool(struct gf100_grctx *);

void gm107_grctx_generate_attrib(struct gf100_grctx *);



extern struct nvkm_oclass *gm204_grctx_oclass;



/* context init value lists */
@@ -197,4 +204,7 @@ extern const struct gf100_gr_init gk208_grctx_init_rstr2d_0[]; 


extern const struct gf100_gr_init gk208_grctx_init_prop_0[];

extern const struct gf100_gr_init gk208_grctx_init_crstr_0[];



extern const struct gf100_gr_init gm107_grctx_init_gpc_unk_0[];

extern const struct gf100_gr_init gm107_grctx_init_wwdx_0[];

#endif