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

drm/nouveau/fb/gp102-ga100: switch to simpler vram size detection method 



Also exposes this for use by upcoming GSP-RM initialisation code.

v2: add SPDX header

Signed-off-by: default avatarBen Skeggs <bskeggs@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-3-skeggsb@gmail.com
parent ba1efd8e

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

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ struct nvkm_fb { 
	struct nvkm_memory *mmu_wr;

};



u64 nvkm_fb_vidmem_size(struct nvkm_device *);

int nvkm_fb_mem_unlock(struct nvkm_fb *);



void nvkm_fb_tile_init(struct nvkm_fb *, int region, u32 addr, u32 size,

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

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ nvkm-y += nvkm/subdev/fb/ramgk104.o 
nvkm-y += nvkm/subdev/fb/ramgm107.o

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

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

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

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

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

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

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

+12 −0
Original line number Diff line number Diff line
@@ -174,6 +174,18 @@ nvkm_fb_mem_unlock(struct nvkm_fb *fb) 
	return 0;

}



u64

nvkm_fb_vidmem_size(struct nvkm_device *device)

{

	struct nvkm_fb *fb = device->fb;



	if (fb && fb->func->vidmem.size)

		return fb->func->vidmem.size(fb);



	WARN_ON(1);

	return 0;

}



static int

nvkm_fb_init(struct nvkm_subdev *subdev)

{

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

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ ga100_fb = { 
	.init_page = gv100_fb_init_page,

	.init_unkn = gp100_fb_init_unkn,

	.sysmem.flush_page_init = gf100_fb_sysmem_flush_page_init,

	.ram_new = gp100_ram_new,

	.vidmem.size = gp102_fb_vidmem_size,

	.ram_new = gp102_ram_new,

	.default_bigpage = 16,

};

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

+16 −1
Original line number Diff line number Diff line
@@ -40,6 +40,20 @@ gp102_fb_vpr_scrub_required(struct nvkm_fb *fb) 
	return (nvkm_rd32(device, 0x100cd0) & 0x00000010) != 0;

}



u64

gp102_fb_vidmem_size(struct nvkm_fb *fb)

{

	const u32 data = nvkm_rd32(fb->subdev.device, 0x100ce0);

	const u32 lmag = (data & 0x000003f0) >> 4;

	const u32 lsca = (data & 0x0000000f);

	const u64 size = (u64)lmag << (lsca + 20);



	if (data & 0x40000000)

		return size / 16 * 15;



	return size;

}



int

gp102_fb_oneinit(struct nvkm_fb *fb)

{
@@ -59,9 +73,10 @@ gp102_fb = { 
	.init_remapper = gp100_fb_init_remapper,

	.init_page = gm200_fb_init_page,

	.sysmem.flush_page_init = gf100_fb_sysmem_flush_page_init,

	.vidmem.size = gp102_fb_vidmem_size,

	.vpr.scrub_required = gp102_fb_vpr_scrub_required,

	.vpr.scrub = gp102_fb_vpr_scrub,

	.ram_new = gp100_ram_new,

	.ram_new = gp102_ram_new,

};



int