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

drm/nouveau/pm: rename from perfmon (no binary change) 



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.

A comparison of objdump disassemblies proves no code changes.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ enum nv_subdev_type { 
	NVDEV_ENGINE_VIC,

	NVDEV_ENGINE_VENC,

	NVDEV_ENGINE_DISP,

	NVDEV_ENGINE_PERFMON,

	NVDEV_ENGINE_PM,

	NVDEV_ENGINE_MSVLD,

	NVDEV_ENGINE_SEC,

drivers/gpu/drm/nouveau/include/nvkm/engine/perfmon.h→drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h

+38 −0
Original line number Diff line number Diff line 
#ifndef __NVKM_PERFMON_H__

#define __NVKM_PERFMON_H__

#ifndef __NVKM_PM_H__

#define __NVKM_PM_H__



#include <core/device.h>

#include <core/engine.h>
@@ -7,7 +7,7 @@ 


struct nouveau_perfdom;

struct nouveau_perfctr;

struct nouveau_perfmon {

struct nouveau_pm {

	struct nouveau_engine base;



	struct nouveau_perfctx *context;
@@ -21,18 +21,18 @@ struct nouveau_perfmon { 
	u32 last;

};



static inline struct nouveau_perfmon *

nouveau_perfmon(void *obj)

static inline struct nouveau_pm *

nouveau_pm(void *obj)

{

	return (void *)nouveau_engine(obj, NVDEV_ENGINE_PERFMON);

	return (void *)nouveau_engine(obj, NVDEV_ENGINE_PM);

}



extern struct nouveau_oclass *nv40_perfmon_oclass;

extern struct nouveau_oclass *nv50_perfmon_oclass;

extern struct nouveau_oclass *nv84_perfmon_oclass;

extern struct nouveau_oclass *nva3_perfmon_oclass;

extern struct nouveau_oclass nvc0_perfmon_oclass;

extern struct nouveau_oclass nve0_perfmon_oclass;

extern struct nouveau_oclass nvf0_perfmon_oclass;

extern struct nouveau_oclass *nv40_pm_oclass;

extern struct nouveau_oclass *nv50_pm_oclass;

extern struct nouveau_oclass *nv84_pm_oclass;

extern struct nouveau_oclass *nva3_pm_oclass;

extern struct nouveau_oclass nvc0_pm_oclass;

extern struct nouveau_oclass nve0_pm_oclass;

extern struct nouveau_oclass nvf0_pm_oclass;



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ include $(src)/nvkm/engine/fifo/Kbuild 
include $(src)/nvkm/engine/gr/Kbuild

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

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

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

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

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

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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static const u64 disable_map[] = { 
	[NVDEV_SUBDEV_PMU]	= 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_PM     ]  = NV_DEVICE_V0_DISABLE_CORE,

	[NVDEV_ENGINE_FIFO]	= NV_DEVICE_V0_DISABLE_FIFO,

	[NVDEV_ENGINE_SW]	= NV_DEVICE_V0_DISABLE_FIFO,

	[NVDEV_ENGINE_GR]	= NV_DEVICE_V0_DISABLE_GR,
@@ -319,7 +319,7 @@ nouveau_devobj_ctor(struct nouveau_object *parent, 
				    (1ULL << NVDEV_ENGINE_DMAOBJ) |

				    (1ULL << NVDEV_ENGINE_FIFO) |

				    (1ULL << NVDEV_ENGINE_DISP) |

				    (1ULL << NVDEV_ENGINE_PERFMON), &devobj);

				    (1ULL << NVDEV_ENGINE_PM     ), &devobj);

	*pobject = nv_object(devobj);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#include <engine/msvld.h>

#include <engine/vp.h>

#include <engine/ppp.h>

#include <engine/perfmon.h>

#include <engine/pm.h>



int

gm100_identify(struct nouveau_device *device)

CRA Git | Maintained and supported by SUSTech CRA and CCSE