From 0ef9267d4538e82cd29abc8e413e82d47b0b3e48 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 19 Mar 2010 12:49:59 +1000 Subject: [PATCH] --- yaml --- r: 189689 b: refs/heads/master c: 494ab824f179ddeb2022cbb1d25aee41ab46ee9b h: refs/heads/master i: 189687: 36786b6c7007b4ee2bbb0f88f215598ac31cf1d3 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv50_instmem.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a07d3d828c8c..a82e18918c10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2eb92c80074ecfbc691741720382007417f64523 +refs/heads/master: 494ab824f179ddeb2022cbb1d25aee41ab46ee9b diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_instmem.c b/trunk/drivers/gpu/drm/nouveau/nv50_instmem.c index 34280eb31df3..5f21df31f3aa 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv50_instmem.c +++ b/trunk/drivers/gpu/drm/nouveau/nv50_instmem.c @@ -63,9 +63,10 @@ nv50_instmem_init(struct drm_device *dev) struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_channel *chan; uint32_t c_offset, c_size, c_ramfc, c_vmpd, c_base, pt_size; + uint32_t save_nv001700; + uint64_t v; struct nv50_instmem_priv *priv; int ret, i; - uint32_t v, save_nv001700; priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) @@ -184,8 +185,8 @@ nv50_instmem_init(struct drm_device *dev) i = 0; while (v < dev_priv->vram_sys_base + c_offset + c_size) { - BAR0_WI32(priv->pramin_pt->gpuobj, i + 0, v); - BAR0_WI32(priv->pramin_pt->gpuobj, i + 4, 0x00000000); + BAR0_WI32(priv->pramin_pt->gpuobj, i + 0, lower_32_bits(v)); + BAR0_WI32(priv->pramin_pt->gpuobj, i + 4, upper_32_bits(v)); v += 0x1000; i += 8; }