[Nouveau] [PATCH 2/2] accel_common: use scanout variable over checking the usage_hint every time

Emil Velikov emil.l.velikov at gmail.com
Tue Sep 9 07:47:32 PDT 2014


Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/nv_accel_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nv_accel_common.c b/src/nv_accel_common.c
index eebb0ab..a2557e0 100644
--- a/src/nv_accel_common.c
+++ b/src/nv_accel_common.c
@@ -91,7 +91,7 @@ nouveau_allocate_surface(ScrnInfoPtr scrn, int width, int height, int bpp,
 
 			if (usage_hint & NOUVEAU_CREATE_PIXMAP_ZETA)
 				cfg.nv50.memtype = (bpp == 16) ? 0x16c : 0x128;
-			else if (usage_hint & NOUVEAU_CREATE_PIXMAP_SCANOUT)
+			else if (scanout)
 				cfg.nv50.memtype = (bpp == 16) ? 0x070 : 0x07a;
 			else
 				cfg.nv50.memtype = 0x070;
@@ -117,7 +117,7 @@ nouveau_allocate_surface(ScrnInfoPtr scrn, int width, int height, int bpp,
 			cfg.nv04.surf_flags |= NV04_BO_ZETA;
 	}
 
-	if (usage_hint & NOUVEAU_CREATE_PIXMAP_SCANOUT)
+	if (scanout)
 		flags |= NOUVEAU_BO_CONTIG;
 
 	ret = nouveau_bo_new(pNv->dev, flags, 0, *pitch * height, &cfg, bo);
-- 
2.1.0



More information about the Nouveau mailing list