aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv17_fence.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-05-17 11:13:37 +1000
committerBen Skeggs <bskeggs@redhat.com>2017-02-17 15:15:04 +1000
commit605f9ccd7d0ad603d8df9301f3f400be5d8081d9 (patch)
tree0f043ae38e9ea059d466ae47965a7fa5fdb362db /drivers/gpu/drm/nouveau/nv17_fence.c
parentdrm/nouveau: allocate device object for every client (diff)
downloadlinux-dev-605f9ccd7d0ad603d8df9301f3f400be5d8081d9.tar.xz
linux-dev-605f9ccd7d0ad603d8df9301f3f400be5d8081d9.zip
drm/nouveau: s/mem/reg/ for struct ttm_mem_reg variables
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv17_fence.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv17_fence.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv17_fence.c b/drivers/gpu/drm/nouveau/nv17_fence.c
index 5aeda1427ae3..6477b7069e14 100644
--- a/drivers/gpu/drm/nouveau/nv17_fence.c
+++ b/drivers/gpu/drm/nouveau/nv17_fence.c
@@ -76,9 +76,9 @@ nv17_fence_context_new(struct nouveau_channel *chan)
{
struct nv10_fence_priv *priv = chan->drm->fence;
struct nv10_fence_chan *fctx;
- struct ttm_mem_reg *mem = &priv->bo->bo.mem;
- u32 start = mem->start * PAGE_SIZE;
- u32 limit = start + mem->size - 1;
+ struct ttm_mem_reg *reg = &priv->bo->bo.mem;
+ u32 start = reg->start * PAGE_SIZE;
+ u32 limit = start + reg->size - 1;
int ret = 0;
fctx = chan->fence = kzalloc(sizeof(*fctx), GFP_KERNEL);