diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:06 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:08 +1000 |
commit | ac51596f27d5cece39cb63b857e6ebbffa05ca33 (patch) | |
tree | d5e88688fc09a6fb29c5abd523b44ffbbaaafcba /drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c | |
parent | 5b920d926422fdc5b40b703d72344d5e20b3872a (diff) |
drm/nouveau/ibus: cosmetic changes
This is purely preparation for upcoming commits, there should be no
code changes here.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c | 48 |
1 files changed, 22 insertions, 26 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c index 24dcdfb58a8d..7bdedc53e1b4 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c @@ -22,61 +22,57 @@ #include <subdev/ibus.h> #include <subdev/timer.h> -struct gk20a_ibus_priv { - struct nvkm_ibus base; -}; - static void -gk20a_ibus_init_priv_ring(struct gk20a_ibus_priv *priv) +gk20a_ibus_init_ibus_ring(struct nvkm_ibus *ibus) { - nv_mask(priv, 0x137250, 0x3f, 0); + nv_mask(ibus, 0x137250, 0x3f, 0); - nv_mask(priv, 0x000200, 0x20, 0); + nv_mask(ibus, 0x000200, 0x20, 0); usleep_range(20, 30); - nv_mask(priv, 0x000200, 0x20, 0x20); + nv_mask(ibus, 0x000200, 0x20, 0x20); - nv_wr32(priv, 0x12004c, 0x4); - nv_wr32(priv, 0x122204, 0x2); - nv_rd32(priv, 0x122204); + nv_wr32(ibus, 0x12004c, 0x4); + nv_wr32(ibus, 0x122204, 0x2); + nv_rd32(ibus, 0x122204); /* * Bug: increase clock timeout to avoid operation failure at high * gpcclk rate. */ - nv_wr32(priv, 0x122354, 0x800); - nv_wr32(priv, 0x128328, 0x800); - nv_wr32(priv, 0x124320, 0x800); + nv_wr32(ibus, 0x122354, 0x800); + nv_wr32(ibus, 0x128328, 0x800); + nv_wr32(ibus, 0x124320, 0x800); } static void gk20a_ibus_intr(struct nvkm_subdev *subdev) { - struct gk20a_ibus_priv *priv = (void *)subdev; - u32 status0 = nv_rd32(priv, 0x120058); + struct nvkm_ibus *ibus = (void *)subdev; + u32 status0 = nv_rd32(ibus, 0x120058); if (status0 & 0x7) { - nv_debug(priv, "resetting priv ring\n"); - gk20a_ibus_init_priv_ring(priv); + nv_debug(ibus, "resetting ibus ring\n"); + gk20a_ibus_init_ibus_ring(ibus); } /* Acknowledge interrupt */ - nv_mask(priv, 0x12004c, 0x2, 0x2); + nv_mask(ibus, 0x12004c, 0x2, 0x2); if (!nv_wait(subdev, 0x12004c, 0x3f, 0x00)) - nv_warn(priv, "timeout waiting for ringmaster ack\n"); + nv_warn(ibus, "timeout waiting for ringmaster ack\n"); } static int gk20a_ibus_init(struct nvkm_object *object) { - struct gk20a_ibus_priv *priv = (void *)object; + struct nvkm_ibus *ibus = (void *)object; int ret; ret = _nvkm_ibus_init(object); if (ret) return ret; - gk20a_ibus_init_priv_ring(priv); + gk20a_ibus_init_ibus_ring(ibus); return 0; } @@ -86,15 +82,15 @@ gk20a_ibus_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { - struct gk20a_ibus_priv *priv; + struct nvkm_ibus *ibus; int ret; - ret = nvkm_ibus_create(parent, engine, oclass, &priv); - *pobject = nv_object(priv); + ret = nvkm_ibus_create(parent, engine, oclass, &ibus); + *pobject = nv_object(ibus); if (ret) return ret; - nv_subdev(priv)->intr = gk20a_ibus_intr; + nv_subdev(ibus)->intr = gk20a_ibus_intr; return 0; } |