mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

- disable ACR completely when GSP-RM detected

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-6-skeggsb@gmail.com
This commit is contained in:
Ben Skeggs 2023-09-19 06:21:10 +10:00 committed by Dave Airlie
parent 015ef6187f
commit 74e2011b11
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c
View File

@ -20,6 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "priv.h"
#include <subdev/gsp.h>
#include <nvfw/acr.h>
@ -322,5 +323,8 @@ int
ga102_acr_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
struct nvkm_acr **pacr)
{
if (nvkm_gsp_rm(device->gsp))
return -ENODEV;
return nvkm_acr_new_(ga102_acr_fwif, device, type, inst, pacr);
}

3
drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c
View File

@ -201,5 +201,8 @@ int
tu102_acr_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
struct nvkm_acr **pacr)
{
if (nvkm_gsp_rm(device->gsp))
return -ENODEV;
return nvkm_acr_new_(tu102_acr_fwif, device, type, inst, pacr);
}