Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a7287ea authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/pm: track mr2 for gddr3 



There's some "extended" GDDR3 chipsets out there with EMRS2 settings that
change the layout of MRS/EMRS1 bitmaps.. Sigh.. Still need to track down
how exactly we're supposed to handle this.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarMartin Peres <martin.peres@labri.fr>
parent c57ebf5e

drivers/gpu/drm/nouveau/nouveau_mem.c

+4 −1
Original line number Diff line number Diff line
@@ -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: