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

Commit 630ec6c0 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fuse: namespace + nvidia gpu names (no binary change) 



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 639c308e

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

+1 −0
Original line number Diff line number Diff line
@@ -237,5 +237,6 @@ 
#define nouveau_fb nvkm_fb

#define nouveau_fb_tile nvkm_fb_tile

#define nvc0_pte_storage_type_map gf100_pte_storage_type_map

#define nouveau_fuse nvkm_fuse



#endif

drivers/gpu/drm/nouveau/include/nvkm/subdev/fuse.h

+17 −19
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_FUSE_H__

#define __NOUVEAU_FUSE_H__



#ifndef __NVKM_FUSE_H__

#define __NVKM_FUSE_H__

#include <core/subdev.h>

#include <core/device.h>



struct nouveau_fuse {

	struct nouveau_subdev base;

struct nvkm_fuse {

	struct nvkm_subdev base;

};



static inline struct nouveau_fuse *

nouveau_fuse(void *obj)

static inline struct nvkm_fuse *

nvkm_fuse(void *obj)

{

	return (void *)nouveau_subdev(obj, NVDEV_SUBDEV_FUSE);

	return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_FUSE);

}



#define nouveau_fuse_create(p, e, o, d)                                        \

	nouveau_fuse_create_((p), (e), (o), sizeof(**d), (void **)d)



int  nouveau_fuse_create_(struct nouveau_object *, struct nouveau_object *,

			  struct nouveau_oclass *, int, void **);

void _nouveau_fuse_dtor(struct nouveau_object *);

int  _nouveau_fuse_init(struct nouveau_object *);

#define _nouveau_fuse_fini _nouveau_subdev_fini

#define nvkm_fuse_create(p, e, o, d)                                        \

	nvkm_fuse_create_((p), (e), (o), sizeof(**d), (void **)d)



extern struct nouveau_oclass g80_fuse_oclass;

extern struct nouveau_oclass gf100_fuse_oclass;

extern struct nouveau_oclass gm107_fuse_oclass;

int  nvkm_fuse_create_(struct nvkm_object *, struct nvkm_object *,

			  struct nvkm_oclass *, int, void **);

void _nvkm_fuse_dtor(struct nvkm_object *);

int  _nvkm_fuse_init(struct nvkm_object *);

#define _nvkm_fuse_fini _nvkm_subdev_fini



extern struct nvkm_oclass nv50_fuse_oclass;

extern struct nvkm_oclass gf100_fuse_oclass;

extern struct nvkm_oclass gm107_fuse_oclass;

#endif

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

+14 −14
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  nv50_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv50_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -92,7 +92,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -121,7 +121,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -150,7 +150,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -179,7 +179,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -208,7 +208,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -237,7 +237,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -266,7 +266,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -295,7 +295,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  mcp77_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -324,7 +324,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  mcp77_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -353,7 +353,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -384,7 +384,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -414,7 +414,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -444,7 +444,7 @@ nv50_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &g80_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

drivers/gpu/drm/nouveau/nvkm/subdev/fuse/Kbuild

+1 −1
Original line number Diff line number Diff line 
nvkm-y += nvkm/subdev/fuse/base.o

nvkm-y += nvkm/subdev/fuse/g80.o

nvkm-y += nvkm/subdev/fuse/nv50.o

nvkm-y += nvkm/subdev/fuse/gf100.o

nvkm-y += nvkm/subdev/fuse/gm107.o

drivers/gpu/drm/nouveau/nvkm/subdev/fuse/base.c

+11 −14
Original line number Diff line number Diff line
@@ -21,34 +21,31 @@ 
 *

 * Authors: Martin Peres

 */



#include <subdev/fuse.h>



int

_nouveau_fuse_init(struct nouveau_object *object)

_nvkm_fuse_init(struct nvkm_object *object)

{

	struct nouveau_fuse *fuse = (void *)object;

	return nouveau_subdev_init(&fuse->base);

	struct nvkm_fuse *fuse = (void *)object;

	return nvkm_subdev_init(&fuse->base);

}



void

_nouveau_fuse_dtor(struct nouveau_object *object)

_nvkm_fuse_dtor(struct nvkm_object *object)

{

	struct nouveau_fuse *fuse = (void *)object;

	nouveau_subdev_destroy(&fuse->base);

	struct nvkm_fuse *fuse = (void *)object;

	nvkm_subdev_destroy(&fuse->base);

}



int

nouveau_fuse_create_(struct nouveau_object *parent,

		     struct nouveau_object *engine,

		     struct nouveau_oclass *oclass, int length, void **pobject)

nvkm_fuse_create_(struct nvkm_object *parent, struct nvkm_object *engine,

		  struct nvkm_oclass *oclass, int length, void **pobject)

{

	struct nouveau_fuse *fuse;

	struct nvkm_fuse *fuse;

	int ret;



	ret = nouveau_subdev_create_(parent, engine, oclass, 0, "FUSE",

	ret = nvkm_subdev_create_(parent, engine, oclass, 0, "FUSE",

				  "fuse", length, pobject);

	fuse = *pobject;



	return ret;

}