Commit 2944b19b authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/gsp/gv100-: instantiate GSP falcon

We need this for Turing ACR, but it's present from Volta onwards.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7975dfc3
...@@ -5,5 +5,10 @@ ...@@ -5,5 +5,10 @@
struct nvkm_gsp { struct nvkm_gsp {
struct nvkm_subdev subdev; struct nvkm_subdev subdev;
u32 addr;
struct nvkm_falcon *falcon;
}; };
int gv100_gsp_new(struct nvkm_device *, int, struct nvkm_gsp **);
#endif #endif
...@@ -2405,6 +2405,7 @@ nv140_chipset = { ...@@ -2405,6 +2405,7 @@ nv140_chipset = {
.fb = gv100_fb_new, .fb = gv100_fb_new,
.fuse = gm107_fuse_new, .fuse = gm107_fuse_new,
.gpio = gk104_gpio_new, .gpio = gk104_gpio_new,
.gsp = gv100_gsp_new,
.i2c = gm200_i2c_new, .i2c = gm200_i2c_new,
.ibus = gm200_ibus_new, .ibus = gm200_ibus_new,
.imem = nv50_instmem_new, .imem = nv50_instmem_new,
...@@ -2445,6 +2446,7 @@ nv162_chipset = { ...@@ -2445,6 +2446,7 @@ nv162_chipset = {
.fb = gv100_fb_new, .fb = gv100_fb_new,
.fuse = gm107_fuse_new, .fuse = gm107_fuse_new,
.gpio = gk104_gpio_new, .gpio = gk104_gpio_new,
.gsp = gv100_gsp_new,
.i2c = gm200_i2c_new, .i2c = gm200_i2c_new,
.ibus = gm200_ibus_new, .ibus = gm200_ibus_new,
.imem = nv50_instmem_new, .imem = nv50_instmem_new,
...@@ -2477,6 +2479,7 @@ nv164_chipset = { ...@@ -2477,6 +2479,7 @@ nv164_chipset = {
.fb = gv100_fb_new, .fb = gv100_fb_new,
.fuse = gm107_fuse_new, .fuse = gm107_fuse_new,
.gpio = gk104_gpio_new, .gpio = gk104_gpio_new,
.gsp = gv100_gsp_new,
.i2c = gm200_i2c_new, .i2c = gm200_i2c_new,
.ibus = gm200_ibus_new, .ibus = gm200_ibus_new,
.imem = nv50_instmem_new, .imem = nv50_instmem_new,
...@@ -2509,6 +2512,7 @@ nv166_chipset = { ...@@ -2509,6 +2512,7 @@ nv166_chipset = {
.fb = gv100_fb_new, .fb = gv100_fb_new,
.fuse = gm107_fuse_new, .fuse = gm107_fuse_new,
.gpio = gk104_gpio_new, .gpio = gk104_gpio_new,
.gsp = gv100_gsp_new,
.i2c = gm200_i2c_new, .i2c = gm200_i2c_new,
.ibus = gm200_ibus_new, .ibus = gm200_ibus_new,
.imem = nv50_instmem_new, .imem = nv50_instmem_new,
......
...@@ -204,6 +204,9 @@ nvkm_falcon_ctor(const struct nvkm_falcon_func *func, ...@@ -204,6 +204,9 @@ nvkm_falcon_ctor(const struct nvkm_falcon_func *func,
debug_reg = 0x408; debug_reg = 0x408;
falcon->has_emem = true; falcon->has_emem = true;
break; break;
case NVKM_SUBDEV_GSP:
debug_reg = 0x0; /*XXX*/
break;
default: default:
nvkm_warn(subdev, "unsupported falcon %s!\n", nvkm_warn(subdev, "unsupported falcon %s!\n",
nvkm_subdev_name[subdev->index]); nvkm_subdev_name[subdev->index]);
......
/*
* Copyright 2019 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 <subdev/gsp.h>
#include <subdev/top.h>
#include <engine/falcon.h>
static int
gv100_gsp_oneinit(struct nvkm_subdev *subdev)
{
struct nvkm_gsp *gsp = nvkm_gsp(subdev);
gsp->addr = nvkm_top_addr(subdev->device, subdev->index);
if (!gsp->addr)
return -EINVAL;
return nvkm_falcon_v1_new(subdev, "GSP", gsp->addr, &gsp->falcon);
}
static void *
gv100_gsp_dtor(struct nvkm_subdev *subdev)
{
struct nvkm_gsp *gsp = nvkm_gsp(subdev);
nvkm_falcon_del(&gsp->falcon);
return gsp;
}
static const struct nvkm_subdev_func
gv100_gsp = {
.dtor = gv100_gsp_dtor,
.oneinit = gv100_gsp_oneinit,
};
int
gv100_gsp_new(struct nvkm_device *device, int index, struct nvkm_gsp **pgsp)
{
struct nvkm_gsp *gsp;
if (!(gsp = *pgsp = kzalloc(sizeof(*gsp), GFP_KERNEL)))
return -ENOMEM;
nvkm_subdev_ctor(&gv100_gsp, device, index, &gsp->subdev);
return 0;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment