From 6ca4ae441c61b1f425453cc443bb1d4d10d25aaa Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 23 Jun 2013 23:41:57 +0100
Subject: [PATCH] sna: Check for a request to create an inactive scanout

The combination is just about valid and used along some odd paths, so
replace the assertion with a regular checks.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/kgem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 76f393d9..8e056d32 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -3665,8 +3665,7 @@ struct kgem_bo *kgem_create_2d(struct kgem *kgem,
 	size /= PAGE_SIZE;
 	bucket = cache_bucket(size);
 
-	if (flags & CREATE_SCANOUT) {
-		assert((flags & CREATE_INACTIVE) == 0);
+	if ((flags & (CREATE_SCANOUT | CREATE_INACTIVE)) == CREATE_SCANOUT) {
 		list_for_each_entry_reverse(bo, &kgem->scanout, list) {
 			assert(bo->scanout);
 			assert(bo->delta);