diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_evo.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_evo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c b/drivers/gpu/drm/nouveau/nv50_evo.c index 18c61929c450..9bba97f15b04 100644 --- a/drivers/gpu/drm/nouveau/nv50_evo.c +++ b/drivers/gpu/drm/nouveau/nv50_evo.c | |||
@@ -154,7 +154,7 @@ nv50_evo_channel_init(struct nouveau_channel *evo) | |||
154 | { | 154 | { |
155 | struct drm_device *dev = evo->dev; | 155 | struct drm_device *dev = evo->dev; |
156 | int id = evo->id, ret, i; | 156 | int id = evo->id, ret, i; |
157 | u64 pushbuf = evo->pushbuf_bo->bo.mem.start << PAGE_SHIFT; | 157 | u64 pushbuf = evo->pushbuf_bo->bo.offset; |
158 | u32 tmp; | 158 | u32 tmp; |
159 | 159 | ||
160 | tmp = nv_rd32(dev, NV50_PDISPLAY_EVO_CTRL(id)); | 160 | tmp = nv_rd32(dev, NV50_PDISPLAY_EVO_CTRL(id)); |
@@ -335,13 +335,12 @@ nv50_evo_create(struct drm_device *dev) | |||
335 | ret = nouveau_bo_new(dev, NULL, 4096, 0x1000, TTM_PL_FLAG_VRAM, | 335 | ret = nouveau_bo_new(dev, NULL, 4096, 0x1000, TTM_PL_FLAG_VRAM, |
336 | 0, 0x0000, &dispc->sem.bo); | 336 | 0, 0x0000, &dispc->sem.bo); |
337 | if (!ret) { | 337 | if (!ret) { |
338 | offset = dispc->sem.bo->bo.mem.start << PAGE_SHIFT; | ||
339 | |||
340 | ret = nouveau_bo_pin(dispc->sem.bo, TTM_PL_FLAG_VRAM); | 338 | ret = nouveau_bo_pin(dispc->sem.bo, TTM_PL_FLAG_VRAM); |
341 | if (!ret) | 339 | if (!ret) |
342 | ret = nouveau_bo_map(dispc->sem.bo); | 340 | ret = nouveau_bo_map(dispc->sem.bo); |
343 | if (ret) | 341 | if (ret) |
344 | nouveau_bo_ref(NULL, &dispc->sem.bo); | 342 | nouveau_bo_ref(NULL, &dispc->sem.bo); |
343 | offset = dispc->sem.bo->bo.offset; | ||
345 | } | 344 | } |
346 | 345 | ||
347 | if (ret) | 346 | if (ret) |