From a7ad12110549e3610ebb1035364ff1f8ffb5ae6a Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 24 Jan 2012 10:24:05 +1000 Subject: [PATCH] --- yaml --- r: 293745 b: refs/heads/master c: 1a7287ea6f37c930a092123f6584b0b24cfe2d13 h: refs/heads/master i: 293743: bb034dc1390da5b4db4799644a7e303809a426f6 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_mem.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c4b7b1287a32..d7e54106d56c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c57ebf5ef3588d21031f12e39131d79071269845 +refs/heads/master: 1a7287ea6f37c930a092123f6584b0b24cfe2d13 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_mem.c b/trunk/drivers/gpu/drm/nouveau/nouveau_mem.c index cf82f17cf03a..3d43098de25b 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -766,8 +766,10 @@ nouveau_mem_gddr3_mr(struct drm_device *dev, u32 freq, t->mr[1] = (boot->mr[1] & 0x100f40) | t->drive_strength | (t->odt << 2) | (nv_mem_wr_lut_gddr3[e->tWR] & 0xf) << 4; + t->mr[2] = boot->mr[2]; - NV_DEBUG(dev, "(%u) MR: %08x %08x", t->id, t->mr[0], t->mr[1]); + NV_DEBUG(dev, "(%u) MR: %08x %08x %08x", t->id, + t->mr[0], t->mr[1], t->mr[2]); return 0; } @@ -963,6 +965,7 @@ nouveau_mem_exec(struct nouveau_mem_exec_func *exec, /* fetch current MRs */ switch (dev_priv->vram_type) { + case NV_MEM_TYPE_GDDR3: case NV_MEM_TYPE_DDR3: mr[2] = exec->mrg(exec, 2); default: