From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v2 06/28] drm/i915: Ensure requests stick around during waits Date: Fri, 14 Nov 2014 12:18:57 +0000 Message-ID: <1415967559-17074-7-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 796A16EDC4 for ; Fri, 14 Nov 2014 04:19:28 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkFkZGVkIHJl ZmVyZW5jZSBjb3VudGluZyBvZiB0aGUgcmVxdWVzdCBzdHJ1Y3R1cmUgYXJvdW5kIF9fd2FpdF9z ZXFubygpIGNhbGxzLgpUaGlzIGlzIGEgcHJlY3Vyc29yIHRvIHVwZGF0aW5nIHRoZSB3YWl0IGNv ZGUgaXRzZWxmIHRvIHRha2UgdGhlIHJlcXVlc3QgcmF0aGVyCnRoYW4gYSBzZXFuby4gQXQgdGhh dCBwb2ludCwgaXQgd291bGQgYmUgYSBCYWQgSWRlYSBmb3IgYSByZXF1ZXN0IG9iamVjdCB0byBi ZQpyZXRpcmVkIGFuZCBmcmVlZCB3aGlsZSB0aGUgd2FpdCBjb2RlIGlzIHN0aWxsIHVzaW5nIGl0 LgoKTm90ZSB0aGF0IGk5MTVfd2FpdF9yZXF1ZXN0KCkgaXMgc2FmZSB3aXRob3V0IHJlZmVyZW5j ZSBjb3VudGluZyBhcyB0aGUgZHJpdmVyCm11dGV4IGxvY2sgaXMgaGVsZCBmb3IgdGhlIGR1cmF0 aW9uLiBUaHVzIGl0IGlzIG5vdCBwb3NzaWJsZSBmb3IgYSBmcmVlIHRvIG9jY3VyCmFzeW5jaHJv bm91c2x5LgoKRm9yOiBWSVotNDM3NwpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2hu LkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgfCAgIDIxICsrKysrKysrKysrKysrKysrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2Vy dGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggODZj N2FhMC4uNGRiZmVlMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0xNDQyLDEwICsxNDQy LDEyIEBAIGk5MTVfZ2VtX29iamVjdF93YWl0X3JlbmRlcmluZ19fbm9uYmxvY2tpbmcoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJcmV0dXJuIHJldDsKIAogCXJlc2V0X2NvdW50 ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKTsKKwlp OTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShyZXEpOwogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwogCXJldCA9IF9faTkxNV93YWl0X3NlcW5vKHJpbmcsIHNlcW5vLCByZXNldF9j b3VudGVyLCB0cnVlLCBOVUxMLAogCQkJCWZpbGVfcHJpdik7CiAJbXV0ZXhfbG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOworCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxKTsKIAlpZiAo cmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0yOTA0LDYgKzI5MDYsNyBAQCBpOTE1X2dlbV93YWl0 X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmls ZSAqZmlsZSkKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fd2FpdCAqYXJncyA9IGRhdGE7CiAJc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gTlVMTDsKIAl1bnNpZ25lZCBy ZXNldF9jb3VudGVyOwogCXUzMiBzZXFubyA9IDA7CkBAIC0yOTMwLDcgKzI5MzMsOCBAQCBpOTE1 X2dlbV93YWl0X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVj dCBkcm1fZmlsZSAqZmlsZSkKIAlpZiAoIW9iai0+YWN0aXZlIHx8ICFvYmotPmxhc3RfcmVhZF9y ZXEpCiAJCWdvdG8gb3V0OwogCi0Jc2Vxbm8gPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhv YmotPmxhc3RfcmVhZF9yZXEpOworCXJlcSA9IG9iai0+bGFzdF9yZWFkX3JlcTsKKwlzZXFubyA9 IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHJlcSk7CiAJV0FSTl9PTihzZXFubyA9PSAwKTsK IAlyaW5nID0gb2JqLT5yaW5nOwogCkBAIC0yOTQ0LDEwICsyOTQ4LDE1IEBAIGk5MTVfZ2VtX3dh aXRfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9m aWxlICpmaWxlKQogCiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJm9iai0+YmFzZSk7CiAJ cmVzZXRfY291bnRlciA9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2Nv dW50ZXIpOworCWk5MTVfZ2VtX3JlcXVlc3RfcmVmZXJlbmNlKHJlcSk7CiAJbXV0ZXhfdW5sb2Nr KCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKLQlyZXR1cm4gX19pOTE1X3dhaXRfc2Vxbm8ocmluZywg c2Vxbm8sIHJlc2V0X2NvdW50ZXIsIHRydWUsCi0JCQkJICZhcmdzLT50aW1lb3V0X25zLCBmaWxl LT5kcml2ZXJfcHJpdik7CisJcmV0ID0gX19pOTE1X3dhaXRfc2Vxbm8ocmluZywgc2Vxbm8sIHJl c2V0X2NvdW50ZXIsIHRydWUsICZhcmdzLT50aW1lb3V0X25zLAorCQkJICAgZmlsZS0+ZHJpdmVy X3ByaXYpOworCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwlpOTE1X2dlbV9yZXF1 ZXN0X3VucmVmZXJlbmNlKHJlcSk7CisJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7 CisJcmV0dXJuIHJldDsKIAogb3V0OgogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZvYmot PmJhc2UpOwpAQCAtNDEwNiw2ICs0MTE1LDggQEAgaTkxNV9nZW1fcmluZ190aHJvdHRsZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJCXRhcmdldCA9IHJl cXVlc3Q7CiAJfQogCXJlc2V0X2NvdW50ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9l cnJvci5yZXNldF9jb3VudGVyKTsKKwlpZiAodGFyZ2V0KQorCQlpOTE1X2dlbV9yZXF1ZXN0X3Jl ZmVyZW5jZSh0YXJnZXQpOwogCXNwaW5fdW5sb2NrKCZmaWxlX3ByaXYtPm1tLmxvY2spOwogCiAJ aWYgKHRhcmdldCA9PSBOVUxMKQpAQCAtNDExNyw2ICs0MTI4LDEwIEBAIGk5MTVfZ2VtX3Jpbmdf dGhyb3R0bGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKQog CWlmIChyZXQgPT0gMCkKIAkJcXVldWVfZGVsYXllZF93b3JrKGRldl9wcml2LT53cSwgJmRldl9w cml2LT5tbS5yZXRpcmVfd29yaywgMCk7CiAKKwltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CisJaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZSh0YXJnZXQpOworCW11dGV4X3VubG9j aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCiAJcmV0dXJuIHJldDsKIH0KIAotLSAKMS43LjkuNQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK