From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v3 06/28] drm/i915: Ensure requests stick around during waits Date: Mon, 24 Nov 2014 18:49:28 +0000 Message-ID: <1416854990-1920-7-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 306696EE16 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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkFkZGVkIHJl ZmVyZW5jZSBjb3VudGluZyBvZiB0aGUgcmVxdWVzdCBzdHJ1Y3R1cmUgYXJvdW5kIF9fd2FpdF9z ZXFubygpIGNhbGxzLgpUaGlzIGlzIGEgcHJlY3Vyc29yIHRvIHVwZGF0aW5nIHRoZSB3YWl0IGNv ZGUgaXRzZWxmIHRvIHRha2UgdGhlIHJlcXVlc3QgcmF0aGVyCnRoYW4gYSBzZXFuby4gQXQgdGhh dCBwb2ludCwgaXQgd291bGQgYmUgYSBCYWQgSWRlYSBmb3IgYSByZXF1ZXN0IG9iamVjdCB0byBi ZQpyZXRpcmVkIGFuZCBmcmVlZCB3aGlsZSB0aGUgd2FpdCBjb2RlIGlzIHN0aWxsIHVzaW5nIGl0 LgoKdjM6CgpOb3RlIHRoYXQgZXZlbiB0aG91Z2ggdGhlIG11dGV4IGxvY2sgaXMgaGVsZCBkdXJp bmcgYSBjYWxsIHRvIGk5MTVfd2FpdF9zZXFubygpLAppdCBpcyBzdGlsbCBuZWNlc3NhcnkgdG8g ZXhwbGljaXRseSBidW1wIHRoZSByZWZlcmVuY2UgY291bnQuIEl0IGFwcGVhcnMgdGhhdAp0aGUg c2hyaW5rZXIgY2FuIGFzeW5jaHJvbm91c2x5IHJldGlyZSBpdGVtcyBldmVuIHRob3VnaCB0aGUg bXV0ZXggaXMgbG9ja2VkLgoKRm9yOiBWSVotNDM3NwpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJp c29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVGhvbWFzIERhbmll bCA8VGhvbWFzLkRhbmllbEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYyB8ICAgMjggKysrKysrKysrKysrKysrKysrKysrKystLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDIzIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMKaW5kZXggOWFjOTE1Ny4uNzEzMDNhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0x MzMzLDggKzEzMzMsMTEgQEAgaTkxNV93YWl0X3NlcW5vKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcsIHVpbnQzMl90IHNlcW5vKQogCQlyZXR1cm4gcmV0OwogCiAJcmVzZXRfY291bnRlciA9 IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpOwotCXJldHVy biBfX2k5MTVfd2FpdF9zZXFubyhyaW5nLCBzZXFubywgcmVzZXRfY291bnRlciwgaW50ZXJydXB0 aWJsZSwKLQkJCQkgTlVMTCwgTlVMTCk7CisJaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVuY2UocmVx KTsKKwlyZXQgPSBfX2k5MTVfd2FpdF9zZXFubyhyaW5nLCBzZXFubywgcmVzZXRfY291bnRlciwg aW50ZXJydXB0aWJsZSwKKwkJCQlOVUxMLCBOVUxMKTsKKwlpOTE1X2dlbV9yZXF1ZXN0X3VucmVm ZXJlbmNlKHJlcSk7CisJcmV0dXJuIHJldDsKIH0KIAogc3RhdGljIGludApAQCAtMTQxNywxMCAr MTQyMCwxMiBAQCBpOTE1X2dlbV9vYmplY3Rfd2FpdF9yZW5kZXJpbmdfX25vbmJsb2NraW5nKHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCXJldHVybiByZXQ7CiAKIAlyZXNldF9j b3VudGVyID0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcik7 CisJaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVuY2UocmVxKTsKIAltdXRleF91bmxvY2soJmRldi0+ c3RydWN0X211dGV4KTsKIAlyZXQgPSBfX2k5MTVfd2FpdF9zZXFubyhyaW5nLCBzZXFubywgcmVz ZXRfY291bnRlciwgdHJ1ZSwgTlVMTCwKIAkJCQlmaWxlX3ByaXYpOwogCW11dGV4X2xvY2soJmRl di0+c3RydWN0X211dGV4KTsKKwlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcSk7CiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMjkyMCw2ICsyOTI1LDcgQEAgaTkxNV9nZW1f d2FpdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGUpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3dhaXQgKmFyZ3MgPSBkYXRhOwogCXN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXE7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IE5VTEw7CiAJdW5zaWdu ZWQgcmVzZXRfY291bnRlcjsKIAl1MzIgc2Vxbm8gPSAwOwpAQCAtMjk0Niw3ICsyOTUyLDggQEAg aTkxNV9nZW1fd2FpdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBz dHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJaWYgKCFvYmotPmFjdGl2ZSB8fCAhb2JqLT5sYXN0X3Jl YWRfcmVxKQogCQlnb3RvIG91dDsKIAotCXNlcW5vID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vx bm8ob2JqLT5sYXN0X3JlYWRfcmVxKTsKKwlyZXEgPSBvYmotPmxhc3RfcmVhZF9yZXE7CisJc2Vx bm8gPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhyZXEpOwogCVdBUk5fT04oc2Vxbm8gPT0g MCk7CiAJcmluZyA9IG9iai0+cmluZzsKIApAQCAtMjk2MCwxMCArMjk2NywxNSBAQCBpOTE1X2dl bV93YWl0X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBk cm1fZmlsZSAqZmlsZSkKIAogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZvYmotPmJhc2Up OwogCXJlc2V0X2NvdW50ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNl dF9jb3VudGVyKTsKKwlpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShyZXEpOwogCW11dGV4X3Vu bG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCi0JcmV0dXJuIF9faTkxNV93YWl0X3NlcW5vKHJp bmcsIHNlcW5vLCByZXNldF9jb3VudGVyLCB0cnVlLAotCQkJCSAmYXJncy0+dGltZW91dF9ucywg ZmlsZS0+ZHJpdmVyX3ByaXYpOworCXJldCA9IF9faTkxNV93YWl0X3NlcW5vKHJpbmcsIHNlcW5v LCByZXNldF9jb3VudGVyLCB0cnVlLCAmYXJncy0+dGltZW91dF9ucywKKwkJCSAgIGZpbGUtPmRy aXZlcl9wcml2KTsKKwltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJaTkxNV9nZW1f cmVxdWVzdF91bnJlZmVyZW5jZShyZXEpOworCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0 ZXgpOworCXJldHVybiByZXQ7CiAKIG91dDoKIAlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgm b2JqLT5iYXNlKTsKQEAgLTQxMjIsNiArNDEzNCw4IEBAIGk5MTVfZ2VtX3JpbmdfdGhyb3R0bGUo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCQl0YXJnZXQg PSByZXF1ZXN0OwogCX0KIAlyZXNldF9jb3VudGVyID0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5n cHVfZXJyb3IucmVzZXRfY291bnRlcik7CisJaWYgKHRhcmdldCkKKwkJaTkxNV9nZW1fcmVxdWVz dF9yZWZlcmVuY2UodGFyZ2V0KTsKIAlzcGluX3VubG9jaygmZmlsZV9wcml2LT5tbS5sb2NrKTsK IAogCWlmICh0YXJnZXQgPT0gTlVMTCkKQEAgLTQxMzMsNiArNDE0NywxMCBAQCBpOTE1X2dlbV9y aW5nX3Rocm90dGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmls ZSkKIAlpZiAocmV0ID09IDApCiAJCXF1ZXVlX2RlbGF5ZWRfd29yayhkZXZfcHJpdi0+d3EsICZk ZXZfcHJpdi0+bW0ucmV0aXJlX3dvcmssIDApOwogCisJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3Rf bXV0ZXgpOworCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UodGFyZ2V0KTsKKwltdXRleF91 bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwogCXJldHVybiByZXQ7CiB9CiAKLS0gCjEuNy45 LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==