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

Commit 904e703c authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fb/gf108: split implementation from gf100 



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

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -89,6 +89,7 @@ int gt215_fb_new(struct nvkm_device *, int, struct nvkm_fb **); 
int mcp77_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

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

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

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

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

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

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

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

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

int gk20a_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 gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1379,7 +1379,7 @@ nvc1_chipset = { 
	.bus = gf100_bus_new,

	.bus = gf100_bus_new,

	.clk = gf100_clk_new,

	.clk = gf100_clk_new,

	.devinit = gf100_devinit_new,

	.devinit = gf100_devinit_new,

	.fb = gf100_fb_new,

	.fb = gf108_fb_new,

	.fuse = gf100_fuse_new,

	.fuse = gf100_fuse_new,

	.gpio = g94_gpio_new,

	.gpio = g94_gpio_new,

	.i2c = g94_i2c_new,

	.i2c = g94_i2c_new,

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ nvkm-y += nvkm/subdev/fb/gt215.o 
nvkm-y += nvkm/subdev/fb/mcp77.o

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

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

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

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

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

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

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

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

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

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

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

nvkm-y += nvkm/subdev/fb/gm107.o
@@ -42,6 +43,7 @@ nvkm-y += nvkm/subdev/fb/ramnv50.o 
nvkm-y += nvkm/subdev/fb/ramgt215.o

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 * Copyright 2017 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.

 *

 * Authors: Ben Skeggs <bskeggs@redhat.com>

 */

#include "gf100.h"

#include "ram.h"



static const struct nvkm_fb_func

gf108_fb = {

	.dtor = gf100_fb_dtor,

	.oneinit = gf100_fb_oneinit,

	.init = gf100_fb_init,

	.init_page = gf100_fb_init_page,

	.intr = gf100_fb_intr,

	.ram_new = gf108_ram_new,

	.memtype_valid = gf100_fb_memtype_valid,

};



int

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

{

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

}

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ int nv50_ram_new(struct nvkm_fb *, struct nvkm_ram **); 
int gt215_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int gt215_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int mcp77_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int mcp77_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int gf100_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int gf100_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int gf108_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int gk104_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int gk104_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int gm107_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int gm107_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int gp100_ram_new(struct nvkm_fb *, struct nvkm_ram **);

int gp100_ram_new(struct nvkm_fb *, struct nvkm_ram **);