renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-06 04:33:58 +08:00
Code

drm/nouveau/cipher: switch to device pri macros

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:09 +10:00
parent 29e9f51094
commit b958bf916d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c
View File

@ -108,10 +108,11 @@ g84_cipher_intr(struct nvkm_subdev *subdev)
struct nvkm_engine *engine = nv_engine(subdev); struct nvkm_engine *engine = nv_engine(subdev);
struct nvkm_object *engctx; struct nvkm_object *engctx;
struct nvkm_engine *cipher = (void *)subdev; struct nvkm_engine *cipher = (void *)subdev;
u32 stat = nv_rd32(cipher, 0x102130); struct nvkm_device *device = cipher->subdev.device;
u32 mthd = nv_rd32(cipher, 0x102190); u32 stat = nvkm_rd32(device, 0x102130);
u32 data = nv_rd32(cipher, 0x102194); u32 mthd = nvkm_rd32(device, 0x102190);
u32 inst = nv_rd32(cipher, 0x102188) & 0x7fffffff; u32 data = nvkm_rd32(device, 0x102194);
u32 inst = nvkm_rd32(device, 0x102188) & 0x7fffffff;
int chid; int chid;
engctx = nvkm_engctx_get(engine, inst); engctx = nvkm_engctx_get(engine, inst);
@ -125,8 +126,8 @@ g84_cipher_intr(struct nvkm_subdev *subdev)
mthd, data); mthd, data);
} }
nv_wr32(cipher, 0x102130, stat); nvkm_wr32(device, 0x102130, stat);
nv_wr32(cipher, 0x10200c, 0x10); nvkm_wr32(device, 0x10200c, 0x10);
nvkm_engctx_put(engctx); nvkm_engctx_put(engctx);
} }
@ -156,15 +157,16 @@ static int
g84_cipher_init(struct nvkm_object *object) g84_cipher_init(struct nvkm_object *object)
{ {
struct nvkm_engine *cipher = (void *)object; struct nvkm_engine *cipher = (void *)object;
struct nvkm_device *device = cipher->subdev.device;
int ret; int ret;
ret = nvkm_engine_init(cipher); ret = nvkm_engine_init(cipher);
if (ret) if (ret)
return ret; return ret;
nv_wr32(cipher, 0x102130, 0xffffffff); nvkm_wr32(device, 0x102130, 0xffffffff);
nv_wr32(cipher, 0x102140, 0xffffffbf); nvkm_wr32(device, 0x102140, 0xffffffbf);
nv_wr32(cipher, 0x10200c, 0x00000010); nvkm_wr32(device, 0x10200c, 0x00000010);
return 0; return 0;
} }