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

Commit 4e7659fc authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gpio: 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 630ec6c0

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

+16 −19
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_GPIO_H__

#define __NOUVEAU_GPIO_H__



#ifndef __NVKM_GPIO_H__

#define __NVKM_GPIO_H__

#include <core/subdev.h>

#include <core/device.h>

#include <core/event.h>



#include <subdev/bios.h>
@@ -20,28 +18,27 @@ struct nvkm_gpio_ntfy_rep { 
	u8 mask;

};



struct nouveau_gpio {

	struct nouveau_subdev base;

struct nvkm_gpio {

	struct nvkm_subdev base;



	struct nvkm_event event;



	void (*reset)(struct nouveau_gpio *, u8 func);

	int  (*find)(struct nouveau_gpio *, int idx, u8 tag, u8 line,

	void (*reset)(struct nvkm_gpio *, u8 func);

	int  (*find)(struct nvkm_gpio *, int idx, u8 tag, u8 line,

		     struct dcb_gpio_func *);

	int  (*set)(struct nouveau_gpio *, int idx, u8 tag, u8 line, int state);

	int  (*get)(struct nouveau_gpio *, int idx, u8 tag, u8 line);

	int  (*set)(struct nvkm_gpio *, int idx, u8 tag, u8 line, int state);

	int  (*get)(struct nvkm_gpio *, int idx, u8 tag, u8 line);

};



static inline struct nouveau_gpio *

nouveau_gpio(void *obj)

static inline struct nvkm_gpio *

nvkm_gpio(void *obj)

{

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

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

}



extern struct nouveau_oclass *nv10_gpio_oclass;

extern struct nouveau_oclass *nv50_gpio_oclass;

extern struct nouveau_oclass *nv94_gpio_oclass;

extern struct nouveau_oclass *nvd0_gpio_oclass;

extern struct nouveau_oclass *nve0_gpio_oclass;



extern struct nvkm_oclass *nv10_gpio_oclass;

extern struct nvkm_oclass *nv50_gpio_oclass;

extern struct nvkm_oclass *g94_gpio_oclass;

extern struct nvkm_oclass *gf110_gpio_oclass;

extern struct nvkm_oclass *gk104_gpio_oclass;

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ gm100_identify(struct nouveau_device *device) 
	case 0x117:

		device->cname = "GM107";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gm107_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;
@@ -102,7 +102,7 @@ gm100_identify(struct nouveau_device *device) 
	case 0x124:

		device->cname = "GM204";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gm204_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gm107_fuse_oclass;

#if 0

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

+10 −10
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0x94:

		device->cname = "G94";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;
@@ -206,7 +206,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0x96:

		device->cname = "G96";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;
@@ -235,7 +235,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0x98:

		device->cname = "G98";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;
@@ -264,7 +264,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xa0:

		device->cname = "G200";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  g84_clk_oclass;
@@ -293,7 +293,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xaa:

		device->cname = "MCP77/MCP78";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  mcp77_clk_oclass;
@@ -322,7 +322,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xac:

		device->cname = "MCP79/MCP7A";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] =  mcp77_clk_oclass;
@@ -351,7 +351,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xa3:

		device->cname = "GT215";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;
@@ -382,7 +382,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xa5:

		device->cname = "GT216";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;
@@ -412,7 +412,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xa8:

		device->cname = "GT218";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;
@@ -442,7 +442,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xaf:

		device->cname = "MCP89";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] =  &nv50_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gt215_clk_oclass;

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

+9 −9
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xc0:

		device->cname = "GF100";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;
@@ -95,7 +95,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xc4:

		device->cname = "GF104";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;
@@ -128,7 +128,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xc3:

		device->cname = "GF106";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;
@@ -160,7 +160,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xce:

		device->cname = "GF114";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;
@@ -193,7 +193,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xcf:

		device->cname = "GF116";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;
@@ -225,7 +225,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xc1:

		device->cname = "GF108";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;
@@ -257,7 +257,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xc8:

		device->cname = "GF110";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;
@@ -290,7 +290,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xd9:

		device->cname = "GF119";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nvd0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gf110_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;
@@ -322,7 +322,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xd7:

		device->cname = "GF117";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nvd0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gf110_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gf117_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

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

+7 −7
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ nve0_identify(struct nouveau_device *device) 
	case 0xe4:

		device->cname = "GK104";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nve0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;
@@ -96,7 +96,7 @@ nve0_identify(struct nouveau_device *device) 
	case 0xe7:

		device->cname = "GK107";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nve0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;
@@ -130,7 +130,7 @@ nve0_identify(struct nouveau_device *device) 
	case 0xe6:

		device->cname = "GK106";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nve0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;
@@ -186,7 +186,7 @@ nve0_identify(struct nouveau_device *device) 
	case 0xf0:

		device->cname = "GK110";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nve0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;
@@ -220,7 +220,7 @@ nve0_identify(struct nouveau_device *device) 
	case 0xf1:

		device->cname = "GK110B";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;
@@ -254,7 +254,7 @@ nve0_identify(struct nouveau_device *device) 
	case 0x106:

		device->cname = "GK208B";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nve0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;
@@ -287,7 +287,7 @@ nve0_identify(struct nouveau_device *device) 
	case 0x108:

		device->cname = "GK208";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nve0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;