Commit 37353543 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/core: add some forgotten subdevs to disable mask 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent c50d3b2b

drivers/gpu/drm/nouveau/core/engine/device/base.c

+2 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ static const u64 disable_map[] = { 
	[NVDEV_SUBDEV_VOLT]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_THERM]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_PWR]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_SUBDEV_FUSE]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_ENGINE_DMAOBJ]	= NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_ENGINE_PERFMON]  = NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_ENGINE_FIFO]	= NV_DEVICE_V0_DISABLE_FIFO,
@@ -235,6 +236,7 @@ static const u64 disable_map[] = { 
	[NVDEV_ENGINE_PPP]	= NV_DEVICE_V0_DISABLE_PPP,

	[NVDEV_ENGINE_COPY0]	= NV_DEVICE_V0_DISABLE_COPY0,

	[NVDEV_ENGINE_COPY1]	= NV_DEVICE_V0_DISABLE_COPY1,

	[NVDEV_ENGINE_COPY2]	= NV_DEVICE_V0_DISABLE_COPY1,

	[NVDEV_ENGINE_VIC]	= NV_DEVICE_V0_DISABLE_VIC,

	[NVDEV_ENGINE_VENC]	= NV_DEVICE_V0_DISABLE_VENC,

	[NVDEV_ENGINE_DISP]	= NV_DEVICE_V0_DISABLE_DISP,

drivers/gpu/drm/nouveau/nvif/class.h

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ struct nv_device_v0 { 
#define NV_DEVICE_V0_DISABLE_COPY1                        0x0000010000000000ULL

#define NV_DEVICE_V0_DISABLE_VIC                          0x0000020000000000ULL

#define NV_DEVICE_V0_DISABLE_VENC                         0x0000040000000000ULL

#define NV_DEVICE_V0_DISABLE_COPY2                        0x0000080000000000ULL

	__u64 disable;	/* disable particular subsystems */

	__u64 debug0;	/* as above, but *internal* ids, and *NOT* ABI */

};