From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH 4/7] drm/i915/guc: move guc_ring_doorbell() nearer to callsite Date: Mon, 21 Mar 2016 10:16:37 +0000 Message-ID: <1458555400-22859-5-git-send-email-david.s.gordon@intel.com> References: <1458555400-22859-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id AA16E6E28F for ; Mon, 21 Mar 2016 10:16:54 +0000 (UTC) In-Reply-To: <1458555400-22859-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 b24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KQ2M6IEFydW4gU2lsdXZlcnkgPGFydW4uc2ls dXZlcnlAbGludXguaW50ZWwuY29tPgpDYzogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgMTI4ICsrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNjcgaW5zZXJ0aW9ucygr KSwgNjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlz c2lvbi5jCmluZGV4IGFlMWY1OGQuLjIzNDRiYWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTE5MCw2NyArMTkwLDYgQEAgc3RhdGljIHZvaWQgZ3Vj X2luaXRfZG9vcmJlbGwoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCWt1bm1hcF9hdG9taWMoYmFz ZSk7CiB9CiAKLXN0YXRpYyBpbnQgZ3VjX3JpbmdfZG9vcmJlbGwoc3RydWN0IGk5MTVfZ3VjX2Ns aWVudCAqZ2MpCi17Ci0Jc3RydWN0IGd1Y19wcm9jZXNzX2Rlc2MgKmRlc2M7Ci0JdW5pb24gZ3Vj X2Rvb3JiZWxsX3F3IGRiX2NtcCwgZGJfZXhjLCBkYl9yZXQ7Ci0JdW5pb24gZ3VjX2Rvb3JiZWxs X3F3ICpkYjsKLQl2b2lkICpiYXNlOwotCWludCBhdHRlbXB0ID0gMiwgcmV0ID0gLUVBR0FJTjsK LQotCWJhc2UgPSBrbWFwX2F0b21pYyhpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2UoZ2MtPmNsaWVu dF9vYmosIDApKTsKLQlkZXNjID0gYmFzZSArIGdjLT5wcm9jX2Rlc2Nfb2Zmc2V0OwotCi0JLyog VXBkYXRlIHRoZSB0YWlsIHNvIGl0IGlzIHZpc2libGUgdG8gR3VDICovCi0JZGVzYy0+dGFpbCA9 IGdjLT53cV90YWlsOwotCi0JLyogY3VycmVudCBjb29raWUgKi8KLQlkYl9jbXAuZGJfc3RhdHVz ID0gR1VDX0RPT1JCRUxMX0VOQUJMRUQ7Ci0JZGJfY21wLmNvb2tpZSA9IGdjLT5jb29raWU7Ci0K LQkvKiBjb29raWUgdG8gYmUgdXBkYXRlZCAqLwotCWRiX2V4Yy5kYl9zdGF0dXMgPSBHVUNfRE9P UkJFTExfRU5BQkxFRDsKLQlkYl9leGMuY29va2llID0gZ2MtPmNvb2tpZSArIDE7Ci0JaWYgKGRi X2V4Yy5jb29raWUgPT0gMCkKLQkJZGJfZXhjLmNvb2tpZSA9IDE7Ci0KLQkvKiBwb2ludGVyIG9m IGN1cnJlbnQgZG9vcmJlbGwgY2FjaGVsaW5lICovCi0JZGIgPSBiYXNlICsgZ2MtPmRvb3JiZWxs X29mZnNldDsKLQotCXdoaWxlIChhdHRlbXB0LS0pIHsKLQkJLyogbGV0cyByaW5nIHRoZSBkb29y YmVsbCAqLwotCQlkYl9yZXQudmFsdWVfcXcgPSBhdG9taWM2NF9jbXB4Y2hnKChhdG9taWM2NF90 ICopZGIsCi0JCQlkYl9jbXAudmFsdWVfcXcsIGRiX2V4Yy52YWx1ZV9xdyk7Ci0KLQkJLyogaWYg dGhlIGV4Y2hhbmdlIHdhcyBzdWNjZXNzZnVsbHkgZXhlY3V0ZWQgKi8KLQkJaWYgKGRiX3JldC52 YWx1ZV9xdyA9PSBkYl9jbXAudmFsdWVfcXcpIHsKLQkJCS8qIGRiIHdhcyBzdWNjZXNzZnVsbHkg cnVuZyAqLwotCQkJZ2MtPmNvb2tpZSA9IGRiX2V4Yy5jb29raWU7Ci0JCQlyZXQgPSAwOwotCQkJ YnJlYWs7Ci0JCX0KLQotCQkvKiBYWFg6IGRvb3JiZWxsIHdhcyBsb3N0IGFuZCBuZWVkIHRvIGFj cXVpcmUgaXQgYWdhaW4gKi8KLQkJaWYgKGRiX3JldC5kYl9zdGF0dXMgPT0gR1VDX0RPT1JCRUxM X0RJU0FCTEVEKQotCQkJYnJlYWs7Ci0KLQkJRFJNX0VSUk9SKCJDb29raWUgbWlzbWF0Y2guIEV4 cGVjdGVkICVkLCByZXR1cm5lZCAlZFxuIiwKLQkJCSAgZGJfY21wLmNvb2tpZSwgZGJfcmV0LmNv b2tpZSk7Ci0KLQkJLyogdXBkYXRlIHRoZSBjb29raWUgdG8gbmV3bHkgcmVhZCBjb29raWUgZnJv bSBHdUMgKi8KLQkJZGJfY21wLmNvb2tpZSA9IGRiX3JldC5jb29raWU7Ci0JCWRiX2V4Yy5jb29r aWUgPSBkYl9yZXQuY29va2llICsgMTsKLQkJaWYgKGRiX2V4Yy5jb29raWUgPT0gMCkKLQkJCWRi X2V4Yy5jb29raWUgPSAxOwotCX0KLQotCS8qIEZpbmFsbHksIHVwZGF0ZSB0aGUgY2FjaGVkIGNv cHkgb2YgdGhlIEd1QydzIFdRIGhlYWQgKi8KLQlnYy0+d3FfaGVhZCA9IGRlc2MtPmhlYWQ7Ci0K LQlrdW5tYXBfYXRvbWljKGJhc2UpOwotCXJldHVybiByZXQ7Ci19Ci0KIHN0YXRpYyB2b2lkIGd1 Y19kaXNhYmxlX2Rvb3JiZWxsKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJCQkgc3RydWN0IGk5 MTVfZ3VjX2NsaWVudCAqY2xpZW50KQogewpAQCAtNDcxLDYgKzQxMCwxMiBAQCBzdGF0aWMgdm9p ZCBndWNfZmluaV9jdHhfZGVzYyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJCQkgICAgIHNpemVv ZihkZXNjKSAqIGNsaWVudC0+Y3R4X2luZGV4KTsKIH0KIAorLyoKKyAqIEV2ZXJ5dGhpbmcgYWJv dmUgaGVyZSBpcyBjb25jZXJuZWQgd2l0aCBzZXR1cCAmIHRlYXJkb3duLCBhbmQgaXMKKyAqIHRo ZXJlZm9yZSBub3QgcGFydCBvZiB0aGUgc29tZXdoYXQgdGltZS1jcml0aWNhbCBiYXRjaC1zdWJt aXNzaW9uCisgKiBwYXRoIG9mIGk5MTVfZ3VjX3N1Ym1pdCgpIGJlbG93LgorICovCisKIGludCBp OTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKIHsKIAlz dHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVzYyAqZGVzYzsKQEAgLTU1OSw2ICs1MDQsNjcgQEAgc3RhdGlj IGludCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLAog CXJldHVybiAwOwogfQogCitzdGF0aWMgaW50IGd1Y19yaW5nX2Rvb3JiZWxsKHN0cnVjdCBpOTE1 X2d1Y19jbGllbnQgKmdjKQoreworCXN0cnVjdCBndWNfcHJvY2Vzc19kZXNjICpkZXNjOworCXVu aW9uIGd1Y19kb29yYmVsbF9xdyBkYl9jbXAsIGRiX2V4YywgZGJfcmV0OworCXVuaW9uIGd1Y19k b29yYmVsbF9xdyAqZGI7CisJdm9pZCAqYmFzZTsKKwlpbnQgYXR0ZW1wdCA9IDIsIHJldCA9IC1F QUdBSU47CisKKwliYXNlID0ga21hcF9hdG9taWMoaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGdj LT5jbGllbnRfb2JqLCAwKSk7CisJZGVzYyA9IGJhc2UgKyBnYy0+cHJvY19kZXNjX29mZnNldDsK KworCS8qIFVwZGF0ZSB0aGUgdGFpbCBzbyBpdCBpcyB2aXNpYmxlIHRvIEd1QyAqLworCWRlc2Mt PnRhaWwgPSBnYy0+d3FfdGFpbDsKKworCS8qIGN1cnJlbnQgY29va2llICovCisJZGJfY21wLmRi X3N0YXR1cyA9IEdVQ19ET09SQkVMTF9FTkFCTEVEOworCWRiX2NtcC5jb29raWUgPSBnYy0+Y29v a2llOworCisJLyogY29va2llIHRvIGJlIHVwZGF0ZWQgKi8KKwlkYl9leGMuZGJfc3RhdHVzID0g R1VDX0RPT1JCRUxMX0VOQUJMRUQ7CisJZGJfZXhjLmNvb2tpZSA9IGdjLT5jb29raWUgKyAxOwor CWlmIChkYl9leGMuY29va2llID09IDApCisJCWRiX2V4Yy5jb29raWUgPSAxOworCisJLyogcG9p bnRlciBvZiBjdXJyZW50IGRvb3JiZWxsIGNhY2hlbGluZSAqLworCWRiID0gYmFzZSArIGdjLT5k b29yYmVsbF9vZmZzZXQ7CisKKwl3aGlsZSAoYXR0ZW1wdC0tKSB7CisJCS8qIGxldHMgcmluZyB0 aGUgZG9vcmJlbGwgKi8KKwkJZGJfcmV0LnZhbHVlX3F3ID0gYXRvbWljNjRfY21weGNoZygoYXRv bWljNjRfdCAqKWRiLAorCQkJZGJfY21wLnZhbHVlX3F3LCBkYl9leGMudmFsdWVfcXcpOworCisJ CS8qIGlmIHRoZSBleGNoYW5nZSB3YXMgc3VjY2Vzc2Z1bGx5IGV4ZWN1dGVkICovCisJCWlmIChk Yl9yZXQudmFsdWVfcXcgPT0gZGJfY21wLnZhbHVlX3F3KSB7CisJCQkvKiBkYiB3YXMgc3VjY2Vz c2Z1bGx5IHJ1bmcgKi8KKwkJCWdjLT5jb29raWUgPSBkYl9leGMuY29va2llOworCQkJcmV0ID0g MDsKKwkJCWJyZWFrOworCQl9CisKKwkJLyogWFhYOiBkb29yYmVsbCB3YXMgbG9zdCBhbmQgbmVl ZCB0byBhY3F1aXJlIGl0IGFnYWluICovCisJCWlmIChkYl9yZXQuZGJfc3RhdHVzID09IEdVQ19E T09SQkVMTF9ESVNBQkxFRCkKKwkJCWJyZWFrOworCisJCURSTV9FUlJPUigiQ29va2llIG1pc21h dGNoLiBFeHBlY3RlZCAlZCwgcmV0dXJuZWQgJWRcbiIsCisJCQkgIGRiX2NtcC5jb29raWUsIGRi X3JldC5jb29raWUpOworCisJCS8qIHVwZGF0ZSB0aGUgY29va2llIHRvIG5ld2x5IHJlYWQgY29v a2llIGZyb20gR3VDICovCisJCWRiX2NtcC5jb29raWUgPSBkYl9yZXQuY29va2llOworCQlkYl9l eGMuY29va2llID0gZGJfcmV0LmNvb2tpZSArIDE7CisJCWlmIChkYl9leGMuY29va2llID09IDAp CisJCQlkYl9leGMuY29va2llID0gMTsKKwl9CisKKwkvKiBGaW5hbGx5LCB1cGRhdGUgdGhlIGNh Y2hlZCBjb3B5IG9mIHRoZSBHdUMncyBXUSBoZWFkICovCisJZ2MtPndxX2hlYWQgPSBkZXNjLT5o ZWFkOworCisJa3VubWFwX2F0b21pYyhiYXNlKTsKKwlyZXR1cm4gcmV0OworfQorCiAvKioKICAq IGk5MTVfZ3VjX3N1Ym1pdCgpIC0gU3VibWl0IGNvbW1hbmRzIHRocm91Z2ggR3VDCiAgKiBAY2xp ZW50Ogl0aGUgZ3VjIGNsaWVudCB3aGVyZSBjb21tYW5kcyB3aWxsIGdvIHRocm91Z2gKLS0gCjEu OS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK