Commit 8829a562 authored by Ben Skeggs's avatar Ben Skeggs Committed by Karol Herbst
Browse files

drm/nouveau/fb/ga102-: construct vidmem heap via new gp102 paths 



No need for custom implementation anymore.

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-4-skeggsb@gmail.com
parent 2c0c15a2

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

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

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

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

+8 −1
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@ 


#include <engine/nvdec.h>



static u64

ga102_fb_vidmem_size(struct nvkm_fb *fb)

{

	return (u64)nvkm_rd32(fb->subdev.device, 0x1183a4) << 20;

}



static int

ga102_fb_oneinit(struct nvkm_fb *fb)

{
@@ -43,7 +49,8 @@ ga102_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 = ga102_ram_new,

	.vidmem.size = ga102_fb_vidmem_size,

	.ram_new = gp102_ram_new,

	.default_bigpage = 16,

	.vpr.scrub_required = tu102_fb_vpr_scrub_required,

	.vpr.scrub = gp102_fb_vpr_scrub,

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

+0 −1
Original line number Diff line number Diff line
@@ -71,5 +71,4 @@ int gm107_ram_new(struct nvkm_fb *, struct nvkm_ram **); 
int gm200_ram_new(struct nvkm_fb *, struct nvkm_ram **);

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

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

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

#endif

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

deleted100644 → 0
+0 −40
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 "ram.h"



#include <subdev/bios.h>

#include <subdev/bios/init.h>

#include <subdev/bios/rammap.h>



static const struct nvkm_ram_func

ga102_ram = {

};



int

ga102_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram)

{

	struct nvkm_device *device = fb->subdev.device;

	enum nvkm_ram_type type = nvkm_fb_bios_memtype(device->bios);

	u32 size = nvkm_rd32(device, 0x1183a4);



	return nvkm_ram_new_(&ga102_ram, fb, type, (u64)size << 20, pram);

}