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

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

drm/nouveau/i2c: 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 4e7659fc

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

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ 
#define nouveau_gpio nvkm_gpio

#define nouveau_i2c nvkm_i2c

#define nouveau_i2c_port nvkm_i2c_port

#define nouveau_i2c_board_info nvkm_i2c_board_info

#define nouveau_devinit nvkm_devinit

#define nouveau_bios nvkm_bios

#define nouveau_bios_oclass nvkm_bios_oclass

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

+45 −46
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_I2C_H__

#define __NOUVEAU_I2C_H__



#ifndef __NVKM_I2C_H__

#define __NVKM_I2C_H__

#include <core/subdev.h>

#include <core/device.h>

#include <core/event.h>



#include <subdev/bios.h>

#include <subdev/bios/i2c.h>
@@ -30,8 +29,8 @@ struct nvkm_i2c_ntfy_rep { 
	u8 mask;

};



struct nouveau_i2c_port {

	struct nouveau_object base;

struct nvkm_i2c_port {

	struct nvkm_object base;

	struct i2c_adapter adapter;

	struct mutex mutex;
@@ -39,62 +38,63 @@ struct nouveau_i2c_port { 
	u8  index;

	int aux;



	const struct nouveau_i2c_func *func;

	const struct nvkm_i2c_func *func;

};



struct nouveau_i2c_func {

	void (*drive_scl)(struct nouveau_i2c_port *, int);

	void (*drive_sda)(struct nouveau_i2c_port *, int);

	int  (*sense_scl)(struct nouveau_i2c_port *);

	int  (*sense_sda)(struct nouveau_i2c_port *);

struct nvkm_i2c_func {

	void (*drive_scl)(struct nvkm_i2c_port *, int);

	void (*drive_sda)(struct nvkm_i2c_port *, int);

	int  (*sense_scl)(struct nvkm_i2c_port *);

	int  (*sense_sda)(struct nvkm_i2c_port *);



	int  (*aux)(struct nouveau_i2c_port *, bool, u8, u32, u8 *, u8);

	int  (*pattern)(struct nouveau_i2c_port *, int pattern);

	int  (*lnk_ctl)(struct nouveau_i2c_port *, int nr, int bw, bool enh);

	int  (*drv_ctl)(struct nouveau_i2c_port *, int lane, int sw, int pe);

	int  (*aux)(struct nvkm_i2c_port *, bool, u8, u32, u8 *, u8);

	int  (*pattern)(struct nvkm_i2c_port *, int pattern);

	int  (*lnk_ctl)(struct nvkm_i2c_port *, int nr, int bw, bool enh);

	int  (*drv_ctl)(struct nvkm_i2c_port *, int lane, int sw, int pe);

};



struct nouveau_i2c_board_info {

struct nvkm_i2c_board_info {

	struct i2c_board_info dev;

	u8 udelay; /* set to 0 to use the standard delay */

};



struct nouveau_i2c {

	struct nouveau_subdev base;

struct nvkm_i2c {

	struct nvkm_subdev base;

	struct nvkm_event event;



	struct nouveau_i2c_port *(*find)(struct nouveau_i2c *, u8 index);

	struct nouveau_i2c_port *(*find_type)(struct nouveau_i2c *, u16 type);

	int  (*acquire_pad)(struct nouveau_i2c_port *, unsigned long timeout);

	void (*release_pad)(struct nouveau_i2c_port *);

	int  (*acquire)(struct nouveau_i2c_port *, unsigned long timeout);

	void (*release)(struct nouveau_i2c_port *);

	int (*identify)(struct nouveau_i2c *, int index,

			const char *what, struct nouveau_i2c_board_info *,

			bool (*match)(struct nouveau_i2c_port *,

				      struct i2c_board_info *, void *), void *);

	struct nvkm_i2c_port *(*find)(struct nvkm_i2c *, u8 index);

	struct nvkm_i2c_port *(*find_type)(struct nvkm_i2c *, u16 type);

	int  (*acquire_pad)(struct nvkm_i2c_port *, unsigned long timeout);

	void (*release_pad)(struct nvkm_i2c_port *);

	int  (*acquire)(struct nvkm_i2c_port *, unsigned long timeout);

	void (*release)(struct nvkm_i2c_port *);

	int  (*identify)(struct nvkm_i2c *, int index,

			 const char *what, struct nvkm_i2c_board_info *,

			 bool (*match)(struct nvkm_i2c_port *,

				       struct i2c_board_info *, void *),

			 void *);



	wait_queue_head_t wait;

	struct list_head ports;

};



static inline struct nouveau_i2c *

nouveau_i2c(void *obj)

static inline struct nvkm_i2c *

nvkm_i2c(void *obj)

{

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

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

}



extern struct nouveau_oclass *nv04_i2c_oclass;

extern struct nouveau_oclass *nv4e_i2c_oclass;

extern struct nouveau_oclass *nv50_i2c_oclass;

extern struct nouveau_oclass *nv94_i2c_oclass;

extern struct nouveau_oclass *nvd0_i2c_oclass;

extern struct nouveau_oclass *gf117_i2c_oclass;

extern struct nouveau_oclass *nve0_i2c_oclass;

extern struct nouveau_oclass *gm204_i2c_oclass;

extern struct nvkm_oclass *nv04_i2c_oclass;

extern struct nvkm_oclass *nv4e_i2c_oclass;

extern struct nvkm_oclass *nv50_i2c_oclass;

extern struct nvkm_oclass *g94_i2c_oclass;

extern struct nvkm_oclass *gf110_i2c_oclass;

extern struct nvkm_oclass *gf117_i2c_oclass;

extern struct nvkm_oclass *gk104_i2c_oclass;

extern struct nvkm_oclass *gm204_i2c_oclass;



static inline int

nv_rdi2cr(struct nouveau_i2c_port *port, u8 addr, u8 reg)

nv_rdi2cr(struct nvkm_i2c_port *port, u8 addr, u8 reg)

{

	u8 val;

	struct i2c_msg msgs[] = {
@@ -110,7 +110,7 @@ nv_rdi2cr(struct nouveau_i2c_port *port, u8 addr, u8 reg) 
}



static inline int

nv_wri2cr(struct nouveau_i2c_port *port, u8 addr, u8 reg, u8 val)

nv_wri2cr(struct nvkm_i2c_port *port, u8 addr, u8 reg, u8 val)

{

	u8 buf[2] = { reg, val };

	struct i2c_msg msgs[] = {
@@ -125,12 +125,11 @@ nv_wri2cr(struct nouveau_i2c_port *port, u8 addr, u8 reg, u8 val) 
}



static inline bool

nv_probe_i2c(struct nouveau_i2c_port *port, u8 addr)

nv_probe_i2c(struct nvkm_i2c_port *port, u8 addr)

{

	return nv_rdi2cr(port, addr, 0) >= 0;

}



int nv_rdaux(struct nouveau_i2c_port *, u32 addr, u8 *data, u8 size);

int nv_wraux(struct nouveau_i2c_port *, u32 addr, u8 *data, u8 size);



int nv_rdaux(struct nvkm_i2c_port *, u32 addr, u8 *data, u8 size);

int nv_wraux(struct nvkm_i2c_port *, u32 addr, u8 *data, u8 size);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ gm100_identify(struct nouveau_device *device) 
		device->cname = "GM107";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gk104_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gf110_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gm107_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gk104_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &gm107_therm_oclass;

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

+9 −9
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ nv50_identify(struct nouveau_device *device) 
		device->cname = "G94";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -207,7 +207,7 @@ nv50_identify(struct nouveau_device *device) 
		device->cname = "G96";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -236,7 +236,7 @@ nv50_identify(struct nouveau_device *device) 
		device->cname = "G98";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -294,7 +294,7 @@ nv50_identify(struct nouveau_device *device) 
		device->cname = "MCP77/MCP78";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -323,7 +323,7 @@ nv50_identify(struct nouveau_device *device) 
		device->cname = "MCP79/MCP7A";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -352,7 +352,7 @@ nv50_identify(struct nouveau_device *device) 
		device->cname = "GT215";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -383,7 +383,7 @@ nv50_identify(struct nouveau_device *device) 
		device->cname = "GT216";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -413,7 +413,7 @@ nv50_identify(struct nouveau_device *device) 
		device->cname = "GT218";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;
@@ -443,7 +443,7 @@ nv50_identify(struct nouveau_device *device) 
		device->cname = "MCP89";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_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;

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

+8 −8
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->cname = "GF100";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -96,7 +96,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->cname = "GF104";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -129,7 +129,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->cname = "GF106";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -161,7 +161,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->cname = "GF114";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -194,7 +194,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->cname = "GF116";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -226,7 +226,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->cname = "GF108";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -258,7 +258,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->cname = "GF110";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  g94_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  g94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -291,7 +291,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->cname = "GF119";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  gf110_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gf110_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_FUSE   ] = &gf100_fuse_oclass;

		device->oclass[NVDEV_SUBDEV_CLK    ] = &gf100_clk_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;