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

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



- add R535 implementation of VFN, minus interrupt table

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-23-skeggsb@gmail.com
parent d4c9cd34

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

+2 −0
Original line number Diff line number Diff line
@@ -4,3 +4,5 @@ nvkm-y += nvkm/subdev/vfn/uvfn.o 
nvkm-y += nvkm/subdev/vfn/gv100.o

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

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



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

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

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
 */

#include "priv.h"



#include <subdev/gsp.h>



#include <nvif/class.h>



static const struct nvkm_intr_data
@@ -43,5 +45,8 @@ int 
ga100_vfn_new(struct nvkm_device *device,

	      enum nvkm_subdev_type type, int inst, struct nvkm_vfn **pvfn)

{

	if (nvkm_gsp_rm(device->gsp))

		return r535_vfn_new(&ga100_vfn, device, type, inst, 0xb80000, pvfn);



	return nvkm_vfn_new_(&ga100_vfn, device, type, inst, 0xb80000, pvfn);

}

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

+6 −1
Original line number Diff line number Diff line
@@ -5,16 +5,21 @@ 
#include <subdev/vfn.h>



struct nvkm_vfn_func {

	void (*dtor)(struct nvkm_vfn *);



	const struct nvkm_intr_func *intr;

	const struct nvkm_intr_data *intrs;



	struct {

		u32 addr;

		u32 size;

		const struct nvkm_sclass base;

		struct nvkm_sclass base;

	} user;

};



int r535_vfn_new(const struct nvkm_vfn_func *hw, struct nvkm_device *, enum nvkm_subdev_type, int,

		 u32 addr, struct nvkm_vfn **);



int nvkm_vfn_new_(const struct nvkm_vfn_func *, struct nvkm_device *, enum nvkm_subdev_type, int,

		  u32 addr, struct nvkm_vfn **);

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

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



static void

r535_vfn_dtor(struct nvkm_vfn *vfn)

{

	kfree(vfn->func);

}



int

r535_vfn_new(const struct nvkm_vfn_func *hw,

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

	     struct nvkm_vfn **pvfn)

{

	struct nvkm_vfn_func *rm;

	int ret;



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

		return -ENOMEM;



	rm->dtor = r535_vfn_dtor;

	rm->intr = hw->intr;

	rm->user = hw->user;



	ret = nvkm_vfn_new_(rm, device, type, inst, addr, pvfn);

	if (ret)

		kfree(rm);



	return ret;

}

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

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
 */

#include "priv.h"



#include <subdev/gsp.h>



#include <nvif/class.h>



static void
@@ -104,5 +106,8 @@ int 
tu102_vfn_new(struct nvkm_device *device,

	      enum nvkm_subdev_type type, int inst, struct nvkm_vfn **pvfn)

{

	if (nvkm_gsp_rm(device->gsp))

		return r535_vfn_new(&tu102_vfn, device, type, inst, 0xb80000, pvfn);



	return nvkm_vfn_new_(&tu102_vfn, device, type, inst, 0xb80000, pvfn);

}