Commit 15740541 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/devinit/tu102-: prepare for GSP-RM 



- add R535 implementation of DEVINIT, we need some of this for boot
- add display disable fuse for ga100-

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230918202149.4343-9-skeggsb@gmail.com
parent 6a0fd03a

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

+2 −0
Original line number Diff line number Diff line
@@ -16,3 +16,5 @@ 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



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

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

+15 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <subdev/bios.h>

#include <subdev/bios/pll.h>

#include <subdev/clk/pll.h>

#include <subdev/gsp.h>



static int

ga100_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
@@ -62,8 +63,19 @@ ga100_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq) 
	return ret;

}



static void

ga100_devinit_disable(struct nvkm_devinit *init)

{

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

	u32 r820c04 = nvkm_rd32(device, 0x820c04);



	if (r820c04 & 0x00000001)

		nvkm_subdev_disable(device, NVKM_ENGINE_DISP, 0);

}



static const struct nvkm_devinit_func

ga100_devinit = {

	.disable = ga100_devinit_disable,

	.init = nv50_devinit_init,

	.post = tu102_devinit_post,

	.pll_set = ga100_devinit_pll_set,
@@ -73,5 +85,8 @@ int 
ga100_devinit_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,

		  struct nvkm_devinit **pinit)

{

	if (nvkm_gsp_rm(device->gsp))

		return r535_devinit_new(&ga100_devinit, device, type, inst, pinit);



	return nv50_devinit_new_(&ga100_devinit, device, type, inst, pinit);

}

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

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
#define nvkm_devinit(p) container_of((p), struct nvkm_devinit, subdev)

#include <subdev/devinit.h>



int r535_devinit_new(const struct nvkm_devinit_func *,

		     struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);



struct nvkm_devinit_func {

	void *(*dtor)(struct nvkm_devinit *);

	void (*preinit)(struct nvkm_devinit *);

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

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

 * Copyright 2023 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"



static void *

r535_devinit_dtor(struct nvkm_devinit *devinit)

{

	kfree(devinit->func);

	return devinit;

}



int

r535_devinit_new(const struct nvkm_devinit_func *hw,

		 struct nvkm_device *device, enum nvkm_subdev_type type, int inst,

		 struct nvkm_devinit **pdevinit)

{

	struct nvkm_devinit_func *rm;

	int ret;



	if (!(rm = kzalloc(sizeof(*rm), GFP_KERNEL)))

		return -ENOMEM;



	rm->dtor = r535_devinit_dtor;

	rm->post = hw->post;

	rm->disable = hw->disable;



	ret = nv50_devinit_new_(rm, device, type, inst, pdevinit);

	if (ret)

		kfree(rm);



	return ret;

}

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

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <subdev/bios.h>

#include <subdev/bios/pll.h>

#include <subdev/clk/pll.h>

#include <subdev/gsp.h>



static int

tu102_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
@@ -100,5 +101,8 @@ int 
tu102_devinit_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,

		  struct nvkm_devinit **pinit)

{

	if (nvkm_gsp_rm(device->gsp))

		return r535_devinit_new(&tu102_devinit, device, type, inst, pinit);



	return nv50_devinit_new_(&tu102_devinit, device, type, inst, pinit);

}