From f014e3d1e239e578e720689a3af425842bbe51ff Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 23 Sep 2010 15:23:16 +1000 Subject: [PATCH] --- yaml --- r: 218216 b: refs/heads/master c: 9bb5863ab4c2bad487e9d02fabde60e858c22411 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d24634bbc45b..373621fde1d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5220b3c14b5d4e35df5a4574534519d7007713c3 +refs/heads/master: 9bb5863ab4c2bad487e9d02fabde60e858c22411 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c index c900aaa5cffa..2148e2d73de3 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -912,7 +912,7 @@ nouveau_ttm_fault_reserve_notify(struct ttm_buffer_object *bo) * nothing to do here. */ if (bo->mem.mem_type != TTM_PL_VRAM) { - if (dev_priv->chipset < NV_50 || !nvbo->tile_flags) + if (dev_priv->card_type < NV_50 || !nvbo->tile_flags) return 0; }