Commit 0ff32977 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/gk104/i2c: add aux channel interrupt driver 



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

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ 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/i2c/nve0.o

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

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

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

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

+5 −5
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ nve0_identify(struct nouveau_device *device) 
		device->cname = "GK104";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nve0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -94,7 +94,7 @@ nve0_identify(struct nouveau_device *device) 
		device->cname = "GK107";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nve0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -127,7 +127,7 @@ nve0_identify(struct nouveau_device *device) 
		device->cname = "GK106";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nve0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -177,7 +177,7 @@ nve0_identify(struct nouveau_device *device) 
		device->cname = "GK110";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nve0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;
@@ -243,7 +243,7 @@ nve0_identify(struct nouveau_device *device) 
		device->cname = "GK208";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nve0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

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

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 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 *nve0_i2c_oclass;



static inline int

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

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

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ nvd0_i2c_port_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	return 0;

}



static struct nouveau_oclass

struct nouveau_oclass

nvd0_i2c_sclass[] = {

	{ .handle = NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_BIT),

	  .ofuncs = &(struct nouveau_ofuncs) {

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

0 → 100644
+70 −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 "nv50.h"



static void

nve0_aux_stat(struct nouveau_i2c *i2c, u32 *hi, u32 *lo, u32 *rq, u32 *tx)

{

	u32 intr = nv_rd32(i2c, 0x00dc60);

	u32 stat = nv_rd32(i2c, 0x00dc68) & intr, i;

	for (i = 0, *hi = *lo = *rq = *tx = 0; i < 8; i++) {

		if ((stat & (1 << (i * 4)))) *hi |= 1 << i;

		if ((stat & (2 << (i * 4)))) *lo |= 1 << i;

		if ((stat & (4 << (i * 4)))) *rq |= 1 << i;

		if ((stat & (8 << (i * 4)))) *tx |= 1 << i;

	}

	nv_wr32(i2c, 0x00dc60, intr);

}



static void

nve0_aux_mask(struct nouveau_i2c *i2c, u32 type, u32 mask, u32 data)

{

	u32 temp = nv_rd32(i2c, 0x00dc68), i;

	for (i = 0; i < 8; i++) {

		if (mask & (1 << i)) {

			if (!(data & (1 << i))) {

				temp &= ~(type << (i * 4));

				continue;

			}

			temp |= type << (i * 4);

		}

	}

	nv_wr32(i2c, 0x00dc68, temp);

}



struct nouveau_oclass *

nve0_i2c_oclass = &(struct nouveau_i2c_impl) {

	.base.handle = NV_SUBDEV(I2C, 0xe0),

	.base.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = _nouveau_i2c_ctor,

		.dtor = _nouveau_i2c_dtor,

		.init = _nouveau_i2c_init,

		.fini = _nouveau_i2c_fini,

	},

	.sclass = nvd0_i2c_sclass,

	.aux = 4,

	.aux_stat = nve0_aux_stat,

	.aux_mask = nve0_aux_mask,

}.base;