From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: [PATCH v3] drm/i915: Add null state batch to active list Date: Wed, 21 May 2014 17:02:56 +0300 Message-ID: <1400680976-19107-1-git-send-email-mika.kuoppala@intel.com> References: <20140521130602.GA12436@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id D851F6E294 for ; Wed, 21 May 2014 07:03:01 -0700 (PDT) In-Reply-To: <20140521130602.GA12436@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: miku@iki.fi List-Id: intel-gfx@lists.freedesktop.org Zm9yIHByb3BlciByZWZjb3VudGluZyB0byB0YWtlIHBsYWNlIGFzIHdlIHVzZQppOTE1X2FkZF9y ZXF1ZXN0KCkgZm9yIGl0LgoKaTkxNV9hZGRfcmVxdWVzdCgpIGFsc28gdGFrZXMgdGhlIGNvbnRl eHQgZm9yIHRoZSByZXF1ZXN0CmZyb20gcmluZy0+bGFzdF9jb250ZXh0IHNvIG1vdmUgdGhlIG51 bGwgc3RhdGUgYmF0Y2gKc3VibWlzc2lvbiBhZnRlciB0aGUgcmluZyBjb250ZXh0IGhhcyBiZWVu IHNldC4KCnYyOiB3ZSBuZWVkIHRvIGNoZWNrIGZvciBjb3JyZWN0IHJpbmcgbm93IChWaWxsZSBT eXJqw6Rsw6QpCnYzOiBubyBuZWVkIHRvIGV4cG9zZSBpOTE1X2dlbV9tb3ZlX29iamVjdF90b19h Y3RpdmUgKENocmlzIFdpbHNvbikKCkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFA bGludXguaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+CkNjOiBEYW1pZW4gTGVzcGlhdSA8ZGFtaWVuLmxlc3BpYXVAaW50ZWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgICB8ICAgIDEgKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgICAgfCAgICAyICstCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAgICB8ICAgMTYgKysrKysrKystLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgfCAgIDE3 ICsrKysrKysrKysrKysrKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDEx IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGI5MGVjNjkuLjBiZjdi ZmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjIwNiw2ICsyMjA2LDcgQEAgaW50IGk5 MTVfZ2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQkg c3RydWN0IGludGVsX3JpbmdfYnVmZmVyICp0byk7CiB2b2lkIGk5MTVfdm1hX21vdmVfdG9fYWN0 aXZlKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQkJICAgICBzdHJ1Y3QgaW50ZWxfcmluZ19idWZm ZXIgKnJpbmcpOwordm9pZCBpOTE1X2dlbV9vYmplY3RfbW92ZV90b19pbmFjdGl2ZShzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKIGludCBpOTE1X2dlbV9kdW1iX2NyZWF0ZShzdHJ1 Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiwKIAkJCSBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJ IHN0cnVjdCBkcm1fbW9kZV9jcmVhdGVfZHVtYiAqYXJncyk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwppbmRleCA0NDA5NzlmLi5kOWJmNjk0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTIw ODQsNyArMjA4NCw3IEBAIHZvaWQgaTkxNV92bWFfbW92ZV90b19hY3RpdmUoc3RydWN0IGk5MTVf dm1hICp2bWEsCiAJcmV0dXJuIGk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2FjdGl2ZSh2bWEtPm9i aiwgcmluZyk7CiB9CiAKLXN0YXRpYyB2b2lkCit2b2lkCiBpOTE1X2dlbV9vYmplY3RfbW92ZV90 b19pbmFjdGl2ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogewogCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IG9iai0+YmFzZS5kZXYtPmRldl9wcml2YXRlOwpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGYyMjBjOTQuLjZhMmQ4 NDdhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC03MDAsMjEg KzcwMCwyMSBAQCBzdGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1Y3QgaW50ZWxfcmluZ19idWZmZXIg KnJpbmcsCiAJCS8qIG9iaiBpcyBrZXB0IGFsaXZlIHVudGlsIHRoZSBuZXh0IHJlcXVlc3QgYnkg aXRzIGFjdGl2ZSByZWYgKi8KIAkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oZnJvbS0+b2Jq KTsKIAkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShmcm9tKTsKLQl9IGVsc2UgewotCQlp ZiAodG8tPmlzX2luaXRpYWxpemVkID09IGZhbHNlKSB7Ci0JCQlyZXQgPSBpOTE1X2dlbV9yZW5k ZXJfc3RhdGVfaW5pdChyaW5nKTsKLQkJCWlmIChyZXQpCi0JCQkJRFJNX0VSUk9SKCJpbml0IHJl bmRlciBzdGF0ZTogJWRcbiIsIHJldCk7Ci0JCX0KIAl9CiAKLQl0by0+aXNfaW5pdGlhbGl6ZWQg PSB0cnVlOwotCiBkb25lOgogCWk5MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNlKHRvKTsKIAlyaW5n LT5sYXN0X2NvbnRleHQgPSB0bzsKIAl0by0+bGFzdF9yaW5nID0gcmluZzsKIAorCWlmIChyaW5n LT5pZCA9PSBSQ1MgJiYgIXRvLT5pc19pbml0aWFsaXplZCAmJiBmcm9tID09IE5VTEwpIHsKKwkJ cmV0ID0gaTkxNV9nZW1fcmVuZGVyX3N0YXRlX2luaXQocmluZyk7CisJCWlmIChyZXQpCisJCQlE Uk1fRVJST1IoImluaXQgcmVuZGVyIHN0YXRlOiAlZFxuIiwgcmV0KTsKKwl9CisKKwl0by0+aXNf aW5pdGlhbGl6ZWQgPSB0cnVlOworCiAJcmV0dXJuIDA7CiAKIHVucGluX291dDoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMKaW5kZXggMzkyYWE3Yi4uODJh YmUxZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0 YXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMK QEAgLTE2NCw5ICsxNjQsMTIgQEAgaW50IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVj dCBpbnRlbF9yaW5nX2J1ZmZlciAqcmluZykKIAljb25zdCBpbnQgZ2VuID0gSU5URUxfSU5GTyhy aW5nLT5kZXYpLT5nZW47CiAJc3RydWN0IGk5MTVfcmVuZGVyX3N0YXRlICpzbzsKIAljb25zdCBz dHJ1Y3QgaW50ZWxfcmVuZGVyc3RhdGVfcm9kYXRhICpyb2RhdGE7Ci0JdTMyIHNlcW5vOworCXN0 cnVjdCBpOTE1X3ZtYSAqdm1hOwogCWludCByZXQ7CiAKKwlpZiAoV0FSTl9PTihyaW5nLT5pZCAh PSBSQ1MpKQorCQlyZXR1cm4gLUVOT0VOVDsKKwogCXJvZGF0YSA9IHJlbmRlcl9zdGF0ZV9nZXRf cm9kYXRhKHJpbmctPmRldiwgZ2VuKTsKIAlpZiAocm9kYXRhID09IE5VTEwpCiAJCXJldHVybiAw OwpAQCAtMTg2LDcgKzE4OSwxNyBAQCBpbnQgaTkxNV9nZW1fcmVuZGVyX3N0YXRlX2luaXQoc3Ry dWN0IGludGVsX3JpbmdfYnVmZmVyICpyaW5nKQogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCi0J cmV0ID0gaTkxNV9hZGRfcmVxdWVzdChyaW5nLCAmc2Vxbm8pOworCXZtYSA9IGk5MTVfZ2VtX29i al90b19nZ3R0KHNvLT5vYmopOworCWlmICh2bWEgPT0gTlVMTCkgeworCQlyZXQgPSAtRU5PU1BD OworCQlnb3RvIG91dDsKKwl9CisKKwlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZSh2bWEsIHJpbmcp OworCisJcmV0ID0gX19pOTE1X2FkZF9yZXF1ZXN0KHJpbmcsIE5VTEwsIHNvLT5vYmosIE5VTEwp OworCWlmIChyZXQpCisJCWk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2luYWN0aXZlKHNvLT5vYmop OwogCiBvdXQ6CiAJcmVuZGVyX3N0YXRlX2ZyZWUoc28pOwotLSAKMS43LjkuNQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK