Patchwork drm/nouveau: fix booting with plymouth + dumb support

login
register
mail settings
Submitter Colin King
Date Sept. 27, 2012, 9:26 a.m.
Message ID <1348737997-6025-2-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/187317/
State New
Headers show

Comments

Colin King - Sept. 27, 2012, 9:26 a.m.
From: Dave Airlie <airlied@redhat.com>

We noticed a plymouth bug on Fedora 18, and I then
noticed this stupid thinko, fixing it fixed the problem
with plymouth.

Cc: stable@vger.kernel.org
Acked-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
BugLink: BugLink: http://bugs.launchpad.net/bugs/1043518
(cherry-picked from commit 610bd7da160f76f1644ecb4cd7f39511b49a22cc)
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/gpu/drm/nouveau/nouveau_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Tim Gardner - Sept. 27, 2012, 12:28 p.m.

Patch

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 69688ef..7e16dc5 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -598,7 +598,7 @@  nouveau_display_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
 	args->size = args->pitch * args->height;
 	args->size = roundup(args->size, PAGE_SIZE);
 
-	ret = nouveau_gem_new(dev, args->size, 0, TTM_PL_FLAG_VRAM, 0, 0, &bo);
+	ret = nouveau_gem_new(dev, args->size, 0, NOUVEAU_GEM_DOMAIN_VRAM, 0, 0, &bo);
 	if (ret)
 		return ret;