From: Dave Gordon Subject: [PATCH v2 2/6] drm/i915/guc: move guc_ring_doorbell() nearer to callsite Date: Fri, 10 Jun 2016 17:50:57 +0100 Message-ID: <1465577461-35616-3-git-send-email-david.s.gordon@intel.com> References: <1465577461-35616-1-git-send-email-david.s.gordon@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 3C72C6EDC7 for ; Fri, 10 Jun 2016 16:51:08 +0000 (UTC) In-Reply-To: <1465577461-35616-1-git-send-email-david.s.gordon@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 SnVzdCBjb2RlIG1vdmVtZW50LCBubyBhY3R1YWwgY2hhbmdlIHRvIHRoZSBmdW5jdGlvbi4gVGhp cyBpcyBpbgpwcmVwYXJhdGlvbiBmb3IgdGhlIG5leHQgcGF0Y2gsIHdoaWNoIHdpbGwgcmVvcmdh bmlzZSBhbGwgdGhlIG90aGVyCmRvb3JiZWxsIGNvZGUsIGJ1dCBkb2Vzbid0IGNoYW5nZSB0aGlz IGZ1bmN0aW9uLiBTbyBsZXQncyBzaHVmZmxlIGl0CmRvd24gbmVhciBpdHMgY2FsbGVyIHJhdGhl ciB0aGFuIGxlYXZpbmcgaXQgbWl4ZWQgaW4gd2l0aCB0aGUgc2V0dXAKY29kZS4gVW5saWtlIHRo ZSBkb29yYmVsbCBtYW5hZ2VtZW50IGNvZGUsIHRoaXMgZnVuY3Rpb24gaXMgc29tZXdoYXQKdGlt ZS1jcml0aWNhbCwgc28gcHV0dGluZyBpdCBuZWFyIGl0cyBjYWxsZXIgbWF5IGV2ZW4geWllbGQg YSB0aW55CnBlcmZvcm1hbmNlIGltcHJvdmVtZW50LgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jk b24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1bGlu IDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jIHwgMTEwICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgNTUgaW5zZXJ0aW9ucygrKSwgNTUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDJkYjExODIuLjc1MTA4 NDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTE4 NSw2MSArMTg1LDYgQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfZG9vcmJlbGwoc3RydWN0IGludGVs X2d1YyAqZ3VjLAogCWRvb3JiZWxsLT5jb29raWUgPSAwOwogfQogCi1zdGF0aWMgaW50IGd1Y19y aW5nX2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQotewotCXN0cnVjdCBndWNf cHJvY2Vzc19kZXNjICpkZXNjOwotCXVuaW9uIGd1Y19kb29yYmVsbF9xdyBkYl9jbXAsIGRiX2V4 YywgZGJfcmV0OwotCXVuaW9uIGd1Y19kb29yYmVsbF9xdyAqZGI7Ci0JaW50IGF0dGVtcHQgPSAy LCByZXQgPSAtRUFHQUlOOwotCi0JZGVzYyA9IGdjLT5jbGllbnRfYmFzZSArIGdjLT5wcm9jX2Rl c2Nfb2Zmc2V0OwotCi0JLyogVXBkYXRlIHRoZSB0YWlsIHNvIGl0IGlzIHZpc2libGUgdG8gR3VD ICovCi0JZGVzYy0+dGFpbCA9IGdjLT53cV90YWlsOwotCi0JLyogY3VycmVudCBjb29raWUgKi8K LQlkYl9jbXAuZGJfc3RhdHVzID0gR1VDX0RPT1JCRUxMX0VOQUJMRUQ7Ci0JZGJfY21wLmNvb2tp ZSA9IGdjLT5jb29raWU7Ci0KLQkvKiBjb29raWUgdG8gYmUgdXBkYXRlZCAqLwotCWRiX2V4Yy5k Yl9zdGF0dXMgPSBHVUNfRE9PUkJFTExfRU5BQkxFRDsKLQlkYl9leGMuY29va2llID0gZ2MtPmNv b2tpZSArIDE7Ci0JaWYgKGRiX2V4Yy5jb29raWUgPT0gMCkKLQkJZGJfZXhjLmNvb2tpZSA9IDE7 Ci0KLQkvKiBwb2ludGVyIG9mIGN1cnJlbnQgZG9vcmJlbGwgY2FjaGVsaW5lICovCi0JZGIgPSBn Yy0+Y2xpZW50X2Jhc2UgKyBnYy0+ZG9vcmJlbGxfb2Zmc2V0OwotCi0Jd2hpbGUgKGF0dGVtcHQt LSkgewotCQkvKiBsZXRzIHJpbmcgdGhlIGRvb3JiZWxsICovCi0JCWRiX3JldC52YWx1ZV9xdyA9 IGF0b21pYzY0X2NtcHhjaGcoKGF0b21pYzY0X3QgKilkYiwKLQkJCWRiX2NtcC52YWx1ZV9xdywg ZGJfZXhjLnZhbHVlX3F3KTsKLQotCQkvKiBpZiB0aGUgZXhjaGFuZ2Ugd2FzIHN1Y2Nlc3NmdWxs eSBleGVjdXRlZCAqLwotCQlpZiAoZGJfcmV0LnZhbHVlX3F3ID09IGRiX2NtcC52YWx1ZV9xdykg ewotCQkJLyogZGIgd2FzIHN1Y2Nlc3NmdWxseSBydW5nICovCi0JCQlnYy0+Y29va2llID0gZGJf ZXhjLmNvb2tpZTsKLQkJCXJldCA9IDA7Ci0JCQlicmVhazsKLQkJfQotCi0JCS8qIFhYWDogZG9v cmJlbGwgd2FzIGxvc3QgYW5kIG5lZWQgdG8gYWNxdWlyZSBpdCBhZ2FpbiAqLwotCQlpZiAoZGJf cmV0LmRiX3N0YXR1cyA9PSBHVUNfRE9PUkJFTExfRElTQUJMRUQpCi0JCQlicmVhazsKLQotCQlE Uk1fRVJST1IoIkNvb2tpZSBtaXNtYXRjaC4gRXhwZWN0ZWQgJWQsIHJldHVybmVkICVkXG4iLAot CQkJICBkYl9jbXAuY29va2llLCBkYl9yZXQuY29va2llKTsKLQotCQkvKiB1cGRhdGUgdGhlIGNv b2tpZSB0byBuZXdseSByZWFkIGNvb2tpZSBmcm9tIEd1QyAqLwotCQlkYl9jbXAuY29va2llID0g ZGJfcmV0LmNvb2tpZTsKLQkJZGJfZXhjLmNvb2tpZSA9IGRiX3JldC5jb29raWUgKyAxOwotCQlp ZiAoZGJfZXhjLmNvb2tpZSA9PSAwKQotCQkJZGJfZXhjLmNvb2tpZSA9IDE7Ci0JfQotCi0JcmV0 dXJuIHJldDsKLX0KLQogc3RhdGljIHZvaWQgZ3VjX2Rpc2FibGVfZG9vcmJlbGwoc3RydWN0IGlu dGVsX2d1YyAqZ3VjLAogCQkJCSBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCiB7CkBA IC01NDMsNiArNDg4LDYxIEBAIHN0YXRpYyB2b2lkIGd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0oc3Ry dWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCiAJa3VubWFwX2F0b21pYyhiYXNlKTsKIH0KIAorc3Rh dGljIGludCBndWNfcmluZ19kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKK3sK KwlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVzYyAqZGVzYzsKKwl1bmlvbiBndWNfZG9vcmJlbGxfcXcg ZGJfY21wLCBkYl9leGMsIGRiX3JldDsKKwl1bmlvbiBndWNfZG9vcmJlbGxfcXcgKmRiOworCWlu dCBhdHRlbXB0ID0gMiwgcmV0ID0gLUVBR0FJTjsKKworCWRlc2MgPSBnYy0+Y2xpZW50X2Jhc2Ug KyBnYy0+cHJvY19kZXNjX29mZnNldDsKKworCS8qIFVwZGF0ZSB0aGUgdGFpbCBzbyBpdCBpcyB2 aXNpYmxlIHRvIEd1QyAqLworCWRlc2MtPnRhaWwgPSBnYy0+d3FfdGFpbDsKKworCS8qIGN1cnJl bnQgY29va2llICovCisJZGJfY21wLmRiX3N0YXR1cyA9IEdVQ19ET09SQkVMTF9FTkFCTEVEOwor CWRiX2NtcC5jb29raWUgPSBnYy0+Y29va2llOworCisJLyogY29va2llIHRvIGJlIHVwZGF0ZWQg Ki8KKwlkYl9leGMuZGJfc3RhdHVzID0gR1VDX0RPT1JCRUxMX0VOQUJMRUQ7CisJZGJfZXhjLmNv b2tpZSA9IGdjLT5jb29raWUgKyAxOworCWlmIChkYl9leGMuY29va2llID09IDApCisJCWRiX2V4 Yy5jb29raWUgPSAxOworCisJLyogcG9pbnRlciBvZiBjdXJyZW50IGRvb3JiZWxsIGNhY2hlbGlu ZSAqLworCWRiID0gZ2MtPmNsaWVudF9iYXNlICsgZ2MtPmRvb3JiZWxsX29mZnNldDsKKworCXdo aWxlIChhdHRlbXB0LS0pIHsKKwkJLyogbGV0cyByaW5nIHRoZSBkb29yYmVsbCAqLworCQlkYl9y ZXQudmFsdWVfcXcgPSBhdG9taWM2NF9jbXB4Y2hnKChhdG9taWM2NF90ICopZGIsCisJCQlkYl9j bXAudmFsdWVfcXcsIGRiX2V4Yy52YWx1ZV9xdyk7CisKKwkJLyogaWYgdGhlIGV4Y2hhbmdlIHdh cyBzdWNjZXNzZnVsbHkgZXhlY3V0ZWQgKi8KKwkJaWYgKGRiX3JldC52YWx1ZV9xdyA9PSBkYl9j bXAudmFsdWVfcXcpIHsKKwkJCS8qIGRiIHdhcyBzdWNjZXNzZnVsbHkgcnVuZyAqLworCQkJZ2Mt PmNvb2tpZSA9IGRiX2V4Yy5jb29raWU7CisJCQlyZXQgPSAwOworCQkJYnJlYWs7CisJCX0KKwor CQkvKiBYWFg6IGRvb3JiZWxsIHdhcyBsb3N0IGFuZCBuZWVkIHRvIGFjcXVpcmUgaXQgYWdhaW4g Ki8KKwkJaWYgKGRiX3JldC5kYl9zdGF0dXMgPT0gR1VDX0RPT1JCRUxMX0RJU0FCTEVEKQorCQkJ YnJlYWs7CisKKwkJRFJNX0VSUk9SKCJDb29raWUgbWlzbWF0Y2guIEV4cGVjdGVkICVkLCByZXR1 cm5lZCAlZFxuIiwKKwkJCSAgZGJfY21wLmNvb2tpZSwgZGJfcmV0LmNvb2tpZSk7CisKKwkJLyog dXBkYXRlIHRoZSBjb29raWUgdG8gbmV3bHkgcmVhZCBjb29raWUgZnJvbSBHdUMgKi8KKwkJZGJf Y21wLmNvb2tpZSA9IGRiX3JldC5jb29raWU7CisJCWRiX2V4Yy5jb29raWUgPSBkYl9yZXQuY29v a2llICsgMTsKKwkJaWYgKGRiX2V4Yy5jb29raWUgPT0gMCkKKwkJCWRiX2V4Yy5jb29raWUgPSAx OworCX0KKworCXJldHVybiByZXQ7Cit9CisKIC8qKgogICogaTkxNV9ndWNfc3VibWl0KCkgLSBT dWJtaXQgY29tbWFuZHMgdGhyb3VnaCBHdUMKICAqIEBycToJCXJlcXVlc3QgYXNzb2NpYXRlZCB3 aXRoIHRoZSBjb21tYW5kcwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=