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

Commit 37a5d028 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mspdec: separate from vp 



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 bd8369ec

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

+2 −1
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ struct nv_device_v0 { 
#define NV_DEVICE_V0_DISABLE_CE2                          0x0000080000000000ULL

#define NV_DEVICE_V0_DISABLE_MSVLD                        0x0000100000000000ULL

#define NV_DEVICE_V0_DISABLE_SEC                          0x0000200000000000ULL

#define NV_DEVICE_V0_DISABLE_MSPDEC                       0x0000400000000000ULL

	__u64 disable;	/* disable particular subsystems */

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

};
@@ -348,7 +349,7 @@ struct nv50_channel_gpfifo_v0 { 
struct kepler_channel_gpfifo_a_v0 {

	__u8  version;

#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_MSPDEC                           0x02

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_MSPPP                            0x04

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_MSVLD                            0x08

#define KEPLER_CHANNEL_GPFIFO_A_V0_ENGINE_CE0                              0x10

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

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

	NVDEV_ENGINE_MSVLD,

	NVDEV_ENGINE_SEC,

	NVDEV_ENGINE_MSPDEC,



	NVDEV_SUBDEV_NR,

};

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

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

#define __NVKM_MSPDEC_H__

extern struct nouveau_oclass nv98_mspdec_oclass;

extern struct nouveau_oclass nvc0_mspdec_oclass;

extern struct nouveau_oclass nve0_mspdec_oclass;

#endif

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

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

#define __NOUVEAU_VP_H__



extern struct nouveau_oclass nv84_vp_oclass;

extern struct nouveau_oclass nv98_vp_oclass;

extern struct nouveau_oclass nvc0_vp_oclass;

extern struct nouveau_oclass nve0_vp_oclass;



#endif

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

+3 −2
Original line number Diff line number Diff line
@@ -2,17 +2,18 @@ nvkm-y += nvkm/engine/falcon.o 
nvkm-y += nvkm/engine/xtensa.o



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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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