From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 07/29] drm/i915: Ensure requests stick around during waits Date: Thu, 30 Oct 2014 18:40:59 +0000 Message-ID: <1414694481-15724-8-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 32D966E0CA for ; Thu, 30 Oct 2014 11:41:31 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkFkZGVkIHJl ZmVyZW5jZSBjb3VudGluZyBvZiB0aGUgcmVxdWVzdCBzdHJ1Y3R1cmUgYXJvdW5kIF9fd2FpdF9z ZXFubygpIGNhbGxzLgpUaGlzIGlzIGEgcHJlY3Vyc29yIHRvIHVwZGF0aW5nIHRoZSB3YWl0IGNv ZGUgaXRzZWxmIHRvIHRha2UgdGhlIHJlcXVlc3QgcmF0aGVyCnRoYW4gYSBzZXFuby4gQXQgdGhh dCBwb2ludCwgaXQgd291bGQgYmUgYSBCYWQgSWRlYSBmb3IgYSByZXF1ZXN0IG9iamVjdCB0byBi ZQpyZXRpcmVkIGFuZCBmcmVlZCB3aGlsZSB0aGUgd2FpdCBjb2RlIGlzIHN0aWxsIHVzaW5nIGl0 LgoKTm90ZSB0aGF0IGk5MTVfd2FpdF9yZXF1ZXN0KCkgaXMgc2FmZSB3aXRob3V0IHJlZmVyZW5j ZSBjb3VudGluZyBhcyB0aGUgZHJpdmVyCm11dGV4IGxvY2sgaXMgaGVsZCBmb3IgdGhlIGR1cmF0 aW9uLiBUaHVzIGl0IGlzIG5vdCBwb3NzaWJsZSBmb3IgYSBmcmVlIHRvIG9jY3VyCmFzeW5jaHJv bm91c2x5LgoKRm9yOiBWSVotNDM3NwpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2hu LkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgfCAgIDIxICsrKysrKysrKysrKysrKysrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2Vy dGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggNzlh MDFiNy4uYjYzYzYwNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0xMzYwLDkgKzEzNjAs MTEgQEAgaTkxNV9nZW1fb2JqZWN0X3dhaXRfcmVuZGVyaW5nX19ub25ibG9ja2luZyhzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQlyZXR1cm4gcmV0OwogCiAJcmVzZXRfY291bnRl ciA9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpOworCWk5 MTVfZ2VtX3JlcXVlc3RfcmVmZXJlbmNlKHJlcSk7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVj dF9tdXRleCk7CiAJcmV0ID0gX193YWl0X3NlcW5vKHJpbmcsIHNlcW5vLCByZXNldF9jb3VudGVy LCB0cnVlLCBOVUxMLCBmaWxlX3ByaXYpOwogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4 KTsKKwlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcSk7CiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKIApAQCAtMjgxOSw2ICsyODIxLDcgQEAgaTkxNV9nZW1fd2FpdF9pb2N0bChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3dhaXQgKmFyZ3MgPSBkYXRhOwogCXN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmo7CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXE7CiAJc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IE5VTEw7CiAJdW5zaWduZWQgcmVzZXRfY291bnRl cjsKIAl1MzIgc2Vxbm8gPSAwOwpAQCAtMjg0NSw3ICsyODQ4LDggQEAgaTkxNV9nZW1fd2FpdF9p b2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUg KmZpbGUpCiAJaWYgKCFvYmotPmFjdGl2ZSB8fCAhb2JqLT5sYXN0X3JlYWRfcmVxKQogCQlnb3Rv IG91dDsKIAotCXNlcW5vID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8ob2JqLT5sYXN0X3Jl YWRfcmVxKTsKKwlyZXEgPSBvYmotPmxhc3RfcmVhZF9yZXE7CisJc2Vxbm8gPSBpOTE1X2dlbV9y ZXF1ZXN0X2dldF9zZXFubyhyZXEpOwogCVdBUk5fT04oc2Vxbm8gPT0gMCk7CiAJcmluZyA9IG9i ai0+cmluZzsKIApAQCAtMjg1OSwxMCArMjg2MywxNSBAQCBpOTE1X2dlbV93YWl0X2lvY3RsKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkK IAogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZvYmotPmJhc2UpOwogCXJlc2V0X2NvdW50 ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKTsKKwlp OTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShyZXEpOwogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwogCi0JcmV0dXJuIF9fd2FpdF9zZXFubyhyaW5nLCBzZXFubywgcmVzZXRfY291 bnRlciwgdHJ1ZSwgJmFyZ3MtPnRpbWVvdXRfbnMsCi0JCQkgICAgZmlsZS0+ZHJpdmVyX3ByaXYp OworCXJldCA9IF9fd2FpdF9zZXFubyhyaW5nLCBzZXFubywgcmVzZXRfY291bnRlciwgdHJ1ZSwg JmFyZ3MtPnRpbWVvdXRfbnMsCisJCQkgICBmaWxlLT5kcml2ZXJfcHJpdik7CisJbXV0ZXhfbG9j aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVx KTsKKwltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwlyZXR1cm4gcmV0OwogCiBv dXQ6CiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJm9iai0+YmFzZSk7CkBAIC00MDM0LDYg KzQwNDMsOCBAQCBpOTE1X2dlbV9yaW5nX3Rocm90dGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIAkJdGFyZ2V0ID0gcmVxdWVzdDsKIAl9CiAJcmVzZXRf Y291bnRlciA9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIp OworCWlmICh0YXJnZXQpCisJCWk5MTVfZ2VtX3JlcXVlc3RfcmVmZXJlbmNlKHRhcmdldCk7CiAJ c3Bpbl91bmxvY2soJmZpbGVfcHJpdi0+bW0ubG9jayk7CiAKIAlpZiAodGFyZ2V0ID09IE5VTEwp CkBAIC00MDQ1LDYgKzQwNTYsMTAgQEAgaTkxNV9nZW1fcmluZ190aHJvdHRsZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJaWYgKHJldCA9PSAwKQogCQlx dWV1ZV9kZWxheWVkX3dvcmsoZGV2X3ByaXYtPndxLCAmZGV2X3ByaXYtPm1tLnJldGlyZV93b3Jr LCAwKTsKIAorCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwlpOTE1X2dlbV9yZXF1 ZXN0X3VucmVmZXJlbmNlKHRhcmdldCk7CisJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CisKIAlyZXR1cm4gcmV0OwogfQogCi0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=