diff options
| author | Alexandre Courbot | 2015-07-09 10:15:14 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2015-07-28 09:22:13 +0200 |
| commit | eb48b12ee5e05dd3ea473d008873f5228a63eb7a (patch) | |
| tree | 3a956a8488c05d13110145f6d9db88e67858f0ae /drivers/gpu/drm/nouveau/nouveau_ttm.c | |
| parent | drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads (diff) | |
| download | kernel-qcow2-linux-eb48b12ee5e05dd3ea473d008873f5228a63eb7a.tar.gz kernel-qcow2-linux-eb48b12ee5e05dd3ea473d008873f5228a63eb7a.tar.xz kernel-qcow2-linux-eb48b12ee5e05dd3ea473d008873f5228a63eb7a.zip | |
drm/nouveau/nouveau/ttm: fix tiled system memory with Maxwell
Add Maxwell to the switch statement that sets node->memtype, otherwise
all tiling information is ignored for buffers in system memory.
While we are at it, make that switch statement explicitly complain the
next time we meet a non-handled card family.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_ttm.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index 18f449715788..7464aef34674 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -175,15 +175,24 @@ nouveau_gart_manager_new(struct ttm_mem_type_manager *man, node->page_shift = 12; switch (drm->device.info.family) { + case NV_DEVICE_INFO_V0_TNT: + case NV_DEVICE_INFO_V0_CELSIUS: + case NV_DEVICE_INFO_V0_KELVIN: + case NV_DEVICE_INFO_V0_RANKINE: + case NV_DEVICE_INFO_V0_CURIE: + break; case NV_DEVICE_INFO_V0_TESLA: if (drm->device.info.chipset != 0x50) node->memtype = (nvbo->tile_flags & 0x7f00) >> 8; break; case NV_DEVICE_INFO_V0_FERMI: case NV_DEVICE_INFO_V0_KEPLER: + case NV_DEVICE_INFO_V0_MAXWELL: node->memtype = (nvbo->tile_flags & 0xff00) >> 8; break; default: + NV_WARN(drm, "%s: unhandled family type %x\n", __func__, + drm->device.info.family); break; } |