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

Commit 4196faa8 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/i2c: port to subdev interfaces 



v2/v3: Ben Skeggs <bskeggs@redhat.com>
- fix typo in default bus selection
- fix accidental loss of destructor

v4: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
- fix typo causing incorrect default i2c port settings when no BMP data

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

drivers/gpu/drm/nouveau/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ nouveau-y += core/subdev/bios/base.o 
nouveau-y += core/subdev/bios/bit.o

nouveau-y += core/subdev/bios/dcb.o

nouveau-y += core/subdev/bios/gpio.o

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

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

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

nouveau-y += core/subdev/device/nv10.o
@@ -45,6 +46,8 @@ nouveau-y += core/subdev/gpio/nv10.o 
nouveau-y += core/subdev/gpio/nv50.o

nouveau-y += core/subdev/gpio/nvd0.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/instmem/nv04.o

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

nouveau-y += core/subdev/instmem/nvc0.o
@@ -61,6 +64,7 @@ nouveau-y += core/engine/copy/nva3.o 
nouveau-y += core/engine/copy/nvc0.o

nouveau-y += core/engine/crypt/nv84.o

nouveau-y += core/engine/crypt/nv98.o

nouveau-y += core/engine/disp/vga.o

nouveau-y += core/engine/fifo/nv04.o

nouveau-y += core/engine/fifo/nv10.o

nouveau-y += core/engine/fifo/nv17.o

drivers/gpu/drm/nouveau/core/engine/disp/vga.c

0 → 100644
+214 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs

 */



#include <core/subdev.h>

#include <core/device.h>



u8

nv_rdport(void *obj, int head, u16 port)

{

	struct nouveau_device *device = nv_device(obj);



	if (device->card_type >= NV_50)

		return nv_rd08(obj, 0x601000 + port);



	if (port == 0x03c0 || port == 0x03c1 ||	/* AR */

	    port == 0x03c2 || port == 0x03da ||	/* INP0 */

	    port == 0x03d4 || port == 0x03d5)	/* CR */

		return nv_rd08(obj, 0x601000 + (head * 0x2000) + port);



	if (port == 0x03c2 || port == 0x03cc ||	/* MISC */

	    port == 0x03c4 || port == 0x03c5 ||	/* SR */

	    port == 0x03ce || port == 0x03cf) {	/* GR */

		if (device->card_type < NV_40)

			head = 0; /* CR44 selects head */

		return nv_rd08(obj, 0x0c0000 + (head * 0x2000) + port);

	}



	nv_error(obj, "unknown vga port 0x%04x\n", port);

	return 0x00;

}



void

nv_wrport(void *obj, int head, u16 port, u8 data)

{

	struct nouveau_device *device = nv_device(obj);



	if (device->card_type >= NV_50)

		nv_wr08(obj, 0x601000 + port, data);

	else

	if (port == 0x03c0 || port == 0x03c1 ||	/* AR */

	    port == 0x03c2 || port == 0x03da ||	/* INP0 */

	    port == 0x03d4 || port == 0x03d5)	/* CR */

		nv_wr08(obj, 0x601000 + (head * 0x2000) + port, data);

	else

	if (port == 0x03c2 || port == 0x03cc ||	/* MISC */

	    port == 0x03c4 || port == 0x03c5 ||	/* SR */

	    port == 0x03ce || port == 0x03cf) {	/* GR */

		if (device->card_type < NV_40)

			head = 0; /* CR44 selects head */

		nv_wr08(obj, 0x0c0000 + (head * 0x2000) + port, data);

	} else

		nv_error(obj, "unknown vga port 0x%04x\n", port);

}



u8

nv_rdvgas(void *obj, int head, u8 index)

{

	nv_wrport(obj, head, 0x03c4, index);

	return nv_rdport(obj, head, 0x03c5);

}



void

nv_wrvgas(void *obj, int head, u8 index, u8 value)

{

	nv_wrport(obj, head, 0x03c4, index);

	nv_wrport(obj, head, 0x03c5, value);

}



u8

nv_rdvgag(void *obj, int head, u8 index)

{

	nv_wrport(obj, head, 0x03ce, index);

	return nv_rdport(obj, head, 0x03cf);

}



void

nv_wrvgag(void *obj, int head, u8 index, u8 value)

{

	nv_wrport(obj, head, 0x03ce, index);

	nv_wrport(obj, head, 0x03cf, value);

}



u8

nv_rdvgac(void *obj, int head, u8 index)

{

	nv_wrport(obj, head, 0x03d4, index);

	return nv_rdport(obj, head, 0x03d5);

}



void

nv_wrvgac(void *obj, int head, u8 index, u8 value)

{

	nv_wrport(obj, head, 0x03d4, index);

	nv_wrport(obj, head, 0x03d5, value);

}



u8

nv_rdvgai(void *obj, int head, u16 port, u8 index)

{

	if (port == 0x03c4) return nv_rdvgas(obj, head, index);

	if (port == 0x03ce) return nv_rdvgag(obj, head, index);

	if (port == 0x03d4) return nv_rdvgac(obj, head, index);

	nv_error(obj, "unknown indexed vga port 0x%04x\n", port);

	return 0x00;

}



void

nv_wrvgai(void *obj, int head, u16 port, u8 index, u8 value)

{

	if      (port == 0x03c4) nv_wrvgas(obj, head, index, value);

	else if (port == 0x03ce) nv_wrvgag(obj, head, index, value);

	else if (port == 0x03d4) nv_wrvgac(obj, head, index, value);

	else nv_error(obj, "unknown indexed vga port 0x%04x\n", port);

}



bool

nv_lockvgac(void *obj, bool lock)

{

	bool locked = !nv_rdvgac(obj, 0, 0x1f);

	u8 data = lock ? 0x99 : 0x57;

	nv_wrvgac(obj, 0, 0x1f, data);

	if (nv_device(obj)->chipset == 0x11) {

		if (!(nv_rd32(obj, 0x001084) & 0x10000000))

			nv_wrvgac(obj, 1, 0x1f, data);

	}

	return locked;

}



/* CR44 takes values 0 (head A), 3 (head B) and 4 (heads tied)

 * it affects only the 8 bit vga io regs, which we access using mmio at

 * 0xc{0,2}3c*, 0x60{1,3}3*, and 0x68{1,3}3d*

 * in general, the set value of cr44 does not matter: reg access works as

 * expected and values can be set for the appropriate head by using a 0x2000

 * offset as required

 * however:

 * a) pre nv40, the head B range of PRMVIO regs at 0xc23c* was not exposed and

 *    cr44 must be set to 0 or 3 for accessing values on the correct head

 *    through the common 0xc03c* addresses

 * b) in tied mode (4) head B is programmed to the values set on head A, and

 *    access using the head B addresses can have strange results, ergo we leave

 *    tied mode in init once we know to what cr44 should be restored on exit

 *

 * the owner parameter is slightly abused:

 * 0 and 1 are treated as head values and so the set value is (owner * 3)

 * other values are treated as literal values to set

 */

u8

nv_rdvgaowner(void *obj)

{

	if (nv_device(obj)->card_type < NV_50) {

		if (nv_device(obj)->chipset == 0x11) {

			u32 tied = nv_rd32(obj, 0x001084) & 0x10000000;

			if (tied == 0) {

				u8 slA = nv_rdvgac(obj, 0, 0x28) & 0x80;

				u8 tvA = nv_rdvgac(obj, 0, 0x33) & 0x01;

				u8 slB = nv_rdvgac(obj, 1, 0x28) & 0x80;

				u8 tvB = nv_rdvgac(obj, 1, 0x33) & 0x01;

				if (slA && !tvA) return 0x00;

				if (slB && !tvB) return 0x03;

				if (slA) return 0x00;

				if (slB) return 0x03;

				return 0x00;

			}

			return 0x04;

		}



		return nv_rdvgac(obj, 0, 0x44);

	}



	nv_error(obj, "rdvgaowner after nv4x\n");

	return 0x00;

}



void

nv_wrvgaowner(void *obj, u8 select)

{

	if (nv_device(obj)->card_type < NV_50) {

		u8 owner = (select == 1) ? 3 : select;

		if (nv_device(obj)->chipset == 0x11) {

			/* workaround hw lockup bug */

			nv_rdvgac(obj, 0, 0x1f);

			nv_rdvgac(obj, 1, 0x1f);

		}



		nv_wrvgac(obj, 0, 0x44, owner);



		if (nv_device(obj)->chipset == 0x11) {

			nv_wrvgac(obj, 0, 0x2e, owner);

			nv_wrvgac(obj, 0, 0x2e, owner);

		}

	} else

		nv_error(obj, "wrvgaowner after nv4x\n");

}

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
#ifndef __NVBIOS_I2C_H__

#define __NVBIOS_I2C_H__



struct nouveau_bios;



enum dcb_i2c_type {

	DCB_I2C_NV04_BIT = 0,

	DCB_I2C_NV4E_BIT = 4,

	DCB_I2C_NVIO_BIT = 5,

	DCB_I2C_NVIO_AUX = 6,

	DCB_I2C_UNUSED = 0xff

};



struct dcb_i2c_entry {

	enum dcb_i2c_type type;

	u8 drive;

	u8 sense;

	u32 data;

};



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

u16 dcb_i2c_entry(struct nouveau_bios *, u8 index, u8 *ver, u8 *len);

int dcb_i2c_parse(struct nouveau_bios *, u8 index, struct dcb_i2c_entry *);



#endif

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

+40 −39
Original line number Diff line number Diff line 
/*

 * Copyright 2009 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */



#ifndef __NOUVEAU_I2C_H__

#define __NOUVEAU_I2C_H__



#include <linux/i2c.h>

#include <linux/i2c-algo-bit.h>

#include "drm_dp_helper.h"

#include <core/subdev.h>

#include <core/device.h>



#include <subdev/bios.h>

#include <subdev/bios/i2c.h>



#define NV_I2C_PORT(n)    (0x00 + (n))

#define NV_I2C_PORT_NUM    0x10

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



struct nouveau_i2c_chan {

struct nouveau_i2c_port {

	struct i2c_adapter adapter;

	struct drm_device *dev;

	struct nouveau_i2c *i2c;

	struct i2c_algo_bit_data bit;

	struct list_head head;

	u8  index;
@@ -44,16 +23,38 @@ struct nouveau_i2c_chan { 
	u32 state;

};



int  nouveau_i2c_init(struct drm_device *);

void nouveau_i2c_fini(struct drm_device *);

struct nouveau_i2c_chan *nouveau_i2c_find(struct drm_device *, u8 index);

bool nouveau_probe_i2c_addr(struct nouveau_i2c_chan *i2c, int addr);

int nouveau_i2c_identify(struct drm_device *dev, const char *what,

			 struct i2c_board_info *info,

			 bool (*match)(struct nouveau_i2c_chan *,

				       struct i2c_board_info *),

			 int index);

struct nouveau_i2c {

	struct nouveau_subdev base;



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

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

			const char *what, struct i2c_board_info *,

			bool (*match)(struct nouveau_i2c_port *,

				      struct i2c_board_info *));

	struct list_head ports;

};



static inline struct nouveau_i2c *

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



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

extern const struct i2c_algorithm nouveau_i2c_bit_algo;

extern const struct i2c_algorithm nouveau_i2c_aux_algo;



#endif /* __NOUVEAU_I2C_H__ */
 
#endif

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

0 → 100644
+28 −0
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_VGA_H__

#define __NOUVEAU_VGA_H__



/* access to various legacy io ports */

u8   nv_rdport(void *obj, int head, u16 port);

void nv_wrport(void *obj, int head, u16 port, u8 value);



/* VGA Sequencer */

u8   nv_rdvgas(void *obj, int head, u8 index);

void nv_wrvgas(void *obj, int head, u8 index, u8 value);



/* VGA Graphics */

u8   nv_rdvgag(void *obj, int head, u8 index);

void nv_wrvgag(void *obj, int head, u8 index, u8 value);



/* VGA CRTC */

u8   nv_rdvgac(void *obj, int head, u8 index);

void nv_wrvgac(void *obj, int head, u8 index, u8 value);



/* VGA indexed port access dispatcher */

u8   nv_rdvgai(void *obj, int head, u16 port, u8 index);

void nv_wrvgai(void *obj, int head, u16 port, u8 index, u8 value);



bool nv_lockvgac(void *obj, bool lock);

u8   nv_rdvgaowner(void *obj);

void nv_wrvgaowner(void *obj, u8);



#endif