Commit 7dcd060c authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/i2c: create proper chipset-specific class implementations 



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

drivers/gpu/drm/nouveau/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -95,7 +95,11 @@ nouveau-y += core/subdev/gpio/nve0.o 
nouveau-y += core/subdev/i2c/base.o

nouveau-y += core/subdev/i2c/aux.o

nouveau-y += core/subdev/i2c/bit.o

nouveau-y += core/subdev/i2c/nv04.o

nouveau-y += core/subdev/i2c/nv4e.o

nouveau-y += core/subdev/i2c/nv50.o

nouveau-y += core/subdev/i2c/nv94.o

nouveau-y += core/subdev/i2c/nvd0.o

nouveau-y += core/subdev/ibus/nvc0.o

nouveau-y += core/subdev/ibus/nve0.o

nouveau-y += core/subdev/instmem/base.o

drivers/gpu/drm/nouveau/core/include/subdev/bios/i2c.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct dcb_i2c_entry { 
	enum dcb_i2c_type type;

	u8 drive;

	u8 sense;

	u32 data;

	u8 share;

};



u16 dcb_i2c_table(struct nouveau_bios *, u8 *ver, u8 *hdr, u8 *cnt, u8 *len);

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

+105 −21
Original line number Diff line number Diff line
@@ -10,21 +10,54 @@ 
#define NV_I2C_PORT(n)    (0x00 + (n))

#define NV_I2C_DEFAULT(n) (0x80 + (n))



#define NV_I2C_TYPE_DCBI2C(n) (0x0000 | (n))

#define NV_I2C_TYPE_EXTDDC(e) (0x0005 | (e) << 8)

#define NV_I2C_TYPE_EXTAUX(e) (0x0006 | (e) << 8)



struct nouveau_i2c_port {

	struct nouveau_object base;

	struct i2c_adapter adapter;

	struct nouveau_i2c *i2c;

	struct i2c_algo_bit_data bit;



	struct list_head head;

	u8  index;

	u16 type;

	u32 dcb;

	u32 drive;

	u32 sense;

	u32 state;

	void (*aux_mux)(struct nouveau_i2c_port *);



	const struct nouveau_i2c_func *func;

};



struct nouveau_i2c_func {

	void (*acquire)(struct nouveau_i2c_port *);

	void (*release)(struct nouveau_i2c_port *);



	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 *);



	int  (*aux)(struct nouveau_i2c_port *, 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);

};



#define nouveau_i2c_port_create(p,e,o,i,a,d)                                   \

	nouveau_i2c_port_create_((p), (e), (o), (i), (a),                      \

				 sizeof(**d), (void **)d)

#define nouveau_i2c_port_destroy(p) ({                                         \

	struct nouveau_i2c_port *port = (p);                                   \

	_nouveau_i2c_port_dtor(nv_object(i2c));                                \

})

#define nouveau_i2c_port_init(p)                                               \

	nouveau_object_init(&(p)->base)

#define nouveau_i2c_port_fini(p,s)                                             \

	nouveau_object_fini(&(p)->base, (s))



int nouveau_i2c_port_create_(struct nouveau_object *, struct nouveau_object *,

			     struct nouveau_oclass *, u8,

			     const struct i2c_algorithm *, int, void **);

void _nouveau_i2c_port_dtor(struct nouveau_object *);

#define _nouveau_i2c_port_init nouveau_object_init

#define _nouveau_i2c_port_fini nouveau_object_fini



struct nouveau_i2c {

	struct nouveau_subdev base;
@@ -43,24 +76,75 @@ nouveau_i2c(void *obj) 
	return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_I2C];

}



extern struct nouveau_oclass nouveau_i2c_oclass;



void nouveau_i2c_drive_scl(void *, int);

void nouveau_i2c_drive_sda(void *, int);

int  nouveau_i2c_sense_scl(void *);

int  nouveau_i2c_sense_sda(void *);

#define nouveau_i2c_create(p,e,o,s,d)                                          \

	nouveau_i2c_create_((p), (e), (o), (s), sizeof(**d), (void **)d)

#define nouveau_i2c_destroy(p) ({                                              \

	struct nouveau_i2c *i2c = (p);                                         \

	_nouveau_i2c_dtor(nv_object(i2c));                                     \

})

#define nouveau_i2c_init(p) ({                                                 \

	struct nouveau_i2c *i2c = (p);                                         \

	_nouveau_i2c_init(nv_object(i2c));                                     \

})

#define nouveau_i2c_fini(p,s) ({                                               \

	struct nouveau_i2c *i2c = (p);                                         \

	_nouveau_i2c_fini(nv_object(i2c), (s));                                \

})



int  nv_rdi2cr(struct nouveau_i2c_port *, u8 addr, u8 reg);

int  nv_wri2cr(struct nouveau_i2c_port *, u8 addr, u8 reg, u8 val);

bool nv_probe_i2c(struct nouveau_i2c_port *, u8 addr);

int nouveau_i2c_create_(struct nouveau_object *, struct nouveau_object *,

			struct nouveau_oclass *, struct nouveau_oclass *,

			int, void **);

void _nouveau_i2c_dtor(struct nouveau_object *);

int  _nouveau_i2c_init(struct nouveau_object *);

int  _nouveau_i2c_fini(struct nouveau_object *, bool);



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);

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 const struct i2c_algorithm nouveau_i2c_bit_algo;

extern const struct i2c_algorithm nouveau_i2c_aux_algo;



void nv94_aux_mux(struct nouveau_i2c_port *);

int  nv94_aux(struct nouveau_i2c_port *, u8, u32, u8 *, u8);

static inline int

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

{

	u8 val;

	struct i2c_msg msgs[] = {

		{ .addr = addr, .flags = 0, .len = 1, .buf = &reg },

		{ .addr = addr, .flags = I2C_M_RD, .len = 1, .buf = &val },

	};



	int ret = i2c_transfer(&port->adapter, msgs, 2);

	if (ret != 2)

		return -EIO;



	return val;

}



static inline int

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

{

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

	struct i2c_msg msgs[] = {

		{ .addr = addr, .flags = 0, .len = 2, .buf = buf },

	};



	int ret = i2c_transfer(&port->adapter, msgs, 1);

	if (ret != 1)

		return -EIO;



	return 0;

}



static inline bool

nv_probe_i2c(struct nouveau_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);



#endif

drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c

+10 −5
Original line number Diff line number Diff line
@@ -70,12 +70,12 @@ dcb_i2c_parse(struct nouveau_bios *bios, u8 idx, struct dcb_i2c_entry *info) 
	u8  ver, len;

	u16 ent = dcb_i2c_entry(bios, idx, &ver, &len);

	if (ent) {

		info->data = nv_ro32(bios, ent + 0);

		info->type  = nv_ro08(bios, ent + 3);

		info->share = DCB_I2C_UNUSED;

		if (ver < 0x30) {

			info->type &= 0x07;

			if (info->type == 0x07)

				info->type = 0xff;

				info->type = DCB_I2C_UNUSED;

		}



		switch (info->type) {
@@ -88,7 +88,11 @@ dcb_i2c_parse(struct nouveau_bios *bios, u8 idx, struct dcb_i2c_entry *info) 
			return 0;

		case DCB_I2C_NVIO_BIT:

		case DCB_I2C_NVIO_AUX:

			info->drive = nv_ro08(bios, ent + 0);

			info->drive = nv_ro08(bios, ent + 0) & 0x0f;

			if (nv_ro08(bios, ent + 1) & 0x01) {

				info->share  = nv_ro08(bios, ent + 1) >> 1;

				info->share &= 0x0f;

			}

			return 0;

		case DCB_I2C_UNUSED:

			return 0;
@@ -122,6 +126,7 @@ dcb_i2c_parse(struct nouveau_bios *bios, u8 idx, struct dcb_i2c_entry *info) 
		}



		info->type  = DCB_I2C_NV04_BIT;

		info->share = DCB_I2C_UNUSED;

		return 0;

	}

drivers/gpu/drm/nouveau/core/subdev/device/nv04.c

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ nv04_identify(struct nouveau_device *device) 
	case 0x04:

		device->cname = "NV04";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv04_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;
@@ -65,7 +65,7 @@ nv04_identify(struct nouveau_device *device) 
	case 0x05:

		device->cname = "NV05";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv05_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;