From 6f2274991043a3db2ab84b5d9462a085d38f1fb1 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 20 Aug 2015 14:54:09 +1000 Subject: [PATCH] drm/nouveau/i2c: switch to device pri macros Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/nvkm/subdev/i2c/g94.c | 59 ++++++++++--------- .../gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c | 6 +- .../gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c | 12 ++-- .../gpu/drm/nouveau/nvkm/subdev/i2c/gm204.c | 47 ++++++++------- .../gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c | 12 ++-- .../gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c | 15 +++-- .../gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c | 10 ++-- .../drm/nouveau/nvkm/subdev/i2c/padgm204.c | 10 ++-- 8 files changed, 98 insertions(+), 73 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/g94.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/g94.c index be936479ff95..17cb172a4a0a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/g94.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/g94.c @@ -26,21 +26,23 @@ void g94_aux_stat(struct nvkm_i2c *i2c, u32 *hi, u32 *lo, u32 *rq, u32 *tx) { - u32 intr = nv_rd32(i2c, 0x00e06c); - u32 stat = nv_rd32(i2c, 0x00e068) & intr, i; + struct nvkm_device *device = i2c->subdev.device; + u32 intr = nvkm_rd32(device, 0x00e06c); + u32 stat = nvkm_rd32(device, 0x00e068) & 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, 0x00e06c, intr); + nvkm_wr32(device, 0x00e06c, intr); } void g94_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data) { - u32 temp = nv_rd32(i2c, 0x00e068), i; + struct nvkm_device *device = i2c->subdev.device; + u32 temp = nvkm_rd32(device, 0x00e068), i; for (i = 0; i < 8; i++) { if (mask & (1 << i)) { if (!(data & (1 << i))) { @@ -50,21 +52,23 @@ g94_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data) temp |= type << (i * 4); } } - nv_wr32(i2c, 0x00e068, temp); + nvkm_wr32(device, 0x00e068, temp); } -#define AUX_DBG(fmt, args...) nv_debug(aux, "AUXCH(%d): " fmt, ch, ##args) -#define AUX_ERR(fmt, args...) nv_error(aux, "AUXCH(%d): " fmt, ch, ##args) +#define AUX_DBG(fmt, args...) nv_debug(i2c, "AUXCH(%d): " fmt, ch, ##args) +#define AUX_ERR(fmt, args...) nv_error(i2c, "AUXCH(%d): " fmt, ch, ##args) static void -auxch_fini(struct nvkm_i2c *aux, int ch) +auxch_fini(struct nvkm_i2c *i2c, int ch) { - nv_mask(aux, 0x00e4e4 + (ch * 0x50), 0x00310000, 0x00000000); + struct nvkm_device *device = i2c->subdev.device; + nvkm_mask(device, 0x00e4e4 + (ch * 0x50), 0x00310000, 0x00000000); } static int -auxch_init(struct nvkm_i2c *aux, int ch) +auxch_init(struct nvkm_i2c *i2c, int ch) { + struct nvkm_device *device = i2c->subdev.device; const u32 unksel = 1; /* nfi which to use, or if it matters.. */ const u32 ureq = unksel ? 0x00100000 : 0x00200000; const u32 urep = unksel ? 0x01000000 : 0x02000000; @@ -73,7 +77,7 @@ auxch_init(struct nvkm_i2c *aux, int ch) /* wait up to 1ms for any previous transaction to be done... */ timeout = 1000; do { - ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50)); + ctrl = nvkm_rd32(device, 0x00e4e4 + (ch * 0x50)); udelay(1); if (!timeout--) { AUX_ERR("begin idle timeout 0x%08x\n", ctrl); @@ -82,14 +86,14 @@ auxch_init(struct nvkm_i2c *aux, int ch) } while (ctrl & 0x03010000); /* set some magic, and wait up to 1ms for it to appear */ - nv_mask(aux, 0x00e4e4 + (ch * 0x50), 0x00300000, ureq); + nvkm_mask(device, 0x00e4e4 + (ch * 0x50), 0x00300000, ureq); timeout = 1000; do { - ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50)); + ctrl = nvkm_rd32(device, 0x00e4e4 + (ch * 0x50)); udelay(1); if (!timeout--) { AUX_ERR("magic wait 0x%08x\n", ctrl); - auxch_fini(aux, ch); + auxch_fini(i2c, ch); return -EBUSY; } } while ((ctrl & 0x03000000) != urep); @@ -101,7 +105,8 @@ int g94_aux(struct nvkm_i2c_port *base, bool retry, u8 type, u32 addr, u8 *data, u8 size) { - struct nvkm_i2c *aux = nvkm_i2c(base); + struct nvkm_i2c *i2c = nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv50_i2c_port *port = (void *)base; u32 ctrl, stat, timeout, retries; u32 xbuf[4] = {}; @@ -110,11 +115,11 @@ g94_aux(struct nvkm_i2c_port *base, bool retry, AUX_DBG("%d: 0x%08x %d\n", type, addr, size); - ret = auxch_init(aux, ch); + ret = auxch_init(i2c, ch); if (ret < 0) goto out; - stat = nv_rd32(aux, 0x00e4e8 + (ch * 0x50)); + stat = nvkm_rd32(device, 0x00e4e8 + (ch * 0x50)); if (!(stat & 0x10000000)) { AUX_DBG("sink not detected\n"); ret = -ENXIO; @@ -125,30 +130,30 @@ g94_aux(struct nvkm_i2c_port *base, bool retry, memcpy(xbuf, data, size); for (i = 0; i < 16; i += 4) { AUX_DBG("wr 0x%08x\n", xbuf[i / 4]); - nv_wr32(aux, 0x00e4c0 + (ch * 0x50) + i, xbuf[i / 4]); + nvkm_wr32(device, 0x00e4c0 + (ch * 0x50) + i, xbuf[i / 4]); } } - ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50)); + ctrl = nvkm_rd32(device, 0x00e4e4 + (ch * 0x50)); ctrl &= ~0x0001f0ff; ctrl |= type << 12; ctrl |= size - 1; - nv_wr32(aux, 0x00e4e0 + (ch * 0x50), addr); + nvkm_wr32(device, 0x00e4e0 + (ch * 0x50), addr); /* (maybe) retry transaction a number of times on failure... */ for (retries = 0; !ret && retries < 32; retries++) { /* reset, and delay a while if this is a retry */ - nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x80000000 | ctrl); - nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x00000000 | ctrl); + nvkm_wr32(device, 0x00e4e4 + (ch * 0x50), 0x80000000 | ctrl); + nvkm_wr32(device, 0x00e4e4 + (ch * 0x50), 0x00000000 | ctrl); if (retries) udelay(400); /* transaction request, wait up to 1ms for it to complete */ - nv_wr32(aux, 0x00e4e4 + (ch * 0x50), 0x00010000 | ctrl); + nvkm_wr32(device, 0x00e4e4 + (ch * 0x50), 0x00010000 | ctrl); timeout = 1000; do { - ctrl = nv_rd32(aux, 0x00e4e4 + (ch * 0x50)); + ctrl = nvkm_rd32(device, 0x00e4e4 + (ch * 0x50)); udelay(1); if (!timeout--) { AUX_ERR("tx req timeout 0x%08x\n", ctrl); @@ -159,7 +164,7 @@ g94_aux(struct nvkm_i2c_port *base, bool retry, ret = 1; /* read status, and check if transaction completed ok */ - stat = nv_mask(aux, 0x00e4e8 + (ch * 0x50), 0, 0); + stat = nvkm_mask(device, 0x00e4e8 + (ch * 0x50), 0, 0); if ((stat & 0x000f0000) == 0x00080000 || (stat & 0x000f0000) == 0x00020000) ret = retry ? 0 : 1; @@ -173,14 +178,14 @@ g94_aux(struct nvkm_i2c_port *base, bool retry, if (type & 1) { for (i = 0; i < 16; i += 4) { - xbuf[i / 4] = nv_rd32(aux, 0x00e4d0 + (ch * 0x50) + i); + xbuf[i / 4] = nvkm_rd32(device, 0x00e4d0 + (ch * 0x50) + i); AUX_DBG("rd 0x%08x\n", xbuf[i / 4]); } memcpy(data, xbuf, size); } out: - auxch_fini(aux, ch); + auxch_fini(i2c, ch); return ret < 0 ? ret : (stat & 0x000f0000) >> 16; } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c index bf8650201263..6795e5c28b06 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gf110.c @@ -27,16 +27,18 @@ static int gf110_i2c_sense_scl(struct nvkm_i2c_port *base) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv50_i2c_port *port = (void *)base; - return !!(nv_rd32(i2c, port->addr) & 0x00000010); + return !!(nvkm_rd32(device, port->addr) & 0x00000010); } static int gf110_i2c_sense_sda(struct nvkm_i2c_port *base) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv50_i2c_port *port = (void *)base; - return !!(nv_rd32(i2c, port->addr) & 0x00000020); + return !!(nvkm_rd32(device, port->addr) & 0x00000020); } static const struct nvkm_i2c_func diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c index 1a464903a992..9573fdb769b5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c @@ -26,21 +26,23 @@ void gk104_aux_stat(struct nvkm_i2c *i2c, u32 *hi, u32 *lo, u32 *rq, u32 *tx) { - u32 intr = nv_rd32(i2c, 0x00dc60); - u32 stat = nv_rd32(i2c, 0x00dc68) & intr, i; + struct nvkm_device *device = i2c->subdev.device; + u32 intr = nvkm_rd32(device, 0x00dc60); + u32 stat = nvkm_rd32(device, 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); + nvkm_wr32(device, 0x00dc60, intr); } void gk104_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data) { - u32 temp = nv_rd32(i2c, 0x00dc68), i; + struct nvkm_device *device = i2c->subdev.device; + u32 temp = nvkm_rd32(device, 0x00dc68), i; for (i = 0; i < 8; i++) { if (mask & (1 << i)) { if (!(data & (1 << i))) { @@ -50,7 +52,7 @@ gk104_aux_mask(struct nvkm_i2c *i2c, u32 type, u32 mask, u32 data) temp |= type << (i * 4); } } - nv_wr32(i2c, 0x00dc68, temp); + nvkm_wr32(device, 0x00dc68, temp); } struct nvkm_oclass * diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm204.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm204.c index ece2529f8f86..61c760534ab8 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm204.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gm204.c @@ -23,18 +23,20 @@ */ #include "nv50.h" -#define AUX_DBG(fmt, args...) nv_debug(aux, "AUXCH(%d): " fmt, ch, ##args) -#define AUX_ERR(fmt, args...) nv_error(aux, "AUXCH(%d): " fmt, ch, ##args) +#define AUX_DBG(fmt, args...) nv_debug(i2c, "AUXCH(%d): " fmt, ch, ##args) +#define AUX_ERR(fmt, args...) nv_error(i2c, "AUXCH(%d): " fmt, ch, ##args) static void -auxch_fini(struct nvkm_i2c *aux, int ch) +auxch_fini(struct nvkm_i2c *i2c, int ch) { - nv_mask(aux, 0x00d954 + (ch * 0x50), 0x00310000, 0x00000000); + struct nvkm_device *device = i2c->subdev.device; + nvkm_mask(device, 0x00d954 + (ch * 0x50), 0x00310000, 0x00000000); } static int -auxch_init(struct nvkm_i2c *aux, int ch) +auxch_init(struct nvkm_i2c *i2c, int ch) { + struct nvkm_device *device = i2c->subdev.device; const u32 unksel = 1; /* nfi which to use, or if it matters.. */ const u32 ureq = unksel ? 0x00100000 : 0x00200000; const u32 urep = unksel ? 0x01000000 : 0x02000000; @@ -43,7 +45,7 @@ auxch_init(struct nvkm_i2c *aux, int ch) /* wait up to 1ms for any previous transaction to be done... */ timeout = 1000; do { - ctrl = nv_rd32(aux, 0x00d954 + (ch * 0x50)); + ctrl = nvkm_rd32(device, 0x00d954 + (ch * 0x50)); udelay(1); if (!timeout--) { AUX_ERR("begin idle timeout 0x%08x\n", ctrl); @@ -52,14 +54,14 @@ auxch_init(struct nvkm_i2c *aux, int ch) } while (ctrl & 0x03010000); /* set some magic, and wait up to 1ms for it to appear */ - nv_mask(aux, 0x00d954 + (ch * 0x50), 0x00300000, ureq); + nvkm_mask(device, 0x00d954 + (ch * 0x50), 0x00300000, ureq); timeout = 1000; do { - ctrl = nv_rd32(aux, 0x00d954 + (ch * 0x50)); + ctrl = nvkm_rd32(device, 0x00d954 + (ch * 0x50)); udelay(1); if (!timeout--) { AUX_ERR("magic wait 0x%08x\n", ctrl); - auxch_fini(aux, ch); + auxch_fini(i2c, ch); return -EBUSY; } } while ((ctrl & 0x03000000) != urep); @@ -71,7 +73,8 @@ int gm204_aux(struct nvkm_i2c_port *base, bool retry, u8 type, u32 addr, u8 *data, u8 size) { - struct nvkm_i2c *aux = nvkm_i2c(base); + struct nvkm_i2c *i2c = nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv50_i2c_port *port = (void *)base; u32 ctrl, stat, timeout, retries; u32 xbuf[4] = {}; @@ -80,11 +83,11 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry, AUX_DBG("%d: 0x%08x %d\n", type, addr, size); - ret = auxch_init(aux, ch); + ret = auxch_init(i2c, ch); if (ret < 0) goto out; - stat = nv_rd32(aux, 0x00d958 + (ch * 0x50)); + stat = nvkm_rd32(device, 0x00d958 + (ch * 0x50)); if (!(stat & 0x10000000)) { AUX_DBG("sink not detected\n"); ret = -ENXIO; @@ -95,30 +98,30 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry, memcpy(xbuf, data, size); for (i = 0; i < 16; i += 4) { AUX_DBG("wr 0x%08x\n", xbuf[i / 4]); - nv_wr32(aux, 0x00d930 + (ch * 0x50) + i, xbuf[i / 4]); + nvkm_wr32(device, 0x00d930 + (ch * 0x50) + i, xbuf[i / 4]); } } - ctrl = nv_rd32(aux, 0x00d954 + (ch * 0x50)); + ctrl = nvkm_rd32(device, 0x00d954 + (ch * 0x50)); ctrl &= ~0x0001f0ff; ctrl |= type << 12; ctrl |= size - 1; - nv_wr32(aux, 0x00d950 + (ch * 0x50), addr); + nvkm_wr32(device, 0x00d950 + (ch * 0x50), addr); /* (maybe) retry transaction a number of times on failure... */ for (retries = 0; !ret && retries < 32; retries++) { /* reset, and delay a while if this is a retry */ - nv_wr32(aux, 0x00d954 + (ch * 0x50), 0x80000000 | ctrl); - nv_wr32(aux, 0x00d954 + (ch * 0x50), 0x00000000 | ctrl); + nvkm_wr32(device, 0x00d954 + (ch * 0x50), 0x80000000 | ctrl); + nvkm_wr32(device, 0x00d954 + (ch * 0x50), 0x00000000 | ctrl); if (retries) udelay(400); /* transaction request, wait up to 1ms for it to complete */ - nv_wr32(aux, 0x00d954 + (ch * 0x50), 0x00010000 | ctrl); + nvkm_wr32(device, 0x00d954 + (ch * 0x50), 0x00010000 | ctrl); timeout = 1000; do { - ctrl = nv_rd32(aux, 0x00d954 + (ch * 0x50)); + ctrl = nvkm_rd32(device, 0x00d954 + (ch * 0x50)); udelay(1); if (!timeout--) { AUX_ERR("tx req timeout 0x%08x\n", ctrl); @@ -129,7 +132,7 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry, ret = 1; /* read status, and check if transaction completed ok */ - stat = nv_mask(aux, 0x00d958 + (ch * 0x50), 0, 0); + stat = nvkm_mask(device, 0x00d958 + (ch * 0x50), 0, 0); if ((stat & 0x000f0000) == 0x00080000 || (stat & 0x000f0000) == 0x00020000) ret = retry ? 0 : 1; @@ -143,14 +146,14 @@ gm204_aux(struct nvkm_i2c_port *base, bool retry, if (type & 1) { for (i = 0; i < 16; i += 4) { - xbuf[i / 4] = nv_rd32(aux, 0x00d940 + (ch * 0x50) + i); + xbuf[i / 4] = nvkm_rd32(device, 0x00d940 + (ch * 0x50) + i); AUX_DBG("rd 0x%08x\n", xbuf[i / 4]); } memcpy(data, xbuf, size); } out: - auxch_fini(aux, ch); + auxch_fini(i2c, ch); return ret < 0 ? ret : (stat & 0x000f0000) >> 16; } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c index ba3116f686fa..24edcdbca3de 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c @@ -34,32 +34,36 @@ static void nv4e_i2c_drive_scl(struct nvkm_i2c_port *base, int state) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv4e_i2c_port *port = (void *)base; - nv_mask(i2c, port->addr, 0x2f, state ? 0x21 : 0x01); + nvkm_mask(device, port->addr, 0x2f, state ? 0x21 : 0x01); } static void nv4e_i2c_drive_sda(struct nvkm_i2c_port *base, int state) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv4e_i2c_port *port = (void *)base; - nv_mask(i2c, port->addr, 0x1f, state ? 0x11 : 0x01); + nvkm_mask(device, port->addr, 0x1f, state ? 0x11 : 0x01); } static int nv4e_i2c_sense_scl(struct nvkm_i2c_port *base) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv4e_i2c_port *port = (void *)base; - return !!(nv_rd32(i2c, port->addr) & 0x00040000); + return !!(nvkm_rd32(device, port->addr) & 0x00040000); } static int nv4e_i2c_sense_sda(struct nvkm_i2c_port *base) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv4e_i2c_port *port = (void *)base; - return !!(nv_rd32(i2c, port->addr) & 0x00080000); + return !!(nvkm_rd32(device, port->addr) & 0x00080000); } static const struct nvkm_i2c_func diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c index 21f24864a6d2..6c04fe008837 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c @@ -27,36 +27,40 @@ void nv50_i2c_drive_scl(struct nvkm_i2c_port *base, int state) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv50_i2c_port *port = (void *)base; if (state) port->state |= 0x01; else port->state &= 0xfe; - nv_wr32(i2c, port->addr, port->state); + nvkm_wr32(device, port->addr, port->state); } void nv50_i2c_drive_sda(struct nvkm_i2c_port *base, int state) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv50_i2c_port *port = (void *)base; if (state) port->state |= 0x02; else port->state &= 0xfd; - nv_wr32(i2c, port->addr, port->state); + nvkm_wr32(device, port->addr, port->state); } int nv50_i2c_sense_scl(struct nvkm_i2c_port *base) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv50_i2c_port *port = (void *)base; - return !!(nv_rd32(i2c, port->addr) & 0x00000001); + return !!(nvkm_rd32(device, port->addr) & 0x00000001); } int nv50_i2c_sense_sda(struct nvkm_i2c_port *base) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(base); + struct nvkm_device *device = i2c->subdev.device; struct nv50_i2c_port *port = (void *)base; - return !!(nv_rd32(i2c, port->addr) & 0x00000002); + return !!(nvkm_rd32(device, port->addr) & 0x00000002); } static const struct nvkm_i2c_func @@ -101,8 +105,9 @@ int nv50_i2c_port_init(struct nvkm_object *object) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(object); + struct nvkm_device *device = i2c->subdev.device; struct nv50_i2c_port *port = (void *)object; - nv_wr32(i2c, port->addr, port->state); + nvkm_wr32(device, port->addr, port->state); return nvkm_i2c_port_init(&port->base); } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c index e9832f7a7e38..2e5f6da97f09 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padg94.c @@ -32,8 +32,9 @@ static int g94_i2c_pad_fini(struct nvkm_object *object, bool suspend) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(object); + struct nvkm_device *device = i2c->subdev.device; struct g94_i2c_pad *pad = (void *)object; - nv_mask(i2c, 0x00e50c + pad->addr, 0x00000001, 0x00000001); + nvkm_mask(device, 0x00e50c + pad->addr, 0x00000001, 0x00000001); return nvkm_i2c_pad_fini(&pad->base, suspend); } @@ -41,19 +42,20 @@ static int g94_i2c_pad_init(struct nvkm_object *object) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(object); + struct nvkm_device *device = i2c->subdev.device; struct g94_i2c_pad *pad = (void *)object; switch (nv_oclass(pad->base.next)->handle) { case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_AUX): - nv_mask(i2c, 0x00e500 + pad->addr, 0x0000c003, 0x00000002); + nvkm_mask(device, 0x00e500 + pad->addr, 0x0000c003, 0x00000002); break; case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_BIT): default: - nv_mask(i2c, 0x00e500 + pad->addr, 0x0000c003, 0x0000c001); + nvkm_mask(device, 0x00e500 + pad->addr, 0x0000c003, 0x0000c001); break; } - nv_mask(i2c, 0x00e50c + pad->addr, 0x00000001, 0x00000000); + nvkm_mask(device, 0x00e50c + pad->addr, 0x00000001, 0x00000000); return nvkm_i2c_pad_init(&pad->base); } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm204.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm204.c index be590405444d..fa43046575bd 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm204.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/padgm204.c @@ -32,8 +32,9 @@ static int gm204_i2c_pad_fini(struct nvkm_object *object, bool suspend) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(object); + struct nvkm_device *device = i2c->subdev.device; struct gm204_i2c_pad *pad = (void *)object; - nv_mask(i2c, 0x00d97c + pad->addr, 0x00000001, 0x00000001); + nvkm_mask(device, 0x00d97c + pad->addr, 0x00000001, 0x00000001); return nvkm_i2c_pad_fini(&pad->base, suspend); } @@ -41,19 +42,20 @@ static int gm204_i2c_pad_init(struct nvkm_object *object) { struct nvkm_i2c *i2c = (void *)nvkm_i2c(object); + struct nvkm_device *device = i2c->subdev.device; struct gm204_i2c_pad *pad = (void *)object; switch (nv_oclass(pad->base.next)->handle) { case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_AUX): - nv_mask(i2c, 0x00d970 + pad->addr, 0x0000c003, 0x00000002); + nvkm_mask(device, 0x00d970 + pad->addr, 0x0000c003, 0x00000002); break; case NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_BIT): default: - nv_mask(i2c, 0x00d970 + pad->addr, 0x0000c003, 0x0000c001); + nvkm_mask(device, 0x00d970 + pad->addr, 0x0000c003, 0x0000c001); break; } - nv_mask(i2c, 0x00d97c + pad->addr, 0x00000001, 0x00000000); + nvkm_mask(device, 0x00d97c + pad->addr, 0x00000001, 0x00000000); return nvkm_i2c_pad_init(&pad->base); }