Commit 7ddf5e95 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



VPLL regs changed a bit.  There's more stuff to do around these, but it's
less invasive to stick those changes into disp for now.

None of that belongs here anymore anyhow - fix that someday.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -32,4 +32,5 @@ int gm107_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **); 
int gm200_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int gv100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int tu102_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int ga100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

#endif

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

+3 −0
Original line number Diff line number Diff line
@@ -2656,6 +2656,7 @@ static const struct nvkm_device_chip 
nv170_chipset = {

	.name = "GA100",

	.bios = nvkm_bios_new,

	.devinit = ga100_devinit_new,

	.pci = gp100_pci_new,

};
@@ -2663,6 +2664,7 @@ static const struct nvkm_device_chip 
nv172_chipset = {

	.name = "GA102",

	.bios = nvkm_bios_new,

	.devinit = ga100_devinit_new,

	.pci = gp100_pci_new,

};
@@ -2670,6 +2672,7 @@ static const struct nvkm_device_chip 
nv174_chipset = {

	.name = "GA104",

	.bios = nvkm_bios_new,

	.devinit = ga100_devinit_new,

	.pci = gp100_pci_new,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ nvkm-y += nvkm/subdev/devinit/gm107.o 
nvkm-y += nvkm/subdev/devinit/gm200.o

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

nvkm-y += nvkm/subdev/devinit/tu102.o

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

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

0 → 100644
+76 −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 "nv50.h"



#include <subdev/bios.h>

#include <subdev/bios/pll.h>

#include <subdev/clk/pll.h>



static int

ga100_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)

{

	struct nvkm_subdev *subdev = &init->subdev;

	struct nvkm_device *device = subdev->device;

	struct nvbios_pll info;

	int head = type - PLL_VPLL0;

	int N, fN, M, P;

	int ret;



	ret = nvbios_pll_parse(device->bios, type, &info);

	if (ret)

		return ret;



	ret = gt215_pll_calc(subdev, &info, freq, &N, &fN, &M, &P);

	if (ret < 0)

		return ret;



	switch (info.type) {

	case PLL_VPLL0:

	case PLL_VPLL1:

	case PLL_VPLL2:

	case PLL_VPLL3:

		nvkm_wr32(device, 0x00ef00 + (head * 0x40), 0x02080004);

		nvkm_wr32(device, 0x00ef18 + (head * 0x40), (N << 16) | fN);

		nvkm_wr32(device, 0x00ef04 + (head * 0x40), (P << 16) | M);

		nvkm_wr32(device, 0x00e9c0 + (head * 0x04), 0x00000001);

		break;

	default:

		nvkm_warn(subdev, "%08x/%dKhz unimplemented\n", type, freq);

		ret = -EINVAL;

		break;

	}



	return ret;

}



static const struct nvkm_devinit_func

ga100_devinit = {

	.init = nv50_devinit_init,

	.post = tu102_devinit_post,

	.pll_set = ga100_devinit_pll_set,

};



int

ga100_devinit_new(struct nvkm_device *device, int index, struct nvkm_devinit **pinit)

{

	return nv50_devinit_new_(&ga100_devinit, device, index, pinit);

}

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h

+1 −0
Original line number Diff line number Diff line
@@ -19,4 +19,5 @@ void nvkm_devinit_ctor(const struct nvkm_devinit_func *, struct nvkm_device *, 
		       int index, struct nvkm_devinit *);



int nv04_devinit_post(struct nvkm_devinit *, bool);

int tu102_devinit_post(struct nvkm_devinit *, bool);

#endif