iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- add R535 implementation of VFN, minus interrupt table

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230918202149.4343-23-skeggsb@gmail.com
This commit is contained in:
Ben Skeggs 2023-09-19 06:21:27 +10:00 committed by Dave Airlie
parent d4c9cd346f
commit 426cce5705
5 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nvkm/subdev/vfn/Kbuild
View File

@ -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

5
drivers/gpu/drm/nouveau/nvkm/subdev/vfn/ga100.c
View File

@ -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);
}

7
drivers/gpu/drm/nouveau/nvkm/subdev/vfn/priv.h
View File

@ -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 **);

50
drivers/gpu/drm/nouveau/nvkm/subdev/vfn/r535.c Normal file
View File

@ -0,0 +1,50 @@
/*
* 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;
}

5
drivers/gpu/drm/nouveau/nvkm/subdev/vfn/tu102.c
View File

@ -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);
}