Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753100AbbGIIQt (ORCPT ); Thu, 9 Jul 2015 04:16:49 -0400 Received: from mail-oi0-f54.google.com ([209.85.218.54]:32793 "EHLO mail-oi0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752043AbbGIIQ2 (ORCPT ); Thu, 9 Jul 2015 04:16:28 -0400 MIME-Version: 1.0 In-Reply-To: <1436339623-27054-1-git-send-email-acourbot@nvidia.com> References: <1436339623-27054-1-git-send-email-acourbot@nvidia.com> From: Alexandre Courbot Date: Thu, 9 Jul 2015 17:16:08 +0900 Message-ID: Subject: Re: [PATCH] nouveau/ttm: fix tiled system memory with Maxwell To: Alexandre Courbot Cc: Ben Skeggs , "nouveau@lists.freedesktop.org" , "linux-tegra@vger.kernel.org" , Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2042 Lines: 53 Withdrawing this patch which triggered a warning due to a missing argument to NV_WARN. Sent v2 which addresses this. Sorry for the noise. On Wed, Jul 8, 2015 at 4:13 PM, Alexandre Courbot wrote: > 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/