These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / i2c / gk104.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c
index 1a46490..f9f6bf4 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk104.c
@@ -21,26 +21,29 @@
  *
  * Authors: Ben Skeggs
  */
-#include "nv50.h"
+#include "priv.h"
+#include "pad.h"
 
 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,22 +53,20 @@ 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 *
-gk104_i2c_oclass = &(struct nvkm_i2c_impl) {
-       .base.handle = NV_SUBDEV(I2C, 0xe0),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_i2c_ctor,
-               .dtor = _nvkm_i2c_dtor,
-               .init = _nvkm_i2c_init,
-               .fini = _nvkm_i2c_fini,
-       },
-       .sclass = gf110_i2c_sclass,
-       .pad_x = &nv04_i2c_pad_oclass,
-       .pad_s = &g94_i2c_pad_oclass,
+static const struct nvkm_i2c_func
+gk104_i2c = {
+       .pad_x_new = gf119_i2c_pad_x_new,
+       .pad_s_new = gf119_i2c_pad_s_new,
        .aux = 4,
        .aux_stat = gk104_aux_stat,
        .aux_mask = gk104_aux_mask,
-}.base;
+};
+
+int
+gk104_i2c_new(struct nvkm_device *device, int index, struct nvkm_i2c **pi2c)
+{
+       return nvkm_i2c_new_(&gk104_i2c, device, index, pi2c);
+}