These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / engine / gr / ctxnv40.h

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h
index 8a89961..50e808e 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv40.h
@@ -9,7 +9,8 @@ struct nvkm_grctx {
                NVKM_GRCTX_PROG,
                NVKM_GRCTX_VALS
        } mode;
-       void *data;
+       u32 *ucode;
+       struct nvkm_gpuobj *data;
 
        u32 ctxprog_max;
        u32 ctxprog_len;
@@ -22,7 +23,7 @@ struct nvkm_grctx {
 static inline void
 cp_out(struct nvkm_grctx *ctx, u32 inst)
 {
-       u32 *ctxprog = ctx->data;
+       u32 *ctxprog = ctx->ucode;
 
        if (ctx->mode != NVKM_GRCTX_PROG)
                return;
@@ -56,7 +57,7 @@ cp_ctx(struct nvkm_grctx *ctx, u32 reg, u32 length)
 static inline void
 cp_name(struct nvkm_grctx *ctx, int name)
 {
-       u32 *ctxprog = ctx->data;
+       u32 *ctxprog = ctx->ucode;
        int i;
 
        if (ctx->mode != NVKM_GRCTX_PROG)
@@ -124,6 +125,6 @@ gr_def(struct nvkm_grctx *ctx, u32 reg, u32 val)
        reg = (reg - 0x00400000) / 4;
        reg = (reg - ctx->ctxprog_reg) + ctx->ctxvals_base;
 
-       nv_wo32(ctx->data, reg * 4, val);
+       nvkm_wo32(ctx->data, reg * 4, val);
 }
 #endif