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

Commit eeea423c authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fb/gp102: rename from gp104 



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

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

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 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 **);

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

+2 −2
Original line number Diff line number Diff line
@@ -2190,7 +2190,7 @@ nv132_chipset = { 
	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = gm200_devinit_new,

	.fb = gp104_fb_new,

	.fb = gp102_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gm200_i2c_new,
@@ -2219,7 +2219,7 @@ nv134_chipset = { 
	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = gm200_devinit_new,

	.fb = gp104_fb_new,

	.fb = gp102_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gm200_i2c_new,

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 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

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



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

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

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

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <core/memory.h>



static const struct nvkm_fb_func

gp104_fb = {

gp102_fb = {

	.dtor = gf100_fb_dtor,

	.oneinit = gf100_fb_oneinit,

	.init = gp100_fb_init,
@@ -37,7 +37,7 @@ gp104_fb = { 
};



int

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

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

{

	return gf100_fb_new_(&gp104_fb, device, index, pfb);

	return gf100_fb_new_(&gp102_fb, device, index, pfb);

}