diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 07:54:21 +0300 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 05:40:44 +0300 |
commit | 54dcadd5b65e12f851ff80af4afef606040ad8b9 (patch) | |
tree | cf82a7cd2909fe75a2dd219320e011cc7b806d53 /drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c | |
parent | 70bc7182cbf1bb07e414bbb553890ddf1b540264 (diff) | |
download | linux-54dcadd5b65e12f851ff80af4afef606040ad8b9.tar.xz |
drm/nouveau/mc: convert to new-style nvkm_subdev
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c index 77110ea019ea..a843e3689c3c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c @@ -958,7 +958,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) const struct gf100_grctx_func *grctx = gr->func->grctx; int i; - nvkm_mc(gr)->unk260(nvkm_mc(gr), 0); + nvkm_mc_unk260(device->mc, 0); gf100_gr_mmio(gr, grctx->hub); gf100_gr_mmio(gr, grctx->gpc); @@ -988,7 +988,7 @@ gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info) gf100_gr_icmd(gr, grctx->icmd); nvkm_wr32(device, 0x404154, 0x00000400); gf100_gr_mthd(gr, grctx->mthd); - nvkm_mc(gr)->unk260(nvkm_mc(gr), 1); + nvkm_mc_unk260(device->mc, 1); nvkm_mask(device, 0x418800, 0x00200000, 0x00200000); nvkm_mask(device, 0x41be10, 0x00800000, 0x00800000); |