Commit 74e2011b authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

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



- disable ACR completely when GSP-RM detected

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230918202149.4343-6-skeggsb@gmail.com
parent 015ef618

drivers/gpu/drm/nouveau/nvkm/subdev/acr/ga102.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/nouveau/nvkm/subdev/acr/tu102.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

}