From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v2 04/14] drm/i915: Inline __i915_gem_request_wait_for_execute() Date: Tue, 14 Feb 2017 09:54:03 +0000 Message-ID: <20170214095413.26452-5-chris@chris-wilson.co.uk> References: <20170214095413.26452-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 846586E644 for ; Tue, 14 Feb 2017 09:54:23 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id r18so2650675wmd.3 for ; Tue, 14 Feb 2017 01:54:23 -0800 (PST) In-Reply-To: <20170214095413.26452-1-chris@chris-wilson.co.uk> 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 SXQgaGFkIG9ubHkgb25lIGNhbGxzaXRlIGFuZCBleGlzdGVkIHRvIGtlZXAgdGhlIGNvZGUgY2xl YXJlci4gTm93CmhhdmluZyBzaGFyZWQgdGhlIHdhaXQtb24tZXJyb3IgYmV0d2VlbiBwaGFzZXMg YW5kIHdpdGggcGxhbnMgdG8gY2hhbmdlCnRoZSB3YWl0LWZvci1leGVjdXRlIGluIHRoZSBuZXh0 IGZldyBwYXRjaGVzLCByZW1vdmUgdGhlIG91dCBvZiBsaW5lCndhaXQgbG9vcCBhbmQgbW92ZSBp dCBpbnRvIHRoZSBtYWluIGJvZHkgb2YgaTkxNV93YWl0X3JlcXVlc3QuCgpTaWduZWQtb2ZmLWJ5 OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMgfCA3OCArKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCA0OSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMKaW5kZXggZGNjMGE3 YWI5NWRjLi4wMDFmYzlmZWRmNDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX3JlcXVlc3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1 ZXN0LmMKQEAgLTk4OCw1NCArOTg4LDYgQEAgYm9vbCBfX2k5MTVfc3Bpbl9yZXF1ZXN0KGNvbnN0 IHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCXJldHVybiBmYWxzZTsKIH0KIAot c3RhdGljIGxvbmcKLV9faTkxNV9yZXF1ZXN0X3dhaXRfZm9yX2V4ZWN1dGUoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LAotCQkJCXVuc2lnbmVkIGludCBmbGFncywKLQkJCQls b25nIHRpbWVvdXQpCi17Ci0JY29uc3QgaW50IHN0YXRlID0gZmxhZ3MgJiBJOTE1X1dBSVRfSU5U RVJSVVBUSUJMRSA/Ci0JCVRBU0tfSU5URVJSVVBUSUJMRSA6IFRBU0tfVU5JTlRFUlJVUFRJQkxF OwotCXdhaXRfcXVldWVfaGVhZF90ICpxID0gJnJlcXVlc3QtPmk5MTUtPmdwdV9lcnJvci53YWl0 X3F1ZXVlOwotCURFRklORV9XQUlUKHJlc2V0KTsKLQlERUZJTkVfV0FJVCh3YWl0KTsKLQotCWlm IChmbGFncyAmIEk5MTVfV0FJVF9MT0NLRUQpCi0JCWFkZF93YWl0X3F1ZXVlKHEsICZyZXNldCk7 Ci0KLQlkbyB7Ci0JCXByZXBhcmVfdG9fd2FpdCgmcmVxdWVzdC0+ZXhlY3V0ZS53YWl0LCAmd2Fp dCwgc3RhdGUpOwotCi0JCWlmIChpOTE1X3N3X2ZlbmNlX2RvbmUoJnJlcXVlc3QtPmV4ZWN1dGUp KQotCQkJYnJlYWs7Ci0KLQkJaWYgKGZsYWdzICYgSTkxNV9XQUlUX0xPQ0tFRCAmJgotCQkgICAg aTkxNV9yZXNldF9pbl9wcm9ncmVzcygmcmVxdWVzdC0+aTkxNS0+Z3B1X2Vycm9yKSkgewotCQkJ X19zZXRfY3VycmVudF9zdGF0ZShUQVNLX1JVTk5JTkcpOwotCQkJaTkxNV9yZXNldChyZXF1ZXN0 LT5pOTE1KTsKLQkJCXJlc2V0X3dhaXRfcXVldWUocSwgJnJlc2V0KTsKLQkJCWNvbnRpbnVlOwot CQl9Ci0KLQkJaWYgKHNpZ25hbF9wZW5kaW5nX3N0YXRlKHN0YXRlLCBjdXJyZW50KSkgewotCQkJ dGltZW91dCA9IC1FUkVTVEFSVFNZUzsKLQkJCWJyZWFrOwotCQl9Ci0KLQkJaWYgKCF0aW1lb3V0 KSB7Ci0JCQl0aW1lb3V0ID0gLUVUSU1FOwotCQkJYnJlYWs7Ci0JCX0KLQotCQl0aW1lb3V0ID0g aW9fc2NoZWR1bGVfdGltZW91dCh0aW1lb3V0KTsKLQl9IHdoaWxlICgxKTsKLQlmaW5pc2hfd2Fp dCgmcmVxdWVzdC0+ZXhlY3V0ZS53YWl0LCAmd2FpdCk7Ci0KLQlpZiAoZmxhZ3MgJiBJOTE1X1dB SVRfTE9DS0VEKQotCQlyZW1vdmVfd2FpdF9xdWV1ZShxLCAmcmVzZXQpOwotCi0JcmV0dXJuIHRp bWVvdXQ7Ci19Ci0KIC8qKgogICogaTkxNV93YWl0X3JlcXVlc3QgLSB3YWl0IHVudGlsIGV4ZWN1 dGlvbiBvZiByZXF1ZXN0IGhhcyBmaW5pc2hlZAogICogQHJlcTogdGhlIHJlcXVlc3QgdG8gd2Fp dCB1cG9uCkBAIC0xMDg1LDcgKzEwMzcsMzUgQEAgbG9uZyBpOTE1X3dhaXRfcmVxdWVzdChzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJYWRkX3dhaXRfcXVldWUoZXJycSwgJnJl c2V0KTsKIAogCWlmICghaTkxNV9zd19mZW5jZV9kb25lKCZyZXEtPmV4ZWN1dGUpKSB7Ci0JCXRp bWVvdXQgPSBfX2k5MTVfcmVxdWVzdF93YWl0X2Zvcl9leGVjdXRlKHJlcSwgZmxhZ3MsIHRpbWVv dXQpOworCQlERUZJTkVfV0FJVChleGVjKTsKKworCQlkbyB7CisJCQlwcmVwYXJlX3RvX3dhaXQo JnJlcS0+ZXhlY3V0ZS53YWl0LCAmZXhlYywgc3RhdGUpOworCQkJaWYgKGk5MTVfc3dfZmVuY2Vf ZG9uZSgmcmVxLT5leGVjdXRlKSkKKwkJCQlicmVhazsKKworCQkJaWYgKGZsYWdzICYgSTkxNV9X QUlUX0xPQ0tFRCAmJgorCQkJICAgIGk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJnJlcS0+aTkxNS0+ Z3B1X2Vycm9yKSkgeworCQkJCV9fc2V0X2N1cnJlbnRfc3RhdGUoVEFTS19SVU5OSU5HKTsKKwkJ CQlpOTE1X3Jlc2V0KHJlcS0+aTkxNSk7CisJCQkJcmVzZXRfd2FpdF9xdWV1ZShlcnJxLCAmcmVz ZXQpOworCQkJCWNvbnRpbnVlOworCQkJfQorCisJCQlpZiAoc2lnbmFsX3BlbmRpbmdfc3RhdGUo c3RhdGUsIGN1cnJlbnQpKSB7CisJCQkJdGltZW91dCA9IC1FUkVTVEFSVFNZUzsKKwkJCQlicmVh azsKKwkJCX0KKworCQkJaWYgKCF0aW1lb3V0KSB7CisJCQkJdGltZW91dCA9IC1FVElNRTsKKwkJ CQlicmVhazsKKwkJCX0KKworCQkJdGltZW91dCA9IGlvX3NjaGVkdWxlX3RpbWVvdXQodGltZW91 dCk7CisJCX0gd2hpbGUgKDEpOworCQlmaW5pc2hfd2FpdCgmcmVxLT5leGVjdXRlLndhaXQsICZl eGVjKTsKKwogCQlpZiAodGltZW91dCA8IDApCiAJCQlnb3RvIGNvbXBsZXRlOwogCi0tIAoyLjEx LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=