diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-05-13 14:50:25 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-06-11 16:10:25 +1000 |
| commit | d78fa39a2b766b680e6c703f52553afc6c532e11 (patch) | |
| tree | b95de92c5f4142eace2c048f3ec9163a2baa67e7 /drivers/gpu | |
| parent | 3668a339d6e7d47f777b8ce86bd7ca53451df6bb (diff) | |
| download | linux-d78fa39a2b766b680e6c703f52553afc6c532e11.tar.bz2 | |
drm/g94/i2c: add aux channel interrupt driver
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c | 33 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/i2c/priv.h | 3 |
3 files changed, 39 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c index 900f464c716c..ec0bd68a9027 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c +++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c @@ -24,6 +24,36 @@ #include "nv50.h" +void +nv94_aux_stat(struct nouveau_i2c *i2c, u32 *hi, u32 *lo, u32 *rq, u32 *tx) +{ + u32 intr = nv_rd32(i2c, 0x00e06c); + u32 stat = nv_rd32(i2c, 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); +} + +void +nv94_aux_mask(struct nouveau_i2c *i2c, u32 type, u32 mask, u32 data) +{ + u32 temp = nv_rd32(i2c, 0x00e068), 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, 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) @@ -273,4 +303,7 @@ nv94_i2c_oclass = &(struct nouveau_i2c_impl) { .fini = _nouveau_i2c_fini, }, .sclass = nv94_i2c_sclass, + .aux = 4, + .aux_stat = nv94_aux_stat, + .aux_mask = nv94_aux_mask, }.base; diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c index 5237906e568f..b0b8047fb2b5 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c @@ -106,4 +106,7 @@ nvd0_i2c_oclass = &(struct nouveau_i2c_impl) { .fini = _nouveau_i2c_fini, }, .sclass = nvd0_i2c_sclass, + .aux = 4, + .aux_stat = nv94_aux_stat, + .aux_mask = nv94_aux_mask, }.base; diff --git a/drivers/gpu/drm/nouveau/core/subdev/i2c/priv.h b/drivers/gpu/drm/nouveau/core/subdev/i2c/priv.h index 27b9a9717229..a835d9e9ccb5 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/i2c/priv.h +++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/priv.h @@ -73,4 +73,7 @@ struct nouveau_i2c_impl { void (*aux_mask)(struct nouveau_i2c *, u32, u32, u32); }; +void nv94_aux_stat(struct nouveau_i2c *, u32 *, u32 *, u32 *, u32 *); +void nv94_aux_mask(struct nouveau_i2c *, u32, u32, u32); + #endif |