Skip to content

Commit 0e55453

Browse files
Ben Skeggsairlied
authored andcommitted
drm/nouveau/ce/tu102-: prepare for GSP-RM
- (temporarily) disable if GSP-RM detected, will be added later Signed-off-by: Ben Skeggs <[email protected]> Signed-off-by: Dave Airlie <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 426cce5 commit 0e55453

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

drivers/gpu/drm/nouveau/nvkm/engine/ce/ga100.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
*/
2222
#include "priv.h"
2323

24+
#include <subdev/gsp.h>
2425
#include <subdev/vfn.h>
2526

2627
#include <nvif/class.h>
@@ -88,5 +89,8 @@ int
8889
ga100_ce_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
8990
struct nvkm_engine **pengine)
9091
{
92+
if (nvkm_gsp_rm(device->gsp))
93+
return -ENODEV;
94+
9195
return nvkm_engine_new_(&ga100_ce, device, type, inst, true, pengine);
9296
}

drivers/gpu/drm/nouveau/nvkm/engine/ce/ga102.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
*/
2222
#include "priv.h"
2323

24+
#include <subdev/gsp.h>
25+
2426
#include <nvif/class.h>
2527

2628
static const struct nvkm_engine_func
@@ -41,5 +43,8 @@ int
4143
ga102_ce_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
4244
struct nvkm_engine **pengine)
4345
{
46+
if (nvkm_gsp_rm(device->gsp))
47+
return -ENODEV;
48+
4449
return nvkm_engine_new_(&ga102_ce, device, type, inst, true, pengine);
4550
}

drivers/gpu/drm/nouveau/nvkm/engine/ce/tu102.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
*/
2222
#include "priv.h"
2323

24+
#include <subdev/gsp.h>
25+
2426
#include <nvif/class.h>
2527

2628
static const struct nvkm_engine_func
@@ -37,5 +39,8 @@ int
3739
tu102_ce_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
3840
struct nvkm_engine **pengine)
3941
{
42+
if (nvkm_gsp_rm(device->gsp))
43+
return -ENODEV;
44+
4045
return nvkm_engine_new_(&tu102_ce, device, type, inst, true, pengine);
4146
}

0 commit comments

Comments
 (0)