From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Subject: [PATCH v2] drm/i915: Add null state batch to active list
Date: Wed, 21 May 2014 15:59:56 +0300
Message-ID: <1400677196-3234-1-git-send-email-mika.kuoppala@intel.com>
References: <20140521122254.GQ27580@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga03.intel.com (mga03.intel.com [143.182.124.21])
 by gabe.freedesktop.org (Postfix) with ESMTP id 3EC616EA48
 for <intel-gfx@lists.freedesktop.org>; Wed, 21 May 2014 06:00:06 -0700 (PDT)
In-Reply-To: <20140521122254.GQ27580@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: miku@iki.fi
List-Id: intel-gfx@lists.freedesktop.org

Zm9yIHByb3BlciByZWZjb3VudGluZyB0byB0YWtlIHBsYWNlIGFzIHdlIHVzZQppOTE1X2FkZF9y
ZXF1ZXN0KCkgZm9yIGl0LgoKaTkxNV9hZGRfcmVxdWVzdCgpIGFsc28gdGFrZXMgdGhlIGNvbnRl
eHQgZm9yIHRoZSByZXF1ZXN0CmZyb20gcmluZy0+bGFzdF9jb250ZXh0IHNvIG1vdmUgdGhlIG51
bGwgc3RhdGUgYmF0Y2gKc3VibWlzc2lvbiBhZnRlciB0aGUgcmluZyBjb250ZXh0IGhhcyBiZWVu
IHNldC4KCnYyOiB3ZSBuZWVkIHRvIGNoZWNrIGZvciBjb3JyZWN0IHJpbmcgbm93IChWaWxsZSBT
eXJqw6Rsw6QpCgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs
LmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogRGFt
aWVuIExlc3BpYXUgPGRhbWllbi5sZXNwaWF1QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWlr
YSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgICAgfCAgICAzICsrKwogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgICAgfCAgICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyAgICAgIHwgICAxNiArKysrKysrKy0tLS0tLS0tCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyB8ICAgMTAgKysrKysr
KystLQogNCBmaWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkK
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBiOTBlYzY5Li42ODgxZjcwIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZHJ2LmgKQEAgLTIyMDQsNiArMjIwNCw5IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBp
OTE1X2dlbV9vYmplY3RfdW5waW5fcGFnZXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i
aikKIGludCBfX211c3RfY2hlY2sgaTkxNV9tdXRleF9sb2NrX2ludGVycnVwdGlibGUoc3RydWN0
IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1fb2JqZWN0X3N5bmMoc3RydWN0IGRybV9p
OTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCSBzdHJ1Y3QgaW50ZWxfcmluZ19idWZmZXIgKnRvKTsK
K3ZvaWQgaTkxNV9nZW1fb2JqZWN0X21vdmVfdG9fYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9nZW1f
b2JqZWN0ICpvYmosCisJCQkJICAgIHN0cnVjdCBpbnRlbF9yaW5nX2J1ZmZlciAqcmluZyk7Cit2
b2lkIGk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2luYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9nZW1f
b2JqZWN0ICpvYmopOwogdm9pZCBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShzdHJ1Y3QgaTkxNV92
bWEgKnZtYSwKIAkJCSAgICAgc3RydWN0IGludGVsX3JpbmdfYnVmZmVyICpyaW5nKTsKIGludCBp
OTE1X2dlbV9kdW1iX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiwKZGlmZiAtLWdp
dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2dlbS5jCmluZGV4IDQ0MDk3OWYuLmQ3OTU4MDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n
ZW0uYwpAQCAtMjAzOCw3ICsyMDM4LDcgQEAgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhzdHJ1
Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgdm9p
ZAordm9pZAogaTkxNV9nZW1fb2JqZWN0X21vdmVfdG9fYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9n
ZW1fb2JqZWN0ICpvYmosCiAJCQkgICAgICAgc3RydWN0IGludGVsX3JpbmdfYnVmZmVyICpyaW5n
KQogewpAQCAtMjA4NCw3ICsyMDg0LDcgQEAgdm9pZCBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShz
dHJ1Y3QgaTkxNV92bWEgKnZtYSwKIAlyZXR1cm4gaTkxNV9nZW1fb2JqZWN0X21vdmVfdG9fYWN0
aXZlKHZtYS0+b2JqLCByaW5nKTsKIH0KIAotc3RhdGljIHZvaWQKK3ZvaWQKIGk5MTVfZ2VtX29i
amVjdF9tb3ZlX3RvX2luYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiB7
CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gb2JqLT5iYXNlLmRldi0+ZGV2
X3ByaXZhdGU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250
ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggZjIy
MGM5NC4uNmEyZDg0N2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt
X2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMK
QEAgLTcwMCwyMSArNzAwLDIxIEBAIHN0YXRpYyBpbnQgZG9fc3dpdGNoKHN0cnVjdCBpbnRlbF9y
aW5nX2J1ZmZlciAqcmluZywKIAkJLyogb2JqIGlzIGtlcHQgYWxpdmUgdW50aWwgdGhlIG5leHQg
cmVxdWVzdCBieSBpdHMgYWN0aXZlIHJlZiAqLwogCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBp
bihmcm9tLT5vYmopOwogCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKGZyb20pOwotCX0g
ZWxzZSB7Ci0JCWlmICh0by0+aXNfaW5pdGlhbGl6ZWQgPT0gZmFsc2UpIHsKLQkJCXJldCA9IGk5
MTVfZ2VtX3JlbmRlcl9zdGF0ZV9pbml0KHJpbmcpOwotCQkJaWYgKHJldCkKLQkJCQlEUk1fRVJS
T1IoImluaXQgcmVuZGVyIHN0YXRlOiAlZFxuIiwgcmV0KTsKLQkJfQogCX0KIAotCXRvLT5pc19p
bml0aWFsaXplZCA9IHRydWU7Ci0KIGRvbmU6CiAJaTkxNV9nZW1fY29udGV4dF9yZWZlcmVuY2Uo
dG8pOwogCXJpbmctPmxhc3RfY29udGV4dCA9IHRvOwogCXRvLT5sYXN0X3JpbmcgPSByaW5nOwog
CisJaWYgKHJpbmctPmlkID09IFJDUyAmJiAhdG8tPmlzX2luaXRpYWxpemVkICYmIGZyb20gPT0g
TlVMTCkgeworCQlyZXQgPSBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfaW5pdChyaW5nKTsKKwkJaWYg
KHJldCkKKwkJCURSTV9FUlJPUigiaW5pdCByZW5kZXIgc3RhdGU6ICVkXG4iLCByZXQpOworCX0K
KworCXRvLT5pc19pbml0aWFsaXplZCA9IHRydWU7CisKIAlyZXR1cm4gMDsKIAogdW5waW5fb3V0
OgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRl
LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwppbmRleCAz
OTJhYTdiLi40NjNmZmYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl
bV9yZW5kZXJfc3RhdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5k
ZXJfc3RhdGUuYwpAQCAtMTY0LDkgKzE2NCwxMSBAQCBpbnQgaTkxNV9nZW1fcmVuZGVyX3N0YXRl
X2luaXQoc3RydWN0IGludGVsX3JpbmdfYnVmZmVyICpyaW5nKQogCWNvbnN0IGludCBnZW4gPSBJ
TlRFTF9JTkZPKHJpbmctPmRldiktPmdlbjsKIAlzdHJ1Y3QgaTkxNV9yZW5kZXJfc3RhdGUgKnNv
OwogCWNvbnN0IHN0cnVjdCBpbnRlbF9yZW5kZXJzdGF0ZV9yb2RhdGEgKnJvZGF0YTsKLQl1MzIg
c2Vxbm87CiAJaW50IHJldDsKIAorCWlmIChXQVJOX09OKHJpbmctPmlkICE9IFJDUykpCisJCXJl
dHVybiAtRU5PRU5UOworCiAJcm9kYXRhID0gcmVuZGVyX3N0YXRlX2dldF9yb2RhdGEocmluZy0+
ZGV2LCBnZW4pOwogCWlmIChyb2RhdGEgPT0gTlVMTCkKIAkJcmV0dXJuIDA7CkBAIC0xODYsNyAr
MTg4LDExIEBAIGludCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfaW5pdChzdHJ1Y3QgaW50ZWxfcmlu
Z19idWZmZXIgKnJpbmcpCiAJaWYgKHJldCkKIAkJZ290byBvdXQ7CiAKLQlyZXQgPSBpOTE1X2Fk
ZF9yZXF1ZXN0KHJpbmcsICZzZXFubyk7CisJaTkxNV9nZW1fb2JqZWN0X21vdmVfdG9fYWN0aXZl
KHNvLT5vYmosIHJpbmcpOworCisJcmV0ID0gX19pOTE1X2FkZF9yZXF1ZXN0KHJpbmcsIE5VTEws
IHNvLT5vYmosIE5VTEwpOworCWlmIChyZXQpCisJCWk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2lu
YWN0aXZlKHNvLT5vYmopOwogCiBvdXQ6CiAJcmVuZGVyX3N0YXRlX2ZyZWUoc28pOwotLSAKMS43
LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50
ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6
Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK