From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932837AbbGHHN4 (ORCPT ); Wed, 8 Jul 2015 03:13:56 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:3654 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932792AbbGHHNt (ORCPT ); Wed, 8 Jul 2015 03:13:49 -0400 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Wed, 08 Jul 2015 00:13:49 -0700 From: Alexandre Courbot To: Ben Skeggs , nouveau@lists.freedesktop.org CC: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, gnurou@gmail.com, Alexandre Courbot Subject: [PATCH] nouveau/ttm: fix tiled system memory with Maxwell Date: Wed, 8 Jul 2015 16:13:43 +0900 Message-ID: <1436339623-27054-1-git-send-email-acourbot@nvidia.com> X-Mailer: git-send-email 2.4.4 X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drm/nouveau/nouveau_ttm.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drm/nouveau/nouveau_ttm.c b/drm/nouveau/nouveau_ttm.c index 18f449715788..69bec1058039 100644 --- a/drm/nouveau/nouveau_ttm.c +++ b/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", + drm->device.info.family); break; } -- 2.4.4