diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-09-01 01:24:30 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 02:20:07 -0400 |
commit | de3a6c0a3b642c0c350414d63298a1b19a009290 (patch) | |
tree | 68bd8512acc01f46dd238105edfdb70b211f64ae /drivers/gpu/drm/nouveau/nv50_fifo.c | |
parent | b3beb167af0de6d7cb03aed0687eca645cfd06a6 (diff) |
drm/nouveau: rebase per-channel pramin heap offsets to 0
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_fifo.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_fifo.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c index 38dbcda8619..9201f35d827 100644 --- a/drivers/gpu/drm/nouveau/nv50_fifo.c +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c | |||
@@ -228,19 +228,19 @@ nv50_fifo_create_context(struct nouveau_channel *chan) | |||
228 | NV_DEBUG(dev, "ch%d\n", chan->id); | 228 | NV_DEBUG(dev, "ch%d\n", chan->id); |
229 | 229 | ||
230 | if (dev_priv->chipset == 0x50) { | 230 | if (dev_priv->chipset == 0x50) { |
231 | uint32_t ramin_poffset = chan->ramin->gpuobj->im_pramin->start; | 231 | ret = nouveau_gpuobj_new_fake(dev, chan->ramin->gpuobj->pinst, |
232 | uint32_t ramin_voffset = chan->ramin->gpuobj->im_backing_start; | 232 | chan->ramin->gpuobj->vinst, 0x100, |
233 | 233 | NVOBJ_FLAG_ZERO_ALLOC | | |
234 | ret = nouveau_gpuobj_new_fake(dev, ramin_poffset, ramin_voffset, | ||
235 | 0x100, NVOBJ_FLAG_ZERO_ALLOC | | ||
236 | NVOBJ_FLAG_ZERO_FREE, &ramfc, | 234 | NVOBJ_FLAG_ZERO_FREE, &ramfc, |
237 | &chan->ramfc); | 235 | &chan->ramfc); |
238 | if (ret) | 236 | if (ret) |
239 | return ret; | 237 | return ret; |
240 | 238 | ||
241 | ret = nouveau_gpuobj_new_fake(dev, ramin_poffset + 0x0400, | 239 | ret = nouveau_gpuobj_new_fake(dev, chan->ramin->gpuobj->pinst + |
242 | ramin_voffset + 0x0400, 4096, | 240 | 0x0400, |
243 | 0, NULL, &chan->cache); | 241 | chan->ramin->gpuobj->vinst + |
242 | 0x0400, 4096, 0, NULL, | ||
243 | &chan->cache); | ||
244 | if (ret) | 244 | if (ret) |
245 | return ret; | 245 | return ret; |
246 | } else { | 246 | } else { |