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

drm/nouveau/fifo/gk104-: remove use of subdev index in runlist topology info 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent ba083ec7

drivers/gpu/drm/nouveau/include/nvif/cl0080.h

+24 −28
Original line number Diff line number Diff line
@@ -60,37 +60,33 @@ struct nv_device_time_v0 { 


#define NV_DEVICE_INFO_UNIT                               (0xffffffffULL << 32)

#define NV_DEVICE_INFO(n)                          ((n) | (0x00000000ULL << 32))

#define NV_DEVICE_FIFO(n)                          ((n) | (0x00000001ULL << 32))

#define NV_DEVICE_HOST(n)                          ((n) | (0x00000001ULL << 32))



/* This will be returned for unsupported queries. */

/* This will be returned in the mthd field for unsupported queries. */

#define NV_DEVICE_INFO_INVALID                                           ~0ULL



/* These return a mask of available engines of particular type. */

#define NV_DEVICE_INFO_ENGINE_SW                     NV_DEVICE_INFO(0x00000000)

#define NV_DEVICE_INFO_ENGINE_GR                     NV_DEVICE_INFO(0x00000001)

#define NV_DEVICE_INFO_ENGINE_MPEG                   NV_DEVICE_INFO(0x00000002)

#define NV_DEVICE_INFO_ENGINE_ME                     NV_DEVICE_INFO(0x00000003)

#define NV_DEVICE_INFO_ENGINE_CIPHER                 NV_DEVICE_INFO(0x00000004)

#define NV_DEVICE_INFO_ENGINE_BSP                    NV_DEVICE_INFO(0x00000005)

#define NV_DEVICE_INFO_ENGINE_VP                     NV_DEVICE_INFO(0x00000006)

#define NV_DEVICE_INFO_ENGINE_CE                     NV_DEVICE_INFO(0x00000007)

#define NV_DEVICE_INFO_ENGINE_SEC                    NV_DEVICE_INFO(0x00000008)

#define NV_DEVICE_INFO_ENGINE_MSVLD                  NV_DEVICE_INFO(0x00000009)

#define NV_DEVICE_INFO_ENGINE_MSPDEC                 NV_DEVICE_INFO(0x0000000a)

#define NV_DEVICE_INFO_ENGINE_MSPPP                  NV_DEVICE_INFO(0x0000000b)

#define NV_DEVICE_INFO_ENGINE_MSENC                  NV_DEVICE_INFO(0x0000000c)

#define NV_DEVICE_INFO_ENGINE_VIC                    NV_DEVICE_INFO(0x0000000d)

#define NV_DEVICE_INFO_ENGINE_SEC2                   NV_DEVICE_INFO(0x0000000e)

#define NV_DEVICE_INFO_ENGINE_NVDEC                  NV_DEVICE_INFO(0x0000000f)

#define NV_DEVICE_INFO_ENGINE_NVENC                  NV_DEVICE_INFO(0x00000010)



/* Returns the number of available runlists. */

#define NV_DEVICE_HOST_RUNLISTS                       NV_DEVICE_HOST(0x00000000)

/* Returns the number of available channels. */

#define NV_DEVICE_FIFO_CHANNELS                      NV_DEVICE_FIFO(0x00000000)



/* Returns a mask of available runlists. */

#define NV_DEVICE_FIFO_RUNLISTS                      NV_DEVICE_FIFO(0x00000001)

#define NV_DEVICE_HOST_CHANNELS                       NV_DEVICE_HOST(0x00000001)



/* These return a mask of engines available on a particular runlist. */

#define NV_DEVICE_FIFO_RUNLIST_ENGINES(n)     ((n) + NV_DEVICE_FIFO(0x00000010))

#define NV_DEVICE_FIFO_RUNLIST_ENGINES__SIZE                                64

/* Returns a mask of available engine types on runlist(data). */

#define NV_DEVICE_HOST_RUNLIST_ENGINES                NV_DEVICE_HOST(0x00000100)

#define NV_DEVICE_HOST_RUNLIST_ENGINES_SW                            0x00000001

#define NV_DEVICE_HOST_RUNLIST_ENGINES_GR                            0x00000002

#define NV_DEVICE_HOST_RUNLIST_ENGINES_MPEG                          0x00000004

#define NV_DEVICE_HOST_RUNLIST_ENGINES_ME                            0x00000008

#define NV_DEVICE_HOST_RUNLIST_ENGINES_CIPHER                        0x00000010

#define NV_DEVICE_HOST_RUNLIST_ENGINES_BSP                           0x00000020

#define NV_DEVICE_HOST_RUNLIST_ENGINES_VP                            0x00000040

#define NV_DEVICE_HOST_RUNLIST_ENGINES_CE                            0x00000080

#define NV_DEVICE_HOST_RUNLIST_ENGINES_SEC                           0x00000100

#define NV_DEVICE_HOST_RUNLIST_ENGINES_MSVLD                         0x00000200

#define NV_DEVICE_HOST_RUNLIST_ENGINES_MSPDEC                        0x00000400

#define NV_DEVICE_HOST_RUNLIST_ENGINES_MSPPP                         0x00000800

#define NV_DEVICE_HOST_RUNLIST_ENGINES_MSENC                         0x00001000

#define NV_DEVICE_HOST_RUNLIST_ENGINES_VIC                           0x00002000

#define NV_DEVICE_HOST_RUNLIST_ENGINES_SEC2                          0x00004000

#define NV_DEVICE_HOST_RUNLIST_ENGINES_NVDEC                         0x00008000

#define NV_DEVICE_HOST_RUNLIST_ENGINES_NVENC                         0x00010000

#endif

drivers/gpu/drm/nouveau/include/nvif/fifo.h

+3 −3
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@ 
#define __NVIF_FIFO_H__

#include <nvif/device.h>



/* Returns mask of runlists that support a NV_DEVICE_INFO_ENGINE_* type. */

/* Returns mask of runlists that support a NV_DEVICE_INFO_RUNLIST_ENGINES_* type. */

u64 nvif_fifo_runlist(struct nvif_device *, u64 engine);



/* CE-supporting runlists (excluding GRCE, if others exist). */

static inline u64

nvif_fifo_runlist_ce(struct nvif_device *device)

{

	u64 runmgr = nvif_fifo_runlist(device, NV_DEVICE_INFO_ENGINE_GR);

	u64 runmce = nvif_fifo_runlist(device, NV_DEVICE_INFO_ENGINE_CE);

	u64 runmgr = nvif_fifo_runlist(device, NV_DEVICE_HOST_RUNLIST_ENGINES_GR);

	u64 runmce = nvif_fifo_runlist(device, NV_DEVICE_HOST_RUNLIST_ENGINES_CE);

	if (runmce && !(runmce &= ~runmgr))

		runmce = runmgr;

	return runmce;

drivers/gpu/drm/nouveau/nouveau_abi16.c

+7 −7
Original line number Diff line number Diff line
@@ -269,19 +269,19 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) 
	if (device->info.family >= NV_DEVICE_INFO_V0_KEPLER) {

		if (init->fb_ctxdma_handle == ~0) {

			switch (init->tt_ctxdma_handle) {

			case 0x01: engine = NV_DEVICE_INFO_ENGINE_GR    ; break;

			case 0x02: engine = NV_DEVICE_INFO_ENGINE_MSPDEC; break;

			case 0x04: engine = NV_DEVICE_INFO_ENGINE_MSPPP ; break;

			case 0x08: engine = NV_DEVICE_INFO_ENGINE_MSVLD ; break;

			case 0x30: engine = NV_DEVICE_INFO_ENGINE_CE    ; break;

			case 0x01: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_GR    ; break;

			case 0x02: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSPDEC; break;

			case 0x04: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSPPP ; break;

			case 0x08: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_MSVLD ; break;

			case 0x30: engine = NV_DEVICE_HOST_RUNLIST_ENGINES_CE    ; break;

			default:

				return nouveau_abi16_put(abi16, -ENOSYS);

			}

		} else {

			engine = NV_DEVICE_INFO_ENGINE_GR;

			engine = NV_DEVICE_HOST_RUNLIST_ENGINES_GR;

		}



		if (engine != NV_DEVICE_INFO_ENGINE_CE)

		if (engine != NV_DEVICE_HOST_RUNLIST_ENGINES_CE)

			engine = nvif_fifo_runlist(device, engine);

		else

			engine = nvif_fifo_runlist_ce(device);

drivers/gpu/drm/nouveau/nouveau_chan.c

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ nouveau_channels_init(struct nouveau_drm *drm) 
	} args = {

		.m.version = 1,

		.m.count = sizeof(args.v) / sizeof(args.v.channels),

		.v.channels.mthd = NV_DEVICE_FIFO_CHANNELS,

		.v.channels.mthd = NV_DEVICE_HOST_CHANNELS,

	};

	struct nvif_object *device = &drm->client.device.object;

	int ret;

drivers/gpu/drm/nouveau/nouveau_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ nouveau_accel_gr_init(struct nouveau_drm *drm) 


	/* Allocate channel that has access to the graphics engine. */

	if (device->info.family >= NV_DEVICE_INFO_V0_KEPLER) {

		arg0 = nvif_fifo_runlist(device, NV_DEVICE_INFO_ENGINE_GR);

		arg0 = nvif_fifo_runlist(device, NV_DEVICE_HOST_RUNLIST_ENGINES_GR);

		arg1 = 1;

	} else {

		arg0 = NvDmaFB;