From b24d3c2c4a88d8e7fc63d8de7019bbbc9d18b754 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 13 Sep 2010 09:58:37 +1000 Subject: [PATCH] --- yaml --- r: 218197 b: refs/heads/master c: b6fd780791e9189b781e27a443d47bd21ce5145f h: refs/heads/master i: 218195: 16060d028a995f766e2fac6b95e66f1b5029510d v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6718e49633f7..353236035039 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17b20348ea94a92a54898c518b514c564d12e4c3 +refs/heads/master: b6fd780791e9189b781e27a443d47bd21ce5145f diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c index c0b79659419b..7f028fee7a58 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c @@ -242,7 +242,7 @@ nouveau_sgdma_init(struct drm_device *dev) } dev_priv->gart_info.sg_dummy_page = - alloc_page(GFP_KERNEL|__GFP_DMA32); + alloc_page(GFP_KERNEL|__GFP_DMA32|__GFP_ZERO); if (!dev_priv->gart_info.sg_dummy_page) { nouveau_gpuobj_ref(NULL, &gpuobj); return -ENOMEM;