From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 09/29] drm/i915: Make 'i915_gem_check_olr' actually check by request not seqno Date: Thu, 30 Oct 2014 18:41:01 +0000 Message-ID: <1414694481-15724-10-git-send-email-John.C.Harrison@Intel.com> References: <1414694481-15724-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id B14DC6E0CA for ; Thu, 30 Oct 2014 11:41:33 -0700 (PDT) In-Reply-To: <1414694481-15724-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 dGhlIF9jaGVja19vbHIoKSBmdW5jdGlvbiB0byBhY3R1YWxseSB0YWtlIGEgcmVxdXN0IG9iamVj dCBhbmQgY29tcGFyZQppdCB0byB0aGUgT0xSIHJhdGhlciB0aGFuIGV4dHJhY3Rpbmcgc2Vxbm9z IGFuZCBjb21wYXJpbmcgdGhvc2UuCgpOb3RlIHRoYXQgdGhlcmUgaXMgb25lIHVzZSBjYXNlIHdo ZXJlIHRoZSByZXF1ZXN0IG9iamVjdCBiZWluZyBwcm9jZXNzZWQgaXMgbm8KbG9uZ2VyIGF2YWls YWJsZSBhdCB0aGF0IHBvaW50IGluIHRoZSBjYWxsIHN0YWNrLiBIZW5jZSBhIHRlbXBvcmFyeSBj b3B5IG9mIHRoZQpvcmlnaW5hbCBmdW5jdGlvbiBpcyBzdGlsbCBwcmVzZW50IChidXQgY2FsbGVk IF9jaGVja19vbHMoKSBpbnN0ZWFkKS4gVGhpcyB3aWxsCmJlIHJlbW92ZWQgaW4gYSBzdWJzZXF1 ZW50IHBhdGNoLgoKQWxzbywgZG93bmdyYWRlZCBhIEJVR19PTiB0byBhIFdBUk5fT04gYXMgYXBw YXJlbnRseSB0aGUgZm9ybWVyIGlzIGZyb3duZWQgdXBvbgpmb3Igc2hpcHBpbmcgY29kZS4KCkZv cjogVklaLTQzNzcKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29u QEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAg IDE3ICsrKysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAg ICAgfCAgIDI1ICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyB8ICAgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9u cygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMDU5ZWM0 My4uZGZkMjYzZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNTIzLDcgKzI1MjMsNyBA QCBib29sIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsK IHZvaWQgaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyk7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2NoZWNrX3dlZGdlKHN0cnVjdCBp OTE1X2dwdV9lcnJvciAqZXJyb3IsCiAJCQkJICAgICAgYm9vbCBpbnRlcnJ1cHRpYmxlKTsKLWlu dCBfX211c3RfY2hlY2sgaTkxNV9nZW1fY2hlY2tfb2xyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcsIHUzMiBzZXFubyk7CitpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2NoZWNrX29scihz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiAKIHN0YXRpYyBpbmxpbmUgYm9vbCBp OTE1X3Jlc2V0X2luX3Byb2dyZXNzKHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiB7CkBA IC0zMDU2LDQgKzMwNTYsMTkgQEAgd2FpdF9yZW1haW5pbmdfbXNfZnJvbV9qaWZmaWVzKHVuc2ln bmVkIGxvbmcgdGltZXN0YW1wX2ppZmZpZXMsIGludCB0b193YWl0X21zKQogCX0KIH0KIAorLyog WFhYOiBUZW1wb3Jhcnkgc29sdXRpb24gdG8gYmUgcmVtb3ZlZCBsYXRlciBpbiBwYXRjaCBzZXJp ZXMuICovCitzdGF0aWMgaW5saW5lIGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fY2hlY2tfb2xz KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHUzMiBzZXFubykKK3sKKwlpbnQgcmV0Owor CisJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZyaW5nLT5kZXYtPnN0cnVjdF9tdXRleCkpOwor CisJcmV0ID0gMDsKKwlpZiAoc2Vxbm8gPT0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ocmlu Zy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0KSkKKwkJcmV0ID0gaTkxNV9hZGRfcmVxdWVzdChy aW5nLCBOVUxMKTsKKworCXJldHVybiByZXQ7Cit9CisvKiBYWFg6IFRlbXBvcmFyeSBzb2x1dGlv biB0byBiZSByZW1vdmVkIGxhdGVyIGluIHBhdGNoIHNlcmllcy4gKi8KKwogI2VuZGlmCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYwppbmRleCAwYTQ0NTJiLi45N2VlYzMzIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKQEAgLTEwOTcsMTkgKzEwOTcsMTggQEAgaTkxNV9nZW1fY2hlY2tfd2VkZ2Uoc3Ry dWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciwKIH0KIAogLyoKLSAqIENvbXBhcmUgc2Vxbm8gYWdh aW5zdCBvdXRzdGFuZGluZyBsYXp5IHJlcXVlc3QuIEVtaXQgYSByZXF1ZXN0IGlmIHRoZXkgYXJl Ci0gKiBlcXVhbC4KKyAqIENvbXBhcmUgYXJiaXRyYXJ5IHJlcXVlc3QgYWdhaW5zdCBvdXRzdGFu ZGluZyBsYXp5IHJlcXVlc3QuIEVtaXQgb24gbWF0Y2guCiAgKi8KIGludAotaTkxNV9nZW1fY2hl Y2tfb2xyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHUzMiBzZXFubykKK2k5MTVfZ2Vt X2NoZWNrX29scihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlpbnQgcmV0 OwogCi0JQlVHX09OKCFtdXRleF9pc19sb2NrZWQoJnJpbmctPmRldi0+c3RydWN0X211dGV4KSk7 CisJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZyZXEtPnJpbmctPmRldi0+c3RydWN0X211dGV4 KSk7CiAKIAlyZXQgPSAwOwotCWlmIChzZXFubyA9PSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFu byhyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpKQotCQlyZXQgPSBpOTE1X2FkZF9yZXF1 ZXN0KHJpbmcsIE5VTEwpOworCWlmIChyZXEgPT0gcmVxLT5yaW5nLT5vdXRzdGFuZGluZ19sYXp5 X3JlcXVlc3QpCisJCXJldCA9IGk5MTVfYWRkX3JlcXVlc3QocmVxLT5yaW5nLCBOVUxMKTsKIAog CXJldHVybiByZXQ7CiB9CkBAIC0xMjcxLDcgKzEyNzAsNyBAQCBpOTE1X3dhaXRfc2Vxbm8oc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdWludDMyX3Qgc2Vxbm8pCiAJaWYgKHJldCkKIAkJ cmV0dXJuIHJldDsKIAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX29scihyaW5nLCBzZXFubyk7CisJ cmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xzKHJpbmcsIHNlcW5vKTsKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwogCkBAIC0xMzM4LDcgKzEzMzcsNiBAQCBpOTE1X2dlbV9vYmplY3Rfd2FpdF9yZW5k ZXJpbmdfX25vbmJsb2NraW5nKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gb2JqLT5yaW5nOwogCXVuc2lnbmVkIHJlc2V0X2Nv dW50ZXI7Ci0JdTMyIHNlcW5vOwogCWludCByZXQ7CiAKIAlCVUdfT04oIW11dGV4X2lzX2xvY2tl ZCgmZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKQEAgLTEzNDgsMjEgKzEzNDYsMTggQEAgaTkxNV9nZW1f b2JqZWN0X3dhaXRfcmVuZGVyaW5nX19ub25ibG9ja2luZyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2JqLAogCWlmICghcmVxKQogCQlyZXR1cm4gMDsKIAotCXNlcW5vID0gaTkxNV9nZW1f cmVxdWVzdF9nZXRfc2Vxbm8ocmVxKTsKLQlXQVJOX09OKHNlcW5vID09IDApOwotCiAJcmV0ID0g aTkxNV9nZW1fY2hlY2tfd2VkZ2UoJmRldl9wcml2LT5ncHVfZXJyb3IsIHRydWUpOwogCWlmIChy ZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyZXQgPSBpOTE1X2dlbV9jaGVja19vbHIocmluZywgc2Vx bm8pOworCXJldCA9IGk5MTVfZ2VtX2NoZWNrX29scihyZXEpOwogCWlmIChyZXQpCiAJCXJldHVy biByZXQ7CiAKIAlyZXNldF9jb3VudGVyID0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJy b3IucmVzZXRfY291bnRlcik7CiAJaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVuY2UocmVxKTsKIAlt dXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlyZXQgPSBfX3dhaXRfc2Vxbm8ocmlu Zywgc2Vxbm8sIHJlc2V0X2NvdW50ZXIsIHRydWUsIE5VTEwsIGZpbGVfcHJpdik7CisJcmV0ID0g X193YWl0X3NlcW5vKHJpbmcsIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJlcSksIHJlc2V0 X2NvdW50ZXIsIHRydWUsIE5VTEwsIGZpbGVfcHJpdik7CiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwogCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxKTsKIAlpZiAocmV0 KQpAQCAtMjc4MCw3ICsyNzc1LDcgQEAgaTkxNV9nZW1fb2JqZWN0X2ZsdXNoX2FjdGl2ZShzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCWludCByZXQ7CiAKIAlpZiAob2JqLT5hY3Rp dmUpIHsKLQkJcmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xyKG9iai0+cmluZywgaTkxNV9nZW1fcmVx dWVzdF9nZXRfc2Vxbm8ob2JqLT5sYXN0X3JlYWRfcmVxKSk7CisJCXJldCA9IGk5MTVfZ2VtX2No ZWNrX29scihvYmotPmxhc3RfcmVhZF9yZXEpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsK IApAQCAtMjkxMCw3ICsyOTA1LDcgQEAgaTkxNV9nZW1fb2JqZWN0X3N5bmMoc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaiwKIAlpZiAoc2Vxbm8gPD0gZnJvbS0+c2VtYXBob3JlLnN5bmNf c2Vxbm9baWR4XSkKIAkJcmV0dXJuIDA7CiAKLQlyZXQgPSBpOTE1X2dlbV9jaGVja19vbHIob2Jq LT5yaW5nLCBzZXFubyk7CisJcmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xyKG9iai0+bGFzdF9yZWFk X3JlcSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCmluZGV4IGE2OWI3NGUuLmZkNDg4ZDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTkzNTAsNyArOTM1MCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfcG9zdHBv bmVfZmxpcChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCQkJICAgICAgaTkxNV9n ZW1fcmVxdWVzdF9nZXRfc2Vxbm8ob2JqLT5sYXN0X3dyaXRlX3JlcSkpKQogCQlyZXR1cm4gMDsK IAotCXJldCA9IGk5MTVfZ2VtX2NoZWNrX29scihyaW5nLCBpOTE1X2dlbV9yZXF1ZXN0X2dldF9z ZXFubyhvYmotPmxhc3Rfd3JpdGVfcmVxKSk7CisJcmV0ID0gaTkxNV9nZW1fY2hlY2tfb2xyKG9i ai0+bGFzdF93cml0ZV9yZXEpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLS0gCjEuNy45 LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==