From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v3 08/28] drm/i915: Make 'i915_gem_check_olr' actually check by request not seqno Date: Mon, 24 Nov 2014 18:49:30 +0000 Message-ID: <1416854990-1920-9-git-send-email-John.C.Harrison@Intel.com> References: <1416854990-1920-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id B3DCF6EE16 for ; Mon, 24 Nov 2014 10:50:16 -0800 (PST) In-Reply-To: <1416854990-1920-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+ClJldmlld2VkLWJ5OiBUaG9tYXMgRGFuaWVsIDxUaG9tYXMuRGFuaWVsQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgICAxOCArKysr KysrKysrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCAgIDI4ICsr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9u cygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNWMwMGNm My4uNjJmZmRiNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNTg1LDcgKzI1ODUsNyBA QCBib29sIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK IHZvaWQgaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyk7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2NoZWNrX3dlZGdlKHN0cnVjdCBp OTE1X2dwdV9lcnJvciAqZXJyb3IsCiAJCQkJICAgICAgYm9vbCBpbnRlcnJ1cHRpYmxlKTsKLWlu dCBfX211c3RfY2hlY2sgaTkxNV9nZW1fY2hlY2tfb2xyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcsIHUzMiBzZXFubyk7CitpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2NoZWNrX29scihz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBp OTE1X3Jlc2V0X2luX3Byb2dyZXNzKHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiB7CkBA IC0zMTI1LDQgKzMxMjUsMjAgQEAgd2FpdF9yZW1haW5pbmdfbXNfZnJvbV9qaWZmaWVzKHVuc2ln bmVkIGxvbmcgdGltZXN0YW1wX2ppZmZpZXMsIGludCB0b193YWl0X21zKQogCX0KIH0KIAorLyog WFhYOiBUZW1wb3Jhcnkgc29sdXRpb24gdG8gYmUgcmVtb3ZlZCBsYXRlciBpbiBwYXRjaCBzZXJp ZXMuICovCitzdGF0aWMgaW5saW5lIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fY2hlY2tfb2xz KAorCQkJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMyIHNlcW5vKQorewor CWludCByZXQ7CisKKwlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJnJpbmctPmRldi0+c3RydWN0 X211dGV4KSk7CisKKwlyZXQgPSAwOworCWlmIChzZXFubyA9PSBpOTE1X2dlbV9yZXF1ZXN0X2dl dF9zZXFubyhyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpKQorCQlyZXQgPSBpOTE1X2Fk ZF9yZXF1ZXN0KHJpbmcsIE5VTEwpOworCisJcmV0dXJuIHJldDsKK30KKy8qIFhYWDogVGVtcG9y YXJ5IHNvbHV0aW9uIHRvIGJlIHJlbW92ZWQgbGF0ZXIgaW4gcGF0Y2ggc2VyaWVzLiAqLworCiAj ZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDliM2UwM2IuLmIwN2RlNjkgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMTE1MywxOSArMTE1MywxOCBAQCBpOTE1X2dlbV9jaGVj a193ZWRnZShzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yLAogfQogCiAvKgotICogQ29tcGFy ZSBzZXFubyBhZ2FpbnN0IG91dHN0YW5kaW5nIGxhenkgcmVxdWVzdC4gRW1pdCBhIHJlcXVlc3Qg aWYgdGhleSBhcmUKLSAqIGVxdWFsLgorICogQ29tcGFyZSBhcmJpdHJhcnkgcmVxdWVzdCBhZ2Fp bnN0IG91dHN0YW5kaW5nIGxhenkgcmVxdWVzdC4gRW1pdCBvbiBtYXRjaC4KICAqLwogaW50Ci1p OTE1X2dlbV9jaGVja19vbHIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMyIHNlcW5v KQoraTkxNV9nZW1fY2hlY2tfb2xyKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQog ewogCWludCByZXQ7CiAKLQlCVUdfT04oIW11dGV4X2lzX2xvY2tlZCgmcmluZy0+ZGV2LT5zdHJ1 Y3RfbXV0ZXgpKTsKKwlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJnJlcS0+cmluZy0+ZGV2LT5z dHJ1Y3RfbXV0ZXgpKTsKIAogCXJldCA9IDA7Ci0JaWYgKHNlcW5vID09IGk5MTVfZ2VtX3JlcXVl c3RfZ2V0X3NlcW5vKHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCkpCi0JCXJldCA9IGk5 MTVfYWRkX3JlcXVlc3QocmluZywgTlVMTCk7CisJaWYgKHJlcSA9PSByZXEtPnJpbmctPm91dHN0 YW5kaW5nX2xhenlfcmVxdWVzdCkKKwkJcmV0ID0gaTkxNV9hZGRfcmVxdWVzdChyZXEtPnJpbmcs IE5VTEwpOwogCiAJcmV0dXJuIHJldDsKIH0KQEAgLTEzMjgsNyArMTMyNyw3IEBAIGk5MTVfd2Fp dF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1aW50MzJfdCBzZXFubykKIAlp ZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xyKHJpbmcs IHNlcW5vKTsKKwlyZXQgPSBpOTE1X2dlbV9jaGVja19vbHMocmluZywgc2Vxbm8pOwogCWlmIChy ZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEzOTgsNyArMTM5Nyw2IEBAIGk5MTVfZ2VtX29iamVj dF93YWl0X3JlbmRlcmluZ19fbm9uYmxvY2tpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaiwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSBvYmotPnJpbmc7CiAJdW5zaWdu ZWQgcmVzZXRfY291bnRlcjsKLQl1MzIgc2Vxbm87CiAJaW50IHJldDsKIAogCUJVR19PTighbXV0 ZXhfaXNfbG9ja2VkKCZkZXYtPnN0cnVjdF9tdXRleCkpOwpAQCAtMTQwOCwyMiArMTQwNiwxOSBA QCBpOTE1X2dlbV9vYmplY3Rfd2FpdF9yZW5kZXJpbmdfX25vbmJsb2NraW5nKHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJaWYgKCFyZXEpCiAJCXJldHVybiAwOwogCi0Jc2Vxbm8g PSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhyZXEpOwotCVdBUk5fT04oc2Vxbm8gPT0gMCk7 Ci0KIAlyZXQgPSBpOTE1X2dlbV9jaGVja193ZWRnZSgmZGV2X3ByaXYtPmdwdV9lcnJvciwgdHJ1 ZSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX29s cihyaW5nLCBzZXFubyk7CisJcmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xyKHJlcSk7CiAJaWYgKHJl dCkKIAkJcmV0dXJuIHJldDsKIAogCXJlc2V0X2NvdW50ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3By aXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKTsKIAlpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5j ZShyZXEpOwogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCXJldCA9IF9faTkx NV93YWl0X3NlcW5vKHJpbmcsIHNlcW5vLCByZXNldF9jb3VudGVyLCB0cnVlLCBOVUxMLAotCQkJ CWZpbGVfcHJpdik7CisJcmV0ID0gX19pOTE1X3dhaXRfc2Vxbm8ocmluZywgaTkxNV9nZW1fcmVx dWVzdF9nZXRfc2Vxbm8ocmVxKSwKKwkJCQlyZXNldF9jb3VudGVyLCB0cnVlLCBOVUxMLCBmaWxl X3ByaXYpOwogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAlpOTE1X2dlbV9yZXF1 ZXN0X3VucmVmZXJlbmNlKHJlcSk7CiAJaWYgKHJldCkKQEAgLTI4ODMsOCArMjg3OCw3IEBAIGk5 MTVfZ2VtX29iamVjdF9mbHVzaF9hY3RpdmUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i aikKIAlpbnQgcmV0OwogCiAJaWYgKG9iai0+YWN0aXZlKSB7Ci0JCXJldCA9IGk5MTVfZ2VtX2No ZWNrX29scihvYmotPnJpbmcsCi0JCQkgICAgIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKG9i ai0+bGFzdF9yZWFkX3JlcSkpOworCQlyZXQgPSBpOTE1X2dlbV9jaGVja19vbHIob2JqLT5sYXN0 X3JlYWRfcmVxKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAKQEAgLTMwMTQsNyArMzAw OCw3IEBAIGk5MTVfZ2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpv YmosCiAJaWYgKHNlcW5vIDw9IGZyb20tPnNlbWFwaG9yZS5zeW5jX3NlcW5vW2lkeF0pCiAJCXJl dHVybiAwOwogCi0JcmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xyKG9iai0+cmluZywgc2Vxbm8pOwor CXJldCA9IGk5MTVfZ2VtX2NoZWNrX29scihvYmotPmxhc3RfcmVhZF9yZXEpOwogCWlmIChyZXQp CiAJCXJldHVybiByZXQ7CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==