Commit 770b06e8 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/fb: add gm20b device 



gm20b's FB has the same capabilities as gm200, minus the ability to
allocate RAM. Create a device that reflects this instead of re-using the
gk20a device which may be incorrect.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Reviewed-By: default avatarKarol Herbst <karolherbst@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 60958b8f

drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ int gk104_fb_new(struct nvkm_device *, int, struct nvkm_fb **); 
int gk20a_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm200_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm20b_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gp100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gp104_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

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

+1 −1
Original line number Diff line number Diff line
@@ -2131,7 +2131,7 @@ nv12b_chipset = { 
	.bar = gk20a_bar_new,

	.bus = gf100_bus_new,

	.clk = gm20b_clk_new,

	.fb = gk20a_fb_new,

	.fb = gm20b_fb_new,

	.fuse = gm107_fuse_new,

	.ibus = gk20a_ibus_new,

	.imem = gk20a_instmem_new,

drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ nvkm-y += nvkm/subdev/fb/gk104.o 
nvkm-y += nvkm/subdev/fb/gk20a.o

nvkm-y += nvkm/subdev/fb/gm107.o

nvkm-y += nvkm/subdev/fb/gm200.o

nvkm-y += nvkm/subdev/fb/gm20b.o

nvkm-y += nvkm/subdev/fb/gp100.o

nvkm-y += nvkm/subdev/fb/gp104.o

drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.h

+4 −0
Original line number Diff line number Diff line
@@ -16,4 +16,8 @@ void gf100_fb_init(struct nvkm_fb *); 
void gf100_fb_intr(struct nvkm_fb *);



void gp100_fb_init(struct nvkm_fb *);



void gm200_fb_init_page(struct nvkm_fb *fb);

void gm200_fb_init(struct nvkm_fb *base);



#endif

drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ gm200_fb_init_page(struct nvkm_fb *fb) 
	}

}



static void

void

gm200_fb_init(struct nvkm_fb *base)

{

	struct gf100_fb *fb = gf100_fb(base);

CRA Git | Maintained and supported by SUSTech CRA and CCSE