From: Dave Gordon Subject: [PATCH v4 2/6] drm/i915/guc: move guc_ring_doorbell() nearer to callsite Date: Thu, 7 Apr 2016 18:21:14 +0100 Message-ID: <1460049678-21918-3-git-send-email-david.s.gordon@intel.com> References: <1460049678-21918-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id CBB896E9E9 for ; Thu, 7 Apr 2016 17:21:49 +0000 (UTC) In-Reply-To: <1460049678-21918-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 b24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2d1Y19zdWJtaXNzaW9uLmMgfCAxMjggKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA2NyBpbnNlcnRpb25zKCspLCA2MSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggZGE4NmJkYi4uMjE3 MTc1OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lv bi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAt MTkwLDY3ICsxOTAsNiBAQCBzdGF0aWMgdm9pZCBndWNfaW5pdF9kb29yYmVsbChzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMsCiAJa3VubWFwX2F0b21pYyhiYXNlKTsKIH0KIAotc3RhdGljIGludCBndWNf cmluZ19kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKLXsKLQlzdHJ1Y3QgZ3Vj X3Byb2Nlc3NfZGVzYyAqZGVzYzsKLQl1bmlvbiBndWNfZG9vcmJlbGxfcXcgZGJfY21wLCBkYl9l eGMsIGRiX3JldDsKLQl1bmlvbiBndWNfZG9vcmJlbGxfcXcgKmRiOwotCXZvaWQgKmJhc2U7Ci0J aW50IGF0dGVtcHQgPSAyLCByZXQgPSAtRUFHQUlOOwotCi0JYmFzZSA9IGttYXBfYXRvbWljKGk5 MTVfZ2VtX29iamVjdF9nZXRfcGFnZShnYy0+Y2xpZW50X29iaiwgMCkpOwotCWRlc2MgPSBiYXNl ICsgZ2MtPnByb2NfZGVzY19vZmZzZXQ7Ci0KLQkvKiBVcGRhdGUgdGhlIHRhaWwgc28gaXQgaXMg dmlzaWJsZSB0byBHdUMgKi8KLQlkZXNjLT50YWlsID0gZ2MtPndxX3RhaWw7Ci0KLQkvKiBjdXJy ZW50IGNvb2tpZSAqLwotCWRiX2NtcC5kYl9zdGF0dXMgPSBHVUNfRE9PUkJFTExfRU5BQkxFRDsK LQlkYl9jbXAuY29va2llID0gZ2MtPmNvb2tpZTsKLQotCS8qIGNvb2tpZSB0byBiZSB1cGRhdGVk ICovCi0JZGJfZXhjLmRiX3N0YXR1cyA9IEdVQ19ET09SQkVMTF9FTkFCTEVEOwotCWRiX2V4Yy5j b29raWUgPSBnYy0+Y29va2llICsgMTsKLQlpZiAoZGJfZXhjLmNvb2tpZSA9PSAwKQotCQlkYl9l eGMuY29va2llID0gMTsKLQotCS8qIHBvaW50ZXIgb2YgY3VycmVudCBkb29yYmVsbCBjYWNoZWxp bmUgKi8KLQlkYiA9IGJhc2UgKyBnYy0+ZG9vcmJlbGxfb2Zmc2V0OwotCi0Jd2hpbGUgKGF0dGVt cHQtLSkgewotCQkvKiBsZXRzIHJpbmcgdGhlIGRvb3JiZWxsICovCi0JCWRiX3JldC52YWx1ZV9x dyA9IGF0b21pYzY0X2NtcHhjaGcoKGF0b21pYzY0X3QgKilkYiwKLQkJCWRiX2NtcC52YWx1ZV9x dywgZGJfZXhjLnZhbHVlX3F3KTsKLQotCQkvKiBpZiB0aGUgZXhjaGFuZ2Ugd2FzIHN1Y2Nlc3Nm dWxseSBleGVjdXRlZCAqLwotCQlpZiAoZGJfcmV0LnZhbHVlX3F3ID09IGRiX2NtcC52YWx1ZV9x dykgewotCQkJLyogZGIgd2FzIHN1Y2Nlc3NmdWxseSBydW5nICovCi0JCQlnYy0+Y29va2llID0g ZGJfZXhjLmNvb2tpZTsKLQkJCXJldCA9IDA7Ci0JCQlicmVhazsKLQkJfQotCi0JCS8qIFhYWDog ZG9vcmJlbGwgd2FzIGxvc3QgYW5kIG5lZWQgdG8gYWNxdWlyZSBpdCBhZ2FpbiAqLwotCQlpZiAo ZGJfcmV0LmRiX3N0YXR1cyA9PSBHVUNfRE9PUkJFTExfRElTQUJMRUQpCi0JCQlicmVhazsKLQot CQlEUk1fRVJST1IoIkNvb2tpZSBtaXNtYXRjaC4gRXhwZWN0ZWQgJWQsIHJldHVybmVkICVkXG4i LAotCQkJICBkYl9jbXAuY29va2llLCBkYl9yZXQuY29va2llKTsKLQotCQkvKiB1cGRhdGUgdGhl IGNvb2tpZSB0byBuZXdseSByZWFkIGNvb2tpZSBmcm9tIEd1QyAqLwotCQlkYl9jbXAuY29va2ll ID0gZGJfcmV0LmNvb2tpZTsKLQkJZGJfZXhjLmNvb2tpZSA9IGRiX3JldC5jb29raWUgKyAxOwot CQlpZiAoZGJfZXhjLmNvb2tpZSA9PSAwKQotCQkJZGJfZXhjLmNvb2tpZSA9IDE7Ci0JfQotCi0J LyogRmluYWxseSwgdXBkYXRlIHRoZSBjYWNoZWQgY29weSBvZiB0aGUgR3VDJ3MgV1EgaGVhZCAq LwotCWdjLT53cV9oZWFkID0gZGVzYy0+aGVhZDsKLQotCWt1bm1hcF9hdG9taWMoYmFzZSk7Ci0J cmV0dXJuIHJldDsKLX0KLQogc3RhdGljIHZvaWQgZ3VjX2Rpc2FibGVfZG9vcmJlbGwoc3RydWN0 IGludGVsX2d1YyAqZ3VjLAogCQkJCSBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCiB7 CkBAIC00NzEsNiArNDEwLDEyIEBAIHN0YXRpYyB2b2lkIGd1Y19maW5pX2N0eF9kZXNjKHN0cnVj dCBpbnRlbF9ndWMgKmd1YywKIAkJCSAgICAgc2l6ZW9mKGRlc2MpICogY2xpZW50LT5jdHhfaW5k ZXgpOwogfQogCisvKgorICogRXZlcnl0aGluZyBhYm92ZSBoZXJlIGlzIGNvbmNlcm5lZCB3aXRo IHNldHVwICYgdGVhcmRvd24sIGFuZCBpcworICogdGhlcmVmb3JlIG5vdCBwYXJ0IG9mIHRoZSBz b21ld2hhdCB0aW1lLWNyaXRpY2FsIGJhdGNoLXN1Ym1pc3Npb24KKyAqIHBhdGggb2YgaTkxNV9n dWNfc3VibWl0KCkgYmVsb3cuCisgKi8KKwogaW50IGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKHN0 cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQogewogCXN0cnVjdCBndWNfcHJvY2Vzc19kZXNjICpk ZXNjOwpAQCAtNTU5LDYgKzUwNCw2NyBAQCBzdGF0aWMgaW50IGd1Y19hZGRfd29ya3F1ZXVlX2l0 ZW0oc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBp bnQgZ3VjX3JpbmdfZG9vcmJlbGwoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MpCit7CisJc3Ry dWN0IGd1Y19wcm9jZXNzX2Rlc2MgKmRlc2M7CisJdW5pb24gZ3VjX2Rvb3JiZWxsX3F3IGRiX2Nt cCwgZGJfZXhjLCBkYl9yZXQ7CisJdW5pb24gZ3VjX2Rvb3JiZWxsX3F3ICpkYjsKKwl2b2lkICpi YXNlOworCWludCBhdHRlbXB0ID0gMiwgcmV0ID0gLUVBR0FJTjsKKworCWJhc2UgPSBrbWFwX2F0 b21pYyhpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2UoZ2MtPmNsaWVudF9vYmosIDApKTsKKwlkZXNj ID0gYmFzZSArIGdjLT5wcm9jX2Rlc2Nfb2Zmc2V0OworCisJLyogVXBkYXRlIHRoZSB0YWlsIHNv IGl0IGlzIHZpc2libGUgdG8gR3VDICovCisJZGVzYy0+dGFpbCA9IGdjLT53cV90YWlsOworCisJ LyogY3VycmVudCBjb29raWUgKi8KKwlkYl9jbXAuZGJfc3RhdHVzID0gR1VDX0RPT1JCRUxMX0VO QUJMRUQ7CisJZGJfY21wLmNvb2tpZSA9IGdjLT5jb29raWU7CisKKwkvKiBjb29raWUgdG8gYmUg dXBkYXRlZCAqLworCWRiX2V4Yy5kYl9zdGF0dXMgPSBHVUNfRE9PUkJFTExfRU5BQkxFRDsKKwlk Yl9leGMuY29va2llID0gZ2MtPmNvb2tpZSArIDE7CisJaWYgKGRiX2V4Yy5jb29raWUgPT0gMCkK KwkJZGJfZXhjLmNvb2tpZSA9IDE7CisKKwkvKiBwb2ludGVyIG9mIGN1cnJlbnQgZG9vcmJlbGwg Y2FjaGVsaW5lICovCisJZGIgPSBiYXNlICsgZ2MtPmRvb3JiZWxsX29mZnNldDsKKworCXdoaWxl IChhdHRlbXB0LS0pIHsKKwkJLyogbGV0cyByaW5nIHRoZSBkb29yYmVsbCAqLworCQlkYl9yZXQu dmFsdWVfcXcgPSBhdG9taWM2NF9jbXB4Y2hnKChhdG9taWM2NF90ICopZGIsCisJCQlkYl9jbXAu dmFsdWVfcXcsIGRiX2V4Yy52YWx1ZV9xdyk7CisKKwkJLyogaWYgdGhlIGV4Y2hhbmdlIHdhcyBz dWNjZXNzZnVsbHkgZXhlY3V0ZWQgKi8KKwkJaWYgKGRiX3JldC52YWx1ZV9xdyA9PSBkYl9jbXAu dmFsdWVfcXcpIHsKKwkJCS8qIGRiIHdhcyBzdWNjZXNzZnVsbHkgcnVuZyAqLworCQkJZ2MtPmNv b2tpZSA9IGRiX2V4Yy5jb29raWU7CisJCQlyZXQgPSAwOworCQkJYnJlYWs7CisJCX0KKworCQkv KiBYWFg6IGRvb3JiZWxsIHdhcyBsb3N0IGFuZCBuZWVkIHRvIGFjcXVpcmUgaXQgYWdhaW4gKi8K KwkJaWYgKGRiX3JldC5kYl9zdGF0dXMgPT0gR1VDX0RPT1JCRUxMX0RJU0FCTEVEKQorCQkJYnJl YWs7CisKKwkJRFJNX0VSUk9SKCJDb29raWUgbWlzbWF0Y2guIEV4cGVjdGVkICVkLCByZXR1cm5l ZCAlZFxuIiwKKwkJCSAgZGJfY21wLmNvb2tpZSwgZGJfcmV0LmNvb2tpZSk7CisKKwkJLyogdXBk YXRlIHRoZSBjb29raWUgdG8gbmV3bHkgcmVhZCBjb29raWUgZnJvbSBHdUMgKi8KKwkJZGJfY21w LmNvb2tpZSA9IGRiX3JldC5jb29raWU7CisJCWRiX2V4Yy5jb29raWUgPSBkYl9yZXQuY29va2ll ICsgMTsKKwkJaWYgKGRiX2V4Yy5jb29raWUgPT0gMCkKKwkJCWRiX2V4Yy5jb29raWUgPSAxOwor CX0KKworCS8qIEZpbmFsbHksIHVwZGF0ZSB0aGUgY2FjaGVkIGNvcHkgb2YgdGhlIEd1QydzIFdR IGhlYWQgKi8KKwlnYy0+d3FfaGVhZCA9IGRlc2MtPmhlYWQ7CisKKwlrdW5tYXBfYXRvbWljKGJh c2UpOworCXJldHVybiByZXQ7Cit9CisKIC8qKgogICogaTkxNV9ndWNfc3VibWl0KCkgLSBTdWJt aXQgY29tbWFuZHMgdGhyb3VnaCBHdUMKICAqIEBjbGllbnQ6CXRoZSBndWMgY2xpZW50IHdoZXJl IGNvbW1hbmRzIHdpbGwgZ28gdGhyb3VnaAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=