From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [RFC 1/4] drm/i915: Move releasing of the GEM request from free to retire/cancel Date: Fri, 8 Apr 2016 14:54:55 +0100 Message-ID: <1460123698-16832-2-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1460123698-16832-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 75EE46E03F for ; Fri, 8 Apr 2016 13:55:02 +0000 (UTC) In-Reply-To: <1460123698-16832-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CgpJZiB3ZSBtb3Zl IHRoZSByZWxlYXNlIG9mIHRoZSBHRU0gcmVxdWVzdCAoaS5lLiBkZWNvdXBsaW5nIGl0IGZyb20g dGhlCnZhcmlvdXMgbGlzdHMgdXNlZCBmb3IgY2xpZW50IGFuZCBjb250ZXh0IHRyYWNraW5nKSBh ZnRlciBpdCBpcyBjb21wbGV0ZQooZWl0aGVyIGJ5IHRoZSBHUFUgcmV0aXJpbmcgdGhlIHJlcXVl c3QsIG9yIGJ5IHRoZSBjYWxsZXIgY2FuY2VsbGluZyB0aGUKcmVxdWVzdCksIHdlIGNhbiByZW1v dmUgdGhlIHJlcXVpcmVtZW50IHRoYXQgdGhlIGZpbmFsIHVucmVmZXJlbmNlIG9mCnRoZSBHRU0g cmVxdWVzdCBuZWVkIHRvIGJlIHVuZGVyIHRoZSBzdHJ1Y3RfbXV0ZXguCgp2MjogRXhlY2xpc3Rz IGFzIGFsd2F5cyBpcyBiYWRseSBhc3ltZXRyaWMgYW5kIHllYXIgb2xkIHBhdGNoZXMgc3RpbGwK aGF2ZW4ndCBsYW5kZWQgdG8gZml4IGl0IHVwLgoKdjM6IEV4dHJhY3RlZCwgcmViYXNlZCBhbmQg Zml4ZWQgZm9yIEd1Qy4gKFR2cnRrbyBVcnN1bGluKQoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2ls c29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1 bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCAgICAgIHwgMTQgLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYyAgICAgIHwgNTAgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgMiArLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgIHwgIDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwgMjcgaW5z ZXJ0aW9ucygrKSwgNDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg ZGE0MDNmNGZjNjc5Li5mYTE5OWI3ZTUxYjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAt MjM1MiwyMyArMjM1Miw5IEBAIGk5MTVfZ2VtX3JlcXVlc3RfcmVmZXJlbmNlKHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogc3RhdGljIGlubGluZSB2b2lkCiBpOTE1X2dlbV9yZXF1 ZXN0X3VucmVmZXJlbmNlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewotCVdB Uk5fT04oIW11dGV4X2lzX2xvY2tlZCgmcmVxLT5lbmdpbmUtPmRldi0+c3RydWN0X211dGV4KSk7 CiAJa3JlZl9wdXQoJnJlcS0+cmVmLCBpOTE1X2dlbV9yZXF1ZXN0X2ZyZWUpOwogfQogCi1zdGF0 aWMgaW5saW5lIHZvaWQKLWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2VfX3VubG9ja2VkKHN0 cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQotewotCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXY7Ci0KLQlpZiAoIXJlcSkKLQkJcmV0dXJuOwotCi0JZGV2ID0gcmVxLT5lbmdpbmUtPmRldjsK LQlpZiAoa3JlZl9wdXRfbXV0ZXgoJnJlcS0+cmVmLCBpOTE1X2dlbV9yZXF1ZXN0X2ZyZWUsICZk ZXYtPnN0cnVjdF9tdXRleCkpCi0JCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwot fQotCiBzdGF0aWMgaW5saW5lIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICoqcGRzdCwKIAkJCQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpzcmMpCiB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAyMzk0NTI5MzNhODku LmMxZGY2OTZmOTAwMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0xNDEwLDEwICsxNDEw LDMxIEBAIGk5MTVfZ2VtX3JlcXVlc3RfcmVtb3ZlX2Zyb21fY2xpZW50KHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAlyZXF1ZXN0LT5waWQgPSBOVUxMOwogfQogCitzdGF0 aWMgdm9pZCBfX2k5MTVfZ2VtX3JlcXVlc3RfcmVsZWFzZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcXVlc3QpCit7CisJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgeworCQlpZiAo cmVxdWVzdC0+Y3R4ICE9IHJlcXVlc3QtPmk5MTUtPmtlcm5lbF9jb250ZXh0KQorCQkJaW50ZWxf bHJfY29udGV4dF91bnBpbihyZXF1ZXN0LT5jdHgsIHJlcXVlc3QtPmVuZ2luZSk7CisJfQorCisJ aTkxNV9nZW1fcmVxdWVzdF9yZW1vdmVfZnJvbV9jbGllbnQocmVxdWVzdCk7CisKKwlpOTE1X2dl bV9jb250ZXh0X3VucmVmZXJlbmNlKHJlcXVlc3QtPmN0eCk7CisJaTkxNV9nZW1fcmVxdWVzdF91 bnJlZmVyZW5jZShyZXF1ZXN0KTsKK30KKwordm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2NhbmNlbChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKK3sKKwlpbnRlbF9yaW5nX3Jlc2VydmVk X3NwYWNlX2NhbmNlbChyZXEtPnJpbmdidWYpOworCV9faTkxNV9nZW1fcmVxdWVzdF9yZWxlYXNl KHJlcSk7Cit9CisKIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfcmV0aXJlKHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIHsKIAl0cmFjZV9pOTE1X2dlbV9yZXF1ZXN0 X3JldGlyZShyZXF1ZXN0KTsKIAorCWxpc3RfZGVsX2luaXQoJnJlcXVlc3QtPmxpc3QpOworCiAJ LyogV2Uga25vdyB0aGUgR1BVIG11c3QgaGF2ZSByZWFkIHRoZSByZXF1ZXN0IHRvIGhhdmUKIAkg KiBzZW50IHVzIHRoZSBzZXFubyArIGludGVycnVwdCwgc28gdXNlIHRoZSBwb3NpdGlvbgogCSAq IG9mIHRhaWwgb2YgdGhlIHJlcXVlc3QgdG8gdXBkYXRlIHRoZSBsYXN0IGtub3duIHBvc2l0aW9u CkBAIC0xNDI0LDEwICsxNDQ1LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9yZXRp cmUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCSAqLwogCXJlcXVlc3Qt PnJpbmdidWYtPmxhc3RfcmV0aXJlZF9oZWFkID0gcmVxdWVzdC0+cG9zdGZpeDsKIAotCWxpc3Rf ZGVsX2luaXQoJnJlcXVlc3QtPmxpc3QpOwotCWk5MTVfZ2VtX3JlcXVlc3RfcmVtb3ZlX2Zyb21f Y2xpZW50KHJlcXVlc3QpOwotCi0JaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZShyZXF1ZXN0 KTsKKwlfX2k5MTVfZ2VtX3JlcXVlc3RfcmVsZWFzZShyZXF1ZXN0KTsKIH0KIAogc3RhdGljIHZv aWQKQEAgLTI3MjMsMTggKzI3NDEsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3NldF9yZXNldF9zdGF0 dXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogdm9pZCBpOTE1X2dlbV9yZXF1 ZXN0X2ZyZWUoc3RydWN0IGtyZWYgKnJlcV9yZWYpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXEgPSBjb250YWluZXJfb2YocmVxX3JlZiwKLQkJCQkJCSB0eXBlb2YoKnJlcSks IHJlZik7Ci0Jc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IHJlcS0+Y3R4OwotCi0JaWYgKHJl cS0+ZmlsZV9wcml2KQotCQlpOTE1X2dlbV9yZXF1ZXN0X3JlbW92ZV9mcm9tX2NsaWVudChyZXEp OwotCi0JaWYgKGN0eCkgewotCQlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzICYmIGN0eCAhPSBy ZXEtPmk5MTUtPmtlcm5lbF9jb250ZXh0KQotCQkJaW50ZWxfbHJfY29udGV4dF91bnBpbihjdHgs IHJlcS0+ZW5naW5lKTsKLQotCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKGN0eCk7Ci0J fQorCQkJCQkJCXR5cGVvZigqcmVxKSwgcmVmKTsKIAogCWttZW1fY2FjaGVfZnJlZShyZXEtPmk5 MTUtPnJlcXVlc3RzLCByZXEpOwogfQpAQCAtMjgzMCwxMyArMjgzNyw2IEBAIGk5MTVfZ2VtX3Jl cXVlc3RfYWxsb2Moc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCXJldHVybiBlcnIg PyBFUlJfUFRSKGVycikgOiByZXE7CiB9CiAKLXZvaWQgaTkxNV9nZW1fcmVxdWVzdF9jYW5jZWwo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCi17Ci0JaW50ZWxfcmluZ19yZXNlcnZl ZF9zcGFjZV9jYW5jZWwocmVxLT5yaW5nYnVmKTsKLQotCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZl cmVuY2UocmVxKTsKLX0KLQogc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICoKIGk5MTVfZ2Vt X2ZpbmRfYWN0aXZlX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewpA QCAtMzE5NCw3ICszMTk0LDcgQEAgaTkxNV9nZW1fd2FpdF9pb2N0bChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJCQlyZXQgPSBfX2k5 MTVfd2FpdF9yZXF1ZXN0KHJlcVtpXSwgcmVzZXRfY291bnRlciwgdHJ1ZSwKIAkJCQkJCSAgYXJn cy0+dGltZW91dF9ucyA+IDAgPyAmYXJncy0+dGltZW91dF9ucyA6IE5VTEwsCiAJCQkJCQkgIHRv X3Jwc19jbGllbnQoZmlsZSkpOwotCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlX191bmxv Y2tlZChyZXFbaV0pOworCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcVtpXSk7CiAJ fQogCXJldHVybiByZXQ7CiAKQEAgLTQyMTYsNyArNDIxNiw3IEBAIGk5MTVfZ2VtX3JpbmdfdGhy b3R0bGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCWlm IChyZXQgPT0gMCkKIAkJcXVldWVfZGVsYXllZF93b3JrKGRldl9wcml2LT53cSwgJmRldl9wcml2 LT5tbS5yZXRpcmVfd29yaywgMCk7CiAKLQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlX191 bmxvY2tlZCh0YXJnZXQpOworCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UodGFyZ2V0KTsK IAogCXJldHVybiByZXQ7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXgg ZmViNzAyODM0MWI4Li5mMmNlNzMxMGUyYjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKQEAgLTExMzYyLDcgKzExMzYyLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW1pb19mbGlw X3dvcmtfZnVuYyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJCQkJCSAgICBtbWlvX2ZsaXAt PmNydGMtPnJlc2V0X2NvdW50ZXIsCiAJCQkJCSAgICBmYWxzZSwgTlVMTCwKIAkJCQkJICAgICZt bWlvX2ZsaXAtPmk5MTUtPnJwcy5tbWlvZmxpcHMpKTsKLQkJaTkxNV9nZW1fcmVxdWVzdF91bnJl ZmVyZW5jZV9fdW5sb2NrZWQobW1pb19mbGlwLT5yZXEpOworCQlpOTE1X2dlbV9yZXF1ZXN0X3Vu cmVmZXJlbmNlKG1taW9fZmxpcC0+cmVxKTsKIAl9CiAKIAkvKiBGb3IgZnJhbWVidWZmZXIgYmFj a2VkIGJ5IGRtYWJ1Ziwgd2FpdCBmb3IgZmVuY2UgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmlu ZGV4IDQzYjI0YTFmNWVlNi4uMzQ2ZTM1M2I0ZmU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK QEAgLTczNzgsNyArNzM3OCw3IEBAIHN0YXRpYyB2b2lkIF9faW50ZWxfcnBzX2Jvb3N0X3dvcmso c3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCQlnZW42X3Jwc19ib29zdCh0b19pOTE1KHJlcS0+ ZW5naW5lLT5kZXYpLCBOVUxMLAogCQkJICAgICAgIHJlcS0+ZW1pdHRlZF9qaWZmaWVzKTsKIAot CWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2VfX3VubG9ja2VkKHJlcSk7CisJaTkxNV9nZW1f cmVxdWVzdF91bnJlZmVyZW5jZShyZXEpOwogCWtmcmVlKGJvb3N0KTsKIH0KIAotLSAKMS45LjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=