diff options
| author | Martin Peres <martin.peres@free.fr> | 2011-04-14 00:46:19 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-05-16 10:50:30 +1000 |
| commit | e614b2e7ca9f9946cede13b34c950b92af6fa7ef (patch) | |
| tree | d721917f2a547fd6f9471deb36bb23aceb569b70 /drivers/gpu/drm/nouveau/nouveau_mem.c | |
| parent | dac55b58253fe4ced44979543bde35d25eaf56dc (diff) | |
| download | kernel_samsung_smdk4412-e614b2e7ca9f9946cede13b34c950b92af6fa7ef.zip kernel_samsung_smdk4412-e614b2e7ca9f9946cede13b34c950b92af6fa7ef.tar.gz kernel_samsung_smdk4412-e614b2e7ca9f9946cede13b34c950b92af6fa7ef.tar.bz2 | |
drm/nouveau: Associate memtimings with performance levels on cards <= nv98
v2 (Ben Skeggs): fix ramcfg strap, and remove bogus handling of perf 0x40
Signed-off-by: Martin Peres <martin.peres@ensi-bourges.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index ce3cb5e..2960f58 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c @@ -704,6 +704,7 @@ nouveau_mem_timing_init(struct drm_device *dev) /* XXX: reg_100240? */ } + timing->id = i; NV_DEBUG(dev, "Entry %d: 220: %08x %08x %08x %08x\n", i, timing->reg_100220, timing->reg_100224, @@ -715,7 +716,7 @@ nouveau_mem_timing_init(struct drm_device *dev) } memtimings->nr_timing = entries; - memtimings->supported = true; + memtimings->supported = (dev_priv->chipset <= 0x98); } void |