From: Dave Gordon Subject: [CI-Resend v2 2/6] drm/i915/guc: refactor guc_init_doorbell_hw() Date: Fri, 22 Jul 2016 16:15:32 +0100 Message-ID: <1469200537-5279-3-git-send-email-david.s.gordon@intel.com> References: <1469200537-5279-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 C80316EBD2 for ; Fri, 22 Jul 2016 15:16:13 +0000 (UTC) In-Reply-To: <1469200537-5279-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 aW9uLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNv bT4KUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgNTQgKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzAgaW5zZXJ0aW9u cygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi bWlzc2lvbi5jCmluZGV4IDljNWI4MWIuLjgxNmJkY2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTY5OCwzMiArNjk4LDQ3IEBAIHN0YXRpYyB2b2lk IGdlbV9yZWxlYXNlX2d1Y19vYmooc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAlr ZnJlZShjbGllbnQpOwogfQogCisvKiBDaGVjayB0aGF0IGEgZG9vcmJlbGwgcmVnaXN0ZXIgaXMg aW4gdGhlIGV4cGVjdGVkIHN0YXRlICovCitzdGF0aWMgYm9vbCBndWNfZG9vcmJlbGxfY2hlY2so c3RydWN0IGludGVsX2d1YyAqZ3VjLCB1aW50MTZfdCBkYl9pZCkKK3sKKwlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMpOworCWk5MTVfcmVnX3QgZHJi cmVnID0gR0VOOF9EUkJSRUdMKGRiX2lkKTsKKwl1aW50MzJfdCB2YWx1ZSA9IEk5MTVfUkVBRChk cmJyZWcpOworCWJvb2wgZW5hYmxlZCA9ICh2YWx1ZSAmIEdVQ19ET09SQkVMTF9FTkFCTEVEKSAh PSAwOworCWJvb2wgZXhwZWN0ZWQgPSB0ZXN0X2JpdChkYl9pZCwgZ3VjLT5kb29yYmVsbF9iaXRt YXApOworCisJaWYgKGVuYWJsZWQgPT0gZXhwZWN0ZWQpCisJCXJldHVybiB0cnVlOworCisJRFJN X0RFQlVHX0RSSVZFUigiRG9vcmJlbGwgJWQgKHJlZyAweCV4KSAweCV4LCBzaG91bGQgYmUgJXNc biIsCisJCQkgZGJfaWQsIGRyYnJlZy5yZWcsIHZhbHVlLAorCQkJIGV4cGVjdGVkID8gImFjdGl2 ZSIgOiAiaW5hY3RpdmUiKTsKKworCXJldHVybiBmYWxzZTsKK30KKwogLyoKICAqIEJvcnJvdyB0 aGUgZmlyc3QgY2xpZW50IHRvIHNldCB1cCAmIHRlYXIgZG93biBlYWNoIHVudXNlZCBkb29yYmVs bAogICogaW4gdHVybiwgdG8gZW5zdXJlIHRoYXQgYWxsIGRvb3JiZWxsIGgvdyBpcyAocmUpaW5p dGlhbGlzZWQuCiAgKi8KIHN0YXRpYyB2b2lkIGd1Y19pbml0X2Rvb3JiZWxsX2h3KHN0cnVjdCBp bnRlbF9ndWMgKmd1YykKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBn dWNfdG9faTkxNShndWMpOwogCXN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCA9IGd1Yy0+ ZXhlY2J1Zl9jbGllbnQ7Ci0JdWludDE2X3QgZGJfaWQsIGk7Ci0JaW50IGVycjsKKwl1aW50MTZf dCBkYl9pZDsKKwlpbnQgaSwgZXJyOwogCisJLyogU2F2ZSBjbGllbnQncyBvcmlnaW5hbCBkb29y YmVsbCBzZWxlY3Rpb24gKi8KIAlkYl9pZCA9IGNsaWVudC0+ZG9vcmJlbGxfaWQ7CiAKIAlmb3Ig KGkgPSAwOyBpIDwgR1VDX01BWF9ET09SQkVMTFM7ICsraSkgewotCQlpOTE1X3JlZ190IGRyYnJl ZyA9IEdFTjhfRFJCUkVHTChpKTsKLQkJdTMyIHZhbHVlID0gSTkxNV9SRUFEKGRyYnJlZyk7Ci0K LQkJaWYgKHRlc3RfYml0KGksIGd1Yy0+ZG9vcmJlbGxfYml0bWFwKSkKKwkJLyogU2tpcCBpZiBk b29yYmVsbCBpcyBPSyAqLworCQlpZiAoZ3VjX2Rvb3JiZWxsX2NoZWNrKGd1YywgaSkpCiAJCQlj b250aW51ZTsKIAogCQllcnIgPSBndWNfdXBkYXRlX2Rvb3JiZWxsX2lkKGd1YywgY2xpZW50LCBp KTsKLQotCQkvKiBSZXBvcnQgdXBkYXRlIGZhaWx1cmUgb3IgdW5leHBlY3RlZGx5IGFjdGl2ZSBk b29yYmVsbCAqLwotCQlpZiAoZXJyIHx8IChpICE9IGRiX2lkICYmICh2YWx1ZSAmIEdVQ19ET09S QkVMTF9FTkFCTEVEKSkpCi0JCQlEUk1fREVCVUdfRFJJVkVSKCJEb29yYmVsbCAlZCAocmVnIDB4 JXgpIHdhcyAweCV4LCBlcnIgJWRcbiIsCi0JCQkJCSAgaSwgZHJicmVnLnJlZywgdmFsdWUsIGVy cik7CisJCWlmIChlcnIpCisJCQlEUk1fREVCVUdfRFJJVkVSKCJEb29yYmVsbCAlZCB1cGRhdGUg ZmFpbGVkLCBlcnIgJWRcbiIsCisJCQkJCWksIGVycik7CiAJfQogCiAJLyogUmVzdG9yZSB0byBv cmlnaW5hbCB2YWx1ZSAqLwpAQCAtNzMyLDE4ICs3NDcsOSBAQCBzdGF0aWMgdm9pZCBndWNfaW5p dF9kb29yYmVsbF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJCURSTV9FUlJPUigiRmFpbGVk IHRvIHJlc3RvcmUgZG9vcmJlbGwgdG8gJWQsIGVyciAlZFxuIiwKIAkJCWRiX2lkLCBlcnIpOwog Ci0JZm9yIChpID0gMDsgaSA8IEdVQ19NQVhfRE9PUkJFTExTOyArK2kpIHsKLQkJaTkxNV9yZWdf dCBkcmJyZWcgPSBHRU44X0RSQlJFR0woaSk7Ci0JCXUzMiB2YWx1ZSA9IEk5MTVfUkVBRChkcmJy ZWcpOwotCi0JCWlmICh0ZXN0X2JpdChpLCBndWMtPmRvb3JiZWxsX2JpdG1hcCkpCi0JCQljb250 aW51ZTsKLQotCQlpZiAoaSAhPSBkYl9pZCAmJiAodmFsdWUgJiBHVUNfRE9PUkJFTExfRU5BQkxF RCkpCi0JCQlEUk1fREVCVUdfRFJJVkVSKCJEb29yYmVsbCAlZCAocmVnIDB4JXgpIGZpbmFsbHkg MHgleFxuIiwKLQkJCQkJICBpLCBkcmJyZWcucmVnLCB2YWx1ZSk7Ci0KLQl9CisJLyogUmVhZCBi YWNrICYgdmVyaWZ5IGFsbCBkb29yYmVsbCByZWdpc3RlcnMgKi8KKwlmb3IgKGkgPSAwOyBpIDwg R1VDX01BWF9ET09SQkVMTFM7ICsraSkKKwkJKHZvaWQpZ3VjX2Rvb3JiZWxsX2NoZWNrKGd1Yywg aSk7CiB9CiAKIC8qKgotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=