Commit 41ba806f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fb/ga10[024]: initial support 



No VPR scrub.  GA102 and GA104 have a new VRAM size detection method.

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

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

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ int gp100_fb_new(struct nvkm_device *, int, struct nvkm_fb **); 
int gp102_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

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

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

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

int ga102_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

+3 −0
Original line number Diff line number Diff line
@@ -2657,6 +2657,7 @@ nv170_chipset = { 
	.name = "GA100",

	.bios = nvkm_bios_new,

	.devinit = ga100_devinit_new,

	.fb = ga100_fb_new,

	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,

	.mc = ga100_mc_new,
@@ -2668,6 +2669,7 @@ nv172_chipset = { 
	.name = "GA102",

	.bios = nvkm_bios_new,

	.devinit = ga100_devinit_new,

	.fb = ga102_fb_new,

	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,

	.mc = ga100_mc_new,
@@ -2679,6 +2681,7 @@ nv174_chipset = { 
	.name = "GA104",

	.bios = nvkm_bios_new,

	.devinit = ga100_devinit_new,

	.fb = ga102_fb_new,

	.ibus = gm200_ibus_new,

	.imem = nv50_instmem_new,

	.mc = ga100_mc_new,

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

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ nvkm-y += nvkm/subdev/fb/gp100.o 
nvkm-y += nvkm/subdev/fb/gp102.o

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

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

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

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



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

nvkm-y += nvkm/subdev/fb/ramnv04.o
@@ -52,6 +54,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/ramga102.o

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

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

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

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

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2021 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */

#include "gf100.h"

#include "ram.h"



static const struct nvkm_fb_func

ga100_fb = {

	.dtor = gf100_fb_dtor,

	.oneinit = gf100_fb_oneinit,

	.init = gp100_fb_init,

	.init_page = gv100_fb_init_page,

	.init_unkn = gp100_fb_init_unkn,

	.ram_new = gp100_ram_new,

	.default_bigpage = 16,

};



int

ga100_fb_new(struct nvkm_device *device, int index, struct nvkm_fb **pfb)

{

	return gp102_fb_new_(&ga100_fb, device, index, pfb);

}

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

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2021 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */

#include "gf100.h"

#include "ram.h"



static const struct nvkm_fb_func

ga102_fb = {

	.dtor = gf100_fb_dtor,

	.oneinit = gf100_fb_oneinit,

	.init = gp100_fb_init,

	.init_page = gv100_fb_init_page,

	.init_unkn = gp100_fb_init_unkn,

	.ram_new = ga102_ram_new,

	.default_bigpage = 16,

};



int

ga102_fb_new(struct nvkm_device *device, int index, struct nvkm_fb **pfb)

{

	return gp102_fb_new_(&ga102_fb, device, index, pfb);

}