Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 206c38a9 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/core: add some missing subdev/engine disable flags 



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

drivers/gpu/drm/nouveau/core/include/core/class.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define NV_DEVICE_DISABLE_COPY0                           0x0000008000000000ULL

#define NV_DEVICE_DISABLE_COPY1                           0x0000010000000000ULL

#define NV_DEVICE_DISABLE_UNK1C1                          0x0000020000000000ULL

#define NV_DEVICE_DISABLE_VENC                            0x0000040000000000ULL



struct nv_device_class {

	u64 device;	/* device identifier, ~0 for client default */

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

+9 −4
Original line number Diff line number Diff line
@@ -61,19 +61,24 @@ struct nouveau_devobj { 


static const u64 disable_map[] = {

	[NVDEV_SUBDEV_VBIOS]	= NV_DEVICE_DISABLE_VBIOS,

	[NVDEV_SUBDEV_DEVINIT]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_GPIO]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_I2C]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_DEVINIT]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_CLOCK]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_MXM]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_MC]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_TIMER]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_FB]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_VM]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_LTCG]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_IBUS]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_INSTMEM]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_VM]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_BAR]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_VOLT]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_CLOCK]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_SUBDEV_THERM]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_ENGINE_DMAOBJ]	= NV_DEVICE_DISABLE_CORE,

	[NVDEV_ENGINE_FIFO]	= NV_DEVICE_DISABLE_FIFO,

	[NVDEV_ENGINE_SW]	= NV_DEVICE_DISABLE_FIFO,

	[NVDEV_ENGINE_GR]	= NV_DEVICE_DISABLE_GRAPH,

	[NVDEV_ENGINE_MPEG]	= NV_DEVICE_DISABLE_MPEG,

	[NVDEV_ENGINE_ME]	= NV_DEVICE_DISABLE_ME,
@@ -84,7 +89,7 @@ static const u64 disable_map[] = { 
	[NVDEV_ENGINE_COPY0]	= NV_DEVICE_DISABLE_COPY0,

	[NVDEV_ENGINE_COPY1]	= NV_DEVICE_DISABLE_COPY1,

	[NVDEV_ENGINE_UNK1C1]	= NV_DEVICE_DISABLE_UNK1C1,

	[NVDEV_ENGINE_FIFO]	= NV_DEVICE_DISABLE_FIFO,

	[NVDEV_ENGINE_VENC]	= NV_DEVICE_DISABLE_VENC,

	[NVDEV_ENGINE_DISP]	= NV_DEVICE_DISABLE_DISP,

	[NVDEV_SUBDEV_NR]	= 0,

};