github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 16:44:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
- (temporarily) disable if GSP-RM detected, will be added later
- make init() optional

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-27-skeggsb@gmail.com
This commit is contained in:
Ben Skeggs 2023-09-19 06:21:31 +10:00 committed by Dave Airlie
parent da1fbcc09e
commit a6f992a83f
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c
View File

@ -160,7 +160,11 @@ static int
nvkm_gr_init(struct nvkm_engine *engine)
{
struct nvkm_gr *gr = nvkm_gr(engine);
return gr->func->init(gr);
if (gr->func->init)
return gr->func->init(gr);
return 0;
}
static int

4
drivers/gpu/drm/nouveau/nvkm/engine/gr/ga102.c
View File

@ -23,6 +23,7 @@
#include "ctxgf100.h"
#include <core/firmware.h>
#include <subdev/gsp.h>
#include <subdev/acr.h>
#include <subdev/timer.h>
#include <subdev/vfn.h>
@ -350,5 +351,8 @@ ga102_gr_fwif[] = {
int
ga102_gr_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_gr **pgr)
{
if (nvkm_gsp_rm(device->gsp))
return -ENODEV;
return gf100_gr_new_(ga102_gr_fwif, device, type, inst, pgr);
}

5
drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c
View File

@ -22,6 +22,8 @@
#include "gf100.h"
#include "ctxgf100.h"
#include <subdev/gsp.h>
#include <nvif/class.h>
void
@ -216,5 +218,8 @@ tu102_gr_fwif[] = {
int
tu102_gr_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, struct nvkm_gr **pgr)
{
if (nvkm_gsp_rm(device->gsp))
return -ENODEV;
return gf100_gr_new_(tu102_gr_fwif, device, type, inst, pgr);
}