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

Commit eb48b12e authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

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: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 697bb728

drivers/gpu/drm/nouveau/nouveau_ttm.c

+9 −0
Original line number Diff line number Diff line
@@ -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;

	}