From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v2 08/28] drm/i915: Make 'i915_gem_check_olr' actually check by request not seqno Date: Fri, 14 Nov 2014 12:18:59 +0000 Message-ID: <1415967559-17074-9-git-send-email-John.C.Harrison@Intel.com> References: <1415967559-17074-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FEC56EDC5 for ; Fri, 14 Nov 2014 04:19:30 -0800 (PST) In-Reply-To: <1415967559-17074-1-git-send-email-John.C.Harrison@Intel.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg dGhlIF9jaGVja19vbHIoKSBmdW5jdGlvbiB0byBhY3R1YWxseSB0YWtlIGEgcmVxdWVzdCBvYmpl Y3QgYW5kIGNvbXBhcmUKaXQgdG8gdGhlIE9MUiByYXRoZXIgdGhhbiBleHRyYWN0aW5nIHNlcW5v cyBhbmQgY29tcGFyaW5nIHRob3NlLgoKTm90ZSB0aGF0IHRoZXJlIGlzIG9uZSB1c2UgY2FzZSB3 aGVyZSB0aGUgcmVxdWVzdCBvYmplY3QgYmVpbmcgcHJvY2Vzc2VkIGlzIG5vCmxvbmdlciBhdmFp bGFibGUgYXQgdGhhdCBwb2ludCBpbiB0aGUgY2FsbCBzdGFjay4gSGVuY2UgYSB0ZW1wb3Jhcnkg Y29weSBvZiB0aGUKb3JpZ2luYWwgZnVuY3Rpb24gaXMgc3RpbGwgcHJlc2VudCAoYnV0IGNhbGxl ZCBfY2hlY2tfb2xzKCkgaW5zdGVhZCkuIFRoaXMgd2lsbApiZSByZW1vdmVkIGluIGEgc3Vic2Vx dWVudCBwYXRjaC4KCkFsc28sIGRvd25ncmFkZWQgYSBCVUdfT04gdG8gYSBXQVJOX09OIGFzIGFw cGFyZW50bHkgdGhlIGZvcm1lciBpcyBmcm93bmVkIHVwb24KZm9yIHNoaXBwaW5nIGNvZGUuCgpG b3I6IFZJWi00Mzc3ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNv bkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICAgMTgg KysrKysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgICAy OCArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI4IGluc2Vy dGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDMx YmE0OTYuLjA4YWFkNmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjU4OSw3ICsyNTg5 LDcgQEAgYm9vbCBpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHMoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiB2b2lkIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0c19yaW5nKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9jaGVja193ZWRnZShzdHJ1 Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yLAogCQkJCSAgICAgIGJvb2wgaW50ZXJydXB0aWJsZSk7 Ci1pbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2NoZWNrX29scihzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nLCB1MzIgc2Vxbm8pOworaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9jaGVja19v bHIoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogCiBzdGF0aWMgaW5saW5lIGJv b2wgaTkxNV9yZXNldF9pbl9wcm9ncmVzcyhzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yKQog ewpAQCAtMzEyOSw0ICszMTI5LDIwIEBAIHdhaXRfcmVtYWluaW5nX21zX2Zyb21famlmZmllcyh1 bnNpZ25lZCBsb25nIHRpbWVzdGFtcF9qaWZmaWVzLCBpbnQgdG9fd2FpdF9tcykKIAl9CiB9CiAK Ky8qIFhYWDogVGVtcG9yYXJ5IHNvbHV0aW9uIHRvIGJlIHJlbW92ZWQgbGF0ZXIgaW4gcGF0Y2gg c2VyaWVzLiAqLworc3RhdGljIGlubGluZSBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2NoZWNr X29scygKKwkJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHUzMiBzZXFubykK K3sKKwlpbnQgcmV0OworCisJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZyaW5nLT5kZXYtPnN0 cnVjdF9tdXRleCkpOworCisJcmV0ID0gMDsKKwlpZiAoc2Vxbm8gPT0gaTkxNV9nZW1fcmVxdWVz dF9nZXRfc2Vxbm8ocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KSkKKwkJcmV0ID0gaTkx NV9hZGRfcmVxdWVzdChyaW5nLCBOVUxMKTsKKworCXJldHVybiByZXQ7Cit9CisvKiBYWFg6IFRl bXBvcmFyeSBzb2x1dGlvbiB0byBiZSByZW1vdmVkIGxhdGVyIGluIHBhdGNoIHNlcmllcy4gKi8K KwogI2VuZGlmCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBmYzAzZTIxLi5iOWE2ZjljIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTExNzgsMTkgKzExNzgsMTggQEAgaTkxNV9nZW1f Y2hlY2tfd2VkZ2Uoc3RydWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciwKIH0KIAogLyoKLSAqIENv bXBhcmUgc2Vxbm8gYWdhaW5zdCBvdXRzdGFuZGluZyBsYXp5IHJlcXVlc3QuIEVtaXQgYSByZXF1 ZXN0IGlmIHRoZXkgYXJlCi0gKiBlcXVhbC4KKyAqIENvbXBhcmUgYXJiaXRyYXJ5IHJlcXVlc3Qg YWdhaW5zdCBvdXRzdGFuZGluZyBsYXp5IHJlcXVlc3QuIEVtaXQgb24gbWF0Y2guCiAgKi8KIGlu dAotaTkxNV9nZW1fY2hlY2tfb2xyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHUzMiBz ZXFubykKK2k5MTVfZ2VtX2NoZWNrX29scihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cSkKIHsKIAlpbnQgcmV0OwogCi0JQlVHX09OKCFtdXRleF9pc19sb2NrZWQoJnJpbmctPmRldi0+ c3RydWN0X211dGV4KSk7CisJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZyZXEtPnJpbmctPmRl di0+c3RydWN0X211dGV4KSk7CiAKIAlyZXQgPSAwOwotCWlmIChzZXFubyA9PSBpOTE1X2dlbV9y ZXF1ZXN0X2dldF9zZXFubyhyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpKQotCQlyZXQg PSBpOTE1X2FkZF9yZXF1ZXN0KHJpbmcsIE5VTEwpOworCWlmIChyZXEgPT0gcmVxLT5yaW5nLT5v dXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpCisJCXJldCA9IGk5MTVfYWRkX3JlcXVlc3QocmVxLT5y aW5nLCBOVUxMKTsKIAogCXJldHVybiByZXQ7CiB9CkBAIC0xMzUzLDcgKzEzNTIsNyBAQCBpOTE1 X3dhaXRfc2Vxbm8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdWludDMyX3Qgc2Vxbm8p CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX29scihy aW5nLCBzZXFubyk7CisJcmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xzKHJpbmcsIHNlcW5vKTsKIAlp ZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xNDIwLDcgKzE0MTksNiBAQCBpOTE1X2dlbV9v YmplY3Rfd2FpdF9yZW5kZXJpbmdfX25vbmJsb2NraW5nKHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmosCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZf cHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gb2JqLT5yaW5nOwogCXVu c2lnbmVkIHJlc2V0X2NvdW50ZXI7Ci0JdTMyIHNlcW5vOwogCWludCByZXQ7CiAKIAlCVUdfT04o IW11dGV4X2lzX2xvY2tlZCgmZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKQEAgLTE0MzAsMjIgKzE0Mjgs MTkgQEAgaTkxNV9nZW1fb2JqZWN0X3dhaXRfcmVuZGVyaW5nX19ub25ibG9ja2luZyhzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCWlmICghcmVxKQogCQlyZXR1cm4gMDsKIAotCXNl cW5vID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmVxKTsKLQlXQVJOX09OKHNlcW5vID09 IDApOwotCiAJcmV0ID0gaTkxNV9nZW1fY2hlY2tfd2VkZ2UoJmRldl9wcml2LT5ncHVfZXJyb3Is IHRydWUpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyZXQgPSBpOTE1X2dlbV9jaGVj a19vbHIocmluZywgc2Vxbm8pOworCXJldCA9IGk5MTVfZ2VtX2NoZWNrX29scihyZXEpOwogCWlm IChyZXQpCiAJCXJldHVybiByZXQ7CiAKIAlyZXNldF9jb3VudGVyID0gYXRvbWljX3JlYWQoJmRl dl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcik7CiAJaTkxNV9nZW1fcmVxdWVzdF9yZWZl cmVuY2UocmVxKTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlyZXQgPSBf X2k5MTVfd2FpdF9zZXFubyhyaW5nLCBzZXFubywgcmVzZXRfY291bnRlciwgdHJ1ZSwgTlVMTCwK LQkJCQlmaWxlX3ByaXYpOworCXJldCA9IF9faTkxNV93YWl0X3NlcW5vKHJpbmcsIGk5MTVfZ2Vt X3JlcXVlc3RfZ2V0X3NlcW5vKHJlcSksCisJCQkJcmVzZXRfY291bnRlciwgdHJ1ZSwgTlVMTCwg ZmlsZV9wcml2KTsKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJaTkxNV9nZW1f cmVxdWVzdF91bnJlZmVyZW5jZShyZXEpOwogCWlmIChyZXQpCkBAIC0yODY0LDggKzI4NTksNyBA QCBpOTE1X2dlbV9vYmplY3RfZmx1c2hfYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmopCiAJaW50IHJldDsKIAogCWlmIChvYmotPmFjdGl2ZSkgewotCQlyZXQgPSBpOTE1X2dl bV9jaGVja19vbHIob2JqLT5yaW5nLAotCQkJICAgICBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFu byhvYmotPmxhc3RfcmVhZF9yZXEpKTsKKwkJcmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xyKG9iai0+ bGFzdF9yZWFkX3JlcSk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCkBAIC0yOTk1LDcg KzI5ODksNyBAQCBpOTE1X2dlbV9vYmplY3Rfc3luYyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqLAogCWlmIChzZXFubyA8PSBmcm9tLT5zZW1hcGhvcmUuc3luY19zZXFub1tpZHhdKQog CQlyZXR1cm4gMDsKIAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX29scihvYmotPnJpbmcsIHNlcW5v KTsKKwlyZXQgPSBpOTE1X2dlbV9jaGVja19vbHIob2JqLT5sYXN0X3JlYWRfcmVxKTsKIAlpZiAo cmV0KQogCQlyZXR1cm4gcmV0OwogCi0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=