6 files changed, 65 insertions, 2 deletions

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h
index eef54e9b5d77..7957eafa5f0e 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h
@@ -38,6 +38,7 @@ struct nvkm_i2c_bus {
         struct mutex mutex;
         struct list_head head;
         struct i2c_adapter i2c;
+        u8 enabled;
 };
 
 int nvkm_i2c_bus_acquire(struct nvkm_i2c_bus *);
@@ -57,6 +58,7 @@ struct nvkm_i2c_aux {
         struct mutex mutex;
         struct list_head head;
         struct i2c_adapter i2c;
+        u8 enabled;
 
         u32 intr;
 };
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
index 4c1f547da463..b4e7404fe660 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c
@@ -105,9 +105,15 @@ nvkm_i2c_aux_acquire(struct nvkm_i2c_aux *aux)
 {
         struct nvkm_i2c_pad *pad = aux->pad;
         int ret;
+
         AUX_TRACE(aux, "acquire");
         mutex_lock(&aux->mutex);
-        ret = nvkm_i2c_pad_acquire(pad, NVKM_I2C_PAD_AUX);
+
+        if (aux->enabled)
+                ret = nvkm_i2c_pad_acquire(pad, NVKM_I2C_PAD_AUX);
+        else
+                ret = -EIO;
+
         if (ret)
                 mutex_unlock(&aux->mutex);
         return ret;
@@ -145,6 +151,24 @@ nvkm_i2c_aux_del(struct nvkm_i2c_aux **paux)
         }
 }
 
+void
+nvkm_i2c_aux_init(struct nvkm_i2c_aux *aux)
+{
+        AUX_TRACE(aux, "init");
+        mutex_lock(&aux->mutex);
+        aux->enabled = true;
+        mutex_unlock(&aux->mutex);
+}
+
+void
+nvkm_i2c_aux_fini(struct nvkm_i2c_aux *aux)
+{
+        AUX_TRACE(aux, "fini");
+        mutex_lock(&aux->mutex);
+        aux->enabled = false;
+        mutex_unlock(&aux->mutex);
+}
+
 int
 nvkm_i2c_aux_ctor(const struct nvkm_i2c_aux_func *func,
                   struct nvkm_i2c_pad *pad, int id,
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h
index 7d56c4ba693c..08f6b2ee64ab 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h
@@ -16,6 +16,8 @@ int nvkm_i2c_aux_ctor(const struct nvkm_i2c_aux_func *, struct nvkm_i2c_pad *,
 int nvkm_i2c_aux_new_(const struct nvkm_i2c_aux_func *, struct nvkm_i2c_pad *,
                       int id, struct nvkm_i2c_aux **);
 void nvkm_i2c_aux_del(struct nvkm_i2c_aux **);
+void nvkm_i2c_aux_init(struct nvkm_i2c_aux *);
+void nvkm_i2c_aux_fini(struct nvkm_i2c_aux *);
 int nvkm_i2c_aux_xfer(struct nvkm_i2c_aux *, bool retry, u8 type,
                       u32 addr, u8 *data, u8 *size);
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
index 4f197b15acf6..ecacb22834d7 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c
@@ -160,8 +160,18 @@ nvkm_i2c_fini(struct nvkm_subdev *subdev, bool suspend)
 {
         struct nvkm_i2c *i2c = nvkm_i2c(subdev);
         struct nvkm_i2c_pad *pad;
+        struct nvkm_i2c_bus *bus;
+        struct nvkm_i2c_aux *aux;
         u32 mask;
 
+        list_for_each_entry(aux, &i2c->aux, head) {
+                nvkm_i2c_aux_fini(aux);
+        }
+
+        list_for_each_entry(bus, &i2c->bus, head) {
+                nvkm_i2c_bus_fini(bus);
+        }
+
         if ((mask = (1 << i2c->func->aux) - 1), i2c->func->aux_stat) {
                 i2c->func->aux_mask(i2c, NVKM_I2C_ANY, mask, 0);
                 i2c->func->aux_stat(i2c, &mask, &mask, &mask, &mask);
@@ -180,6 +190,7 @@ nvkm_i2c_init(struct nvkm_subdev *subdev)
         struct nvkm_i2c *i2c = nvkm_i2c(subdev);
         struct nvkm_i2c_bus *bus;
         struct nvkm_i2c_pad *pad;
+        struct nvkm_i2c_aux *aux;
 
         list_for_each_entry(pad, &i2c->pad, head) {
                 nvkm_i2c_pad_init(pad);
@@ -189,6 +200,10 @@ nvkm_i2c_init(struct nvkm_subdev *subdev)
                 nvkm_i2c_bus_init(bus);
         }
 
+        list_for_each_entry(aux, &i2c->aux, head) {
+                nvkm_i2c_aux_init(aux);
+        }
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.c
index 807a2b67bd64..ed50cc3736b9 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.c
@@ -110,6 +110,19 @@ nvkm_i2c_bus_init(struct nvkm_i2c_bus *bus)
         BUS_TRACE(bus, "init");
         if (bus->func->init)
                 bus->func->init(bus);
+
+        mutex_lock(&bus->mutex);
+        bus->enabled = true;
+        mutex_unlock(&bus->mutex);
+}
+
+void
+nvkm_i2c_bus_fini(struct nvkm_i2c_bus *bus)
+{
+        BUS_TRACE(bus, "fini");
+        mutex_lock(&bus->mutex);
+        bus->enabled = false;
+        mutex_unlock(&bus->mutex);
 }
 
 void
@@ -126,9 +139,15 @@ nvkm_i2c_bus_acquire(struct nvkm_i2c_bus *bus)
 {
         struct nvkm_i2c_pad *pad = bus->pad;
         int ret;
+
         BUS_TRACE(bus, "acquire");
         mutex_lock(&bus->mutex);
-        ret = nvkm_i2c_pad_acquire(pad, NVKM_I2C_PAD_I2C);
+
+        if (bus->enabled)
+                ret = nvkm_i2c_pad_acquire(pad, NVKM_I2C_PAD_I2C);
+        else
+                ret = -EIO;
+
         if (ret)
                 mutex_unlock(&bus->mutex);
         return ret;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h
index bea0dd33961e..465464bba58b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h
@@ -18,6 +18,7 @@ int nvkm_i2c_bus_new_(const struct nvkm_i2c_bus_func *, struct nvkm_i2c_pad *,
                       int id, struct nvkm_i2c_bus **);
 void nvkm_i2c_bus_del(struct nvkm_i2c_bus **);
 void nvkm_i2c_bus_init(struct nvkm_i2c_bus *);
+void nvkm_i2c_bus_fini(struct nvkm_i2c_bus *);
 
 int nvkm_i2c_bit_xfer(struct nvkm_i2c_bus *, struct i2c_msg *, int);