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

drm/nouveau/msvld: separate from bsp 



Switch to NVIDIA's name for the device.

The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver.  This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).

Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.

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

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

+2 −1
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ struct nv_device_v0 { 
#define NV_DEVICE_V0_DISABLE_VIC                          0x0000020000000000ULL

#define NV_DEVICE_V0_DISABLE_VENC                         0x0000040000000000ULL

#define NV_DEVICE_V0_DISABLE_COPY2                        0x0000080000000000ULL

#define NV_DEVICE_V0_DISABLE_MSVLD                        0x0000100000000000ULL

	__u64 disable;	/* disable particular subsystems */

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

};
@@ -348,7 +349,7 @@ struct kepler_channel_gpfifo_a_v0 { 
#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_GR                               0x01

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_VP                               0x02

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_PPP                              0x04

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_BSP                              0x08

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_MSVLD                            0x08

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_CE0                              0x10

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_CE1                              0x20

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_ENC                              0x40

drivers/gpu/drm/nouveau/include/nvkm/core/device.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ enum nv_subdev_type { 
	NVDEV_ENGINE_VENC,

	NVDEV_ENGINE_DISP,

	NVDEV_ENGINE_PERFMON,

	NVDEV_ENGINE_MSVLD,



	NVDEV_SUBDEV_NR,

};

drivers/gpu/drm/nouveau/include/nvkm/engine/bsp.h

+0 −5
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_BSP_H__

#define __NOUVEAU_BSP_H__



extern struct nouveau_oclass nv84_bsp_oclass;

extern struct nouveau_oclass nv98_bsp_oclass;

extern struct nouveau_oclass nvc0_bsp_oclass;

extern struct nouveau_oclass nve0_bsp_oclass;



#endif

drivers/gpu/drm/nouveau/include/nvkm/engine/msvld.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef __NVKM_MSVLD_H__

#define __NVKM_MSVLD_H__

extern struct nouveau_oclass nv98_msvld_oclass;

extern struct nouveau_oclass nvc0_msvld_oclass;

extern struct nouveau_oclass nve0_msvld_oclass;

#endif

drivers/gpu/drm/nouveau/nvkm/engine/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ include $(src)/nvkm/engine/dmaobj/Kbuild 
include $(src)/nvkm/engine/fifo/Kbuild

include $(src)/nvkm/engine/graph/Kbuild

include $(src)/nvkm/engine/mpeg/Kbuild

include $(src)/nvkm/engine/msvld/Kbuild

include $(src)/nvkm/engine/perfmon/Kbuild

include $(src)/nvkm/engine/ppp/Kbuild

include $(src)/nvkm/engine/software/Kbuild

CRA Git | Maintained and supported by SUSTech CRA and CCSE