From: Dave Gordon Subject: [PATCH v3 2/6] drm/i915/guc: refactor guc_init_doorbell_hw() Date: Tue, 9 Aug 2016 15:19:20 +0100 Message-ID: <1470752364-26940-3-git-send-email-david.s.gordon@intel.com> References: <1470752364-26940-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id CBC7E6E5C0 for ; Tue, 9 Aug 2016 14:19:36 +0000 (UTC) In-Reply-To: <1470752364-26940-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 V2UgaGF2ZSBlc3NlbnRpYWxseSB0aGUgc2FtZSBjb2RlIGluIGVhY2ggb2YgdHdvIGRpZmZlcmVu dApsb29wcywgc28gd2UgY2FuIHJlZmFjdG9yIGl0IGludG8gYSBsaXR0bGUgaGVscGVyIGZ1bmN0 aW9uLgoKVGhpcyBhbHNvIHJlZHVjZXMgdGhlIGFtb3VudCBvZiB3b3JrIGRvbmUgZHVyaW5nIHN0 YXJ0dXAsCmFzIHdlIG5vdyBvbmx5IHJlcHJvZ3JhbSBoL3cgZm91bmQgdG8gYmUgaW4gYSBzdGF0 ZSBvdGhlcgp0aGFuIHRoYXQgZXhwZWN0ZWQsIGFuZCBzbyBhdm9pZCB0aGUgb3ZlcmhlYWQgb2Yg c2V0dGluZwpkb29yYmVsbCByZWdpc3RlcnMgdG8gdGhlIHN0YXRlIHRoZXkncmUgYWxyZWFkeSBp bi4KClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+ ClJldmlld2VkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDU0ICsrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMwIGluc2VydGlvbnMo KyksIDI0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1p c3Npb24uYwppbmRleCBkNWRiMGQxLi5hZjVjNGNmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC02OTYsMzIgKzY5Niw0NyBAQCBzdGF0aWMgdm9pZCBn ZW1fcmVsZWFzZV9ndWNfb2JqKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJa2Zy ZWUoY2xpZW50KTsKIH0KIAorLyogQ2hlY2sgdGhhdCBhIGRvb3JiZWxsIHJlZ2lzdGVyIGlzIGlu IHRoZSBleHBlY3RlZCBzdGF0ZSAqLworc3RhdGljIGJvb2wgZ3VjX2Rvb3JiZWxsX2NoZWNrKHN0 cnVjdCBpbnRlbF9ndWMgKmd1YywgdWludDE2X3QgZGJfaWQpCit7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKKwlpOTE1X3JlZ190IGRyYnJl ZyA9IEdFTjhfRFJCUkVHTChkYl9pZCk7CisJdWludDMyX3QgdmFsdWUgPSBJOTE1X1JFQUQoZHJi cmVnKTsKKwlib29sIGVuYWJsZWQgPSAodmFsdWUgJiBHVUNfRE9PUkJFTExfRU5BQkxFRCkgIT0g MDsKKwlib29sIGV4cGVjdGVkID0gdGVzdF9iaXQoZGJfaWQsIGd1Yy0+ZG9vcmJlbGxfYml0bWFw KTsKKworCWlmIChlbmFibGVkID09IGV4cGVjdGVkKQorCQlyZXR1cm4gdHJ1ZTsKKworCURSTV9E RUJVR19EUklWRVIoIkRvb3JiZWxsICVkIChyZWcgMHgleCkgMHgleCwgc2hvdWxkIGJlICVzXG4i LAorCQkJIGRiX2lkLCBkcmJyZWcucmVnLCB2YWx1ZSwKKwkJCSBleHBlY3RlZCA/ICJhY3RpdmUi IDogImluYWN0aXZlIik7CisKKwlyZXR1cm4gZmFsc2U7Cit9CisKIC8qCiAgKiBCb3Jyb3cgdGhl IGZpcnN0IGNsaWVudCB0byBzZXQgdXAgJiB0ZWFyIGRvd24gZWFjaCB1bnVzZWQgZG9vcmJlbGwK ICAqIGluIHR1cm4sIHRvIGVuc3VyZSB0aGF0IGFsbCBkb29yYmVsbCBoL3cgaXMgKHJlKWluaXRp YWxpc2VkLgogICovCiBzdGF0aWMgdm9pZCBndWNfaW5pdF9kb29yYmVsbF9odyhzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3Vj X3RvX2k5MTUoZ3VjKTsKIAlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQgPSBndWMtPmV4 ZWNidWZfY2xpZW50OwotCXVpbnQxNl90IGRiX2lkLCBpOwotCWludCBlcnI7CisJdWludDE2X3Qg ZGJfaWQ7CisJaW50IGksIGVycjsKIAorCS8qIFNhdmUgY2xpZW50J3Mgb3JpZ2luYWwgZG9vcmJl bGwgc2VsZWN0aW9uICovCiAJZGJfaWQgPSBjbGllbnQtPmRvb3JiZWxsX2lkOwogCiAJZm9yIChp ID0gMDsgaSA8IEdVQ19NQVhfRE9PUkJFTExTOyArK2kpIHsKLQkJaTkxNV9yZWdfdCBkcmJyZWcg PSBHRU44X0RSQlJFR0woaSk7Ci0JCXUzMiB2YWx1ZSA9IEk5MTVfUkVBRChkcmJyZWcpOwotCi0J CWlmICh0ZXN0X2JpdChpLCBndWMtPmRvb3JiZWxsX2JpdG1hcCkpCisJCS8qIFNraXAgaWYgZG9v cmJlbGwgaXMgT0sgKi8KKwkJaWYgKGd1Y19kb29yYmVsbF9jaGVjayhndWMsIGkpKQogCQkJY29u dGludWU7CiAKIAkJZXJyID0gZ3VjX3VwZGF0ZV9kb29yYmVsbF9pZChndWMsIGNsaWVudCwgaSk7 Ci0KLQkJLyogUmVwb3J0IHVwZGF0ZSBmYWlsdXJlIG9yIHVuZXhwZWN0ZWRseSBhY3RpdmUgZG9v cmJlbGwgKi8KLQkJaWYgKGVyciB8fCAoaSAhPSBkYl9pZCAmJiAodmFsdWUgJiBHVUNfRE9PUkJF TExfRU5BQkxFRCkpKQotCQkJRFJNX0RFQlVHX0RSSVZFUigiRG9vcmJlbGwgJWQgKHJlZyAweCV4 KSB3YXMgMHgleCwgZXJyICVkXG4iLAotCQkJCQkgIGksIGRyYnJlZy5yZWcsIHZhbHVlLCBlcnIp OworCQlpZiAoZXJyKQorCQkJRFJNX0RFQlVHX0RSSVZFUigiRG9vcmJlbGwgJWQgdXBkYXRlIGZh aWxlZCwgZXJyICVkXG4iLAorCQkJCQlpLCBlcnIpOwogCX0KIAogCS8qIFJlc3RvcmUgdG8gb3Jp Z2luYWwgdmFsdWUgKi8KQEAgLTczMCwxOCArNzQ1LDkgQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRf ZG9vcmJlbGxfaHcoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQlEUk1fRVJST1IoIkZhaWxlZCB0 byByZXN0b3JlIGRvb3JiZWxsIHRvICVkLCBlcnIgJWRcbiIsCiAJCQlkYl9pZCwgZXJyKTsKIAot CWZvciAoaSA9IDA7IGkgPCBHVUNfTUFYX0RPT1JCRUxMUzsgKytpKSB7Ci0JCWk5MTVfcmVnX3Qg ZHJicmVnID0gR0VOOF9EUkJSRUdMKGkpOwotCQl1MzIgdmFsdWUgPSBJOTE1X1JFQUQoZHJicmVn KTsKLQotCQlpZiAodGVzdF9iaXQoaSwgZ3VjLT5kb29yYmVsbF9iaXRtYXApKQotCQkJY29udGlu dWU7Ci0KLQkJaWYgKGkgIT0gZGJfaWQgJiYgKHZhbHVlICYgR1VDX0RPT1JCRUxMX0VOQUJMRUQp KQotCQkJRFJNX0RFQlVHX0RSSVZFUigiRG9vcmJlbGwgJWQgKHJlZyAweCV4KSBmaW5hbGx5IDB4 JXhcbiIsCi0JCQkJCSAgaSwgZHJicmVnLnJlZywgdmFsdWUpOwotCi0JfQorCS8qIFJlYWQgYmFj ayAmIHZlcmlmeSBhbGwgZG9vcmJlbGwgcmVnaXN0ZXJzICovCisJZm9yIChpID0gMDsgaSA8IEdV Q19NQVhfRE9PUkJFTExTOyArK2kpCisJCSh2b2lkKWd1Y19kb29yYmVsbF9jaGVjayhndWMsIGkp OwogfQogCiAvKioKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK