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

Commit 6258cd43 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fb/gp104: initial support 



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

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

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 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 gp100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

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



#include <subdev/bios.h>

#include <subdev/bios/ramcfg.h>

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

+1 −0
Original line number Diff line number Diff line
@@ -2186,6 +2186,7 @@ nv134_chipset = { 
	.name = "GP104",

	.bios = nvkm_bios_new,

	.devinit = gm200_devinit_new,

	.fb = gp104_fb_new,

	.imem = nv50_instmem_new,

	.mc = gp100_mc_new,

	.pci = gp100_pci_new,

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 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/gp100.o

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



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

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

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

+2 −0
Original line number Diff line number Diff line
@@ -14,4 +14,6 @@ int gf100_fb_new_(const struct nvkm_fb_func *, struct nvkm_device *, 
void *gf100_fb_dtor(struct nvkm_fb *);

void gf100_fb_init(struct nvkm_fb *);

void gf100_fb_intr(struct nvkm_fb *);



void gp100_fb_init(struct nvkm_fb *);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ gp100_fb_init_unkn(struct nvkm_fb *base) 
	nvkm_wr32(device, 0x1faccc, nvkm_rd32(device, 0x100ccc));

}



static void

void

gp100_fb_init(struct nvkm_fb *base)

{

	struct gf100_fb *fb = gf100_fb(base);