diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 07:54:09 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 05:40:17 +0300 |
| commit | b958bf916d34f35639048361f7d87334770ebf4d (patch) | |
| tree | 8245c749fbcd86fee44424c30715db8444b5843a /drivers/gpu/drm/nouveau/nvkm/engine/cipher | |
| parent | 29e9f51094316879c4602795167e9635e18a3c8b (diff) | |
| download | linux-b958bf916d34f35639048361f7d87334770ebf4d.tar.xz | |
drm/nouveau/cipher: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/cipher')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c b/drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c index 442c2a002c63..b6b05a7dcae9 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c @@ -108,10 +108,11 @@ g84_cipher_intr(struct nvkm_subdev *subdev) struct nvkm_engine *engine = nv_engine(subdev); struct nvkm_object *engctx; struct nvkm_engine *cipher = (void *)subdev; - u32 stat = nv_rd32(cipher, 0x102130); - u32 mthd = nv_rd32(cipher, 0x102190); - u32 data = nv_rd32(cipher, 0x102194); - u32 inst = nv_rd32(cipher, 0x102188) & 0x7fffffff; + struct nvkm_device *device = cipher->subdev.device; + u32 stat = nvkm_rd32(device, 0x102130); + u32 mthd = nvkm_rd32(device, 0x102190); + u32 data = nvkm_rd32(device, 0x102194); + u32 inst = nvkm_rd32(device, 0x102188) & 0x7fffffff; int chid; engctx = nvkm_engctx_get(engine, inst); @@ -125,8 +126,8 @@ g84_cipher_intr(struct nvkm_subdev *subdev) mthd, data); } - nv_wr32(cipher, 0x102130, stat); - nv_wr32(cipher, 0x10200c, 0x10); + nvkm_wr32(device, 0x102130, stat); + nvkm_wr32(device, 0x10200c, 0x10); nvkm_engctx_put(engctx); } @@ -156,15 +157,16 @@ static int g84_cipher_init(struct nvkm_object *object) { struct nvkm_engine *cipher = (void *)object; + struct nvkm_device *device = cipher->subdev.device; int ret; ret = nvkm_engine_init(cipher); if (ret) return ret; - nv_wr32(cipher, 0x102130, 0xffffffff); - nv_wr32(cipher, 0x102140, 0xffffffbf); - nv_wr32(cipher, 0x10200c, 0x00000010); + nvkm_wr32(device, 0x102130, 0xffffffff); + nvkm_wr32(device, 0x102140, 0xffffffbf); + nvkm_wr32(device, 0x10200c, 0x00000010); return 0; } |