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

Commit 3582942c authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fb/gv100: initial support 



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

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

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



#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
@@ -2400,6 +2400,7 @@ nv140_chipset = { 
	.bios = nvkm_bios_new,

	.bus = gf100_bus_new,

	.devinit = gv100_devinit_new,

	.fb = gv100_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gm200_i2c_new,

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

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ nvkm-y += nvkm/subdev/fb/gm20b.o 
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/ram.o

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

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


#include <core/memory.h>



static void

void

gp100_fb_init_unkn(struct nvkm_fb *base)

{

	struct nvkm_device *device = gf100_fb(base)->base.subdev.device;

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

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

 * Copyright 2018 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 int

gv100_fb_init_page(struct nvkm_fb *fb)

{

	return (fb->page == 16) ? 0 : -EINVAL;

}



static const struct nvkm_fb_func

gv100_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

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

{

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

}