From: Dave Gordon Subject: [PATCH v2 5/6] drm/i915/guc: refactor doorbell management code Date: Fri, 10 Jun 2016 17:51:00 +0100 Message-ID: <1465577461-35616-6-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 C55A06EDCA for ; Fri, 10 Jun 2016 16:51:11 +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 VGhpcyBwYXRjaCByZWZhY3RvcnMgdGhlIGRyaXZlcidzIGhhbmRsaW5nIGFuZCB0cmFja2luZyBv ZiBkb29yYmVsbHMsIGluCnByZXBhcmF0aW9uIGZvciBhIGxhdGVyIG9uZSB3aGljaCB3aWxsIHJl c29sdmUgYSBzdXNwZW5kLXJlc3VtZSBpc3N1ZS4KClRoZXJlIGFyZSB0aHJlZSByZXNvdXJjZXMg dG8gYmUgbWFuYWdlZDoKMS4gQ2FjaGVsaW5lczogYSBzaW5nbGUgbGluZSB3aXRoaW4gdGhlIGNs aWVudC1vYmplY3QncyBwYWdlIDAKICAgaXMgc25vb3BlZCBieSBkb29yYmVsbCBoYXJkd2FyZSBm b3Igd3JpdGVzIGZyb20gdGhlIGhvc3QuCjIuIERvb3JiZWxsIHJlZ2lzdGVyczogZWFjaCBkZWZp bmVzIG9uZSBjYWNoZWxpbmUgdG8gYmUgc25vb3BlZC4KMy4gQml0bWFwOiB0cmFja3Mgd2hpY2gg ZG9vcmJlbGwgcmVnaXN0ZXJzIGFyZSBpbiB1c2UuCgpUaGUgZG9vcmJlbGwgc2V0dXAvdGVhcmRv d24gcHJvdG9jb2wgc3RhcnRzIHdpdGg6CjEuIFBpY2sgYSBjYWNoZWxpbmU6IHNlbGVjdF9kb29y YmVsbF9jYWNoZWxpbmUoKQoyLiBGaW5kIGFuIGF2YWlsYWJsZSBkb29yYmVsbCByZWdpc3Rlcjog YXNzaWduX2Rvb3JiZWxsKCkKKFRoZXNlIHZhbHVlcyBhcmUgcGFzc2VkIHRvIHRoZSBHdUMgdmlh IHRoZSBzaGFyZWQgY29udGV4dApkZXNjcmlwdG9yOyB0aGlzIHBhcnQgb2YgdGhlIHNlcXVlbmNl IHJlbWFpbnMgdW5jaGFuZ2VkKS4KCjMuIFVwZGF0ZSB0aGUgYml0bWFwIHRvIHJlZmxlY3QgcmVn aXN0ZXJzLWluLXVzZQo0LiBQcmVwYXJlIHRoZSBjYWNoZWxpbmUgZm9yIHVzZSBieSBzZXR0aW5n IGl0cyBzdGF0dXMgdG8gRU5BQkxFRAo1LiBBc2sgdGhlIEd1QyB0byBwcm9ncmFtIHRoZSBkb29y YmVsbCB0byBzbm9vcCB0aGUgY2FjaGVsaW5lCgphbmQgb2YgY291cnNlIHRlYXJkb3duIGlzIHZl cnkgc2ltaWxhcjoKNi4gU2V0IHRoZSBjYWNoZWxpbmUgdG8gRElTQUJMRUQKNy4gQXNrIHRoZSBH dUMgdG8gcmVwcm9ncmFtIHRoZSBkb29yYmVsbCB0byBzdG9wIHNub29waW5nCjguIFJlY29yZCB0 aGF0IHRoZSBkb29yYmVsbCBpcyBub3QgaW4gdXNlLgoKT3BlcmF0aW9ucyA2LTggKGd1Y19kaXNh YmxlX2Rvb3JiZWxsKCksIGhvc3QyZ3VjX3JlbGVhc2VfZG9vcmJlbGwoKSwgYW5kCnJlbGVhc2Vf ZG9vcmJlbGwoKSkgd2VyZSBjYWxsZWQgaW4gc2VxdWVuY2UgZnJvbSBndWNfY2xpZW50X2ZyZWUo KSwgYnV0CmFyZSBub3cgbW92ZWQgaW50byB0aGUgdGVhcmRvd24gcGhhc2Ugb2YgdGhlIGNvbW1v biBmdW5jdGlvbi4KClN0ZXBzIDQtNSAoZ3VjX2luaXRfZG9vcmJlbGwoKSBhbmQgaG9zdDJndWNf YWxsb2NhdGVfZG9vcmJlbGwoKSkgd2VyZQpzaW1pbGFybHkgZG9uZSBhcyBzZXF1ZW50aWFsIHN0 ZXBzIGluIGd1Y19jbGllbnRfYWxsb2MoKSwgYnV0IHNpbmNlIGl0CnR1cm5zIG91dCB0aGF0IHdl IGRvbid0IG5lZWQgdG8gYmUgYWJsZSB0byBkbyB0aGVtIHNlcGFyYXRlbHkgdGhleSdyZQpub3cg Y29sbGVjdGVkIGludG8gdGhlIHNldHVwIHBoYXNlIG9mIHRoZSBjb21tb24gZnVuY3Rpb24uCgpU aGUgb25seSBuZXcgY29kZSAoYW5kIG5ldyBjYXBhYmlsaXR5KSBpcyB0aGUgYmxvY2sgdGFnZ2Vk CiAgICAvKiBVcGRhdGUgdGhlIEd1QydzIGlkZWEgb2YgdGhlIGRvb3JiZWxsIElEICovCmkuZS4g d2UgY2FuIG5vdyAqY2hhbmdlKiB0aGUgZG9vcmJlbGwgcmVnaXN0ZXIgdXNlZCBieSBhbiBleGlz dGluZwpjbGllbnQsIHdoZXJlYXMgcHJldmlvdXNseSBpdCB3YXMgc2V0IG9uY2UgZm9yIHRoZSBl bnRpcmUgbGlmZXRpbWUKb2YgdGhlIGNsaWVudC4gV2Ugd2lsbCB1c2UgdGhpcyBuZXcgZmVhdHVy ZSBpbiB0aGUgbmV4dCBwYXRjaC4KCnYyOiBUcml2aWFsIGluZGVwZW5kZW50IGZpeGVzIHB1c2hl ZCBhaGVhZCBhcyBzZXBhcmF0ZSBwYXRjaGVzLgogICAgTVVDSCBsb25nZXIgY29tbWl0IG1lc3Nh Z2UgOikgW1R2cnRrbyBVcnN1bGluXQoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlk LnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19z dWJtaXNzaW9uLmMgfCA5NCArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA1MyBpbnNlcnRpb25zKCspLCA0MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggNDViMzNmOC4uMTgzM2JmZCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtMTc0LDMxICsx NzQsNTkgQEAgc3RhdGljIGludCBob3N0Mmd1Y19zYW1wbGVfZm9yY2V3YWtlKHN0cnVjdCBpbnRl bF9ndWMgKmd1YywKICAqIGNsaWVudCBvYmplY3Qgd2hpY2ggY29udGFpbnMgdGhlIHBhZ2UgYmVp bmcgdXNlZCBmb3IgdGhlIGRvb3JiZWxsCiAgKi8KIAotc3RhdGljIHZvaWQgZ3VjX2luaXRfZG9v cmJlbGwoc3RydWN0IGludGVsX2d1YyAqZ3VjLAotCQkJICAgICAgc3RydWN0IGk5MTVfZ3VjX2Ns aWVudCAqY2xpZW50KQorc3RhdGljIGludCBndWNfdXBkYXRlX2Rvb3JiZWxsX2lkKHN0cnVjdCBp bnRlbF9ndWMgKmd1YywKKwkJCQkgIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCwKKwkJ CQkgIHUxNiBuZXdfaWQpCiB7CisJc3RydWN0IHNnX3RhYmxlICpzZyA9IGd1Yy0+Y3R4X3Bvb2xf b2JqLT5wYWdlczsKKwl2b2lkICpkb29yYmVsbF9iaXRtYXAgPSBndWMtPmRvb3JiZWxsX2JpdG1h cDsKIAlzdHJ1Y3QgZ3VjX2Rvb3JiZWxsX2luZm8gKmRvb3JiZWxsOworCXN0cnVjdCBndWNfY29u dGV4dF9kZXNjIGRlc2M7CisJc2l6ZV90IGxlbjsKIAogCWRvb3JiZWxsID0gY2xpZW50LT5jbGll bnRfYmFzZSArIGNsaWVudC0+ZG9vcmJlbGxfb2Zmc2V0OwogCi0JZG9vcmJlbGwtPmRiX3N0YXR1 cyA9IEdVQ19ET09SQkVMTF9FTkFCTEVEOworCWlmIChjbGllbnQtPmRvb3JiZWxsX2lkICE9IEdV Q19JTlZBTElEX0RPT1JCRUxMX0lEICYmCisJICAgIHRlc3RfYml0KGNsaWVudC0+ZG9vcmJlbGxf aWQsIGRvb3JiZWxsX2JpdG1hcCkpIHsKKwkJLyogRGVhY3RpdmF0ZSB0aGUgb2xkIGRvb3JiZWxs ICovCisJCWRvb3JiZWxsLT5kYl9zdGF0dXMgPSBHVUNfRE9PUkJFTExfRElTQUJMRUQ7CisJCSh2 b2lkKWhvc3QyZ3VjX3JlbGVhc2VfZG9vcmJlbGwoZ3VjLCBjbGllbnQpOworCQlfX2NsZWFyX2Jp dChjbGllbnQtPmRvb3JiZWxsX2lkLCBkb29yYmVsbF9iaXRtYXApOworCX0KKworCS8qIFVwZGF0 ZSB0aGUgR3VDJ3MgaWRlYSBvZiB0aGUgZG9vcmJlbGwgSUQgKi8KKwlsZW4gPSBzZ19wY29weV90 b19idWZmZXIoc2ctPnNnbCwgc2ctPm5lbnRzLCAmZGVzYywgc2l6ZW9mKGRlc2MpLAorCQkJICAg ICBzaXplb2YoZGVzYykgKiBjbGllbnQtPmN0eF9pbmRleCk7CisJaWYgKGxlbiAhPSBzaXplb2Yo ZGVzYykpCisJCXJldHVybiAtRUZBVUxUOworCWRlc2MuZGJfaWQgPSBuZXdfaWQ7CisJbGVuID0g c2dfcGNvcHlfZnJvbV9idWZmZXIoc2ctPnNnbCwgc2ctPm5lbnRzLCAmZGVzYywgc2l6ZW9mKGRl c2MpLAorCQkJICAgICBzaXplb2YoZGVzYykgKiBjbGllbnQtPmN0eF9pbmRleCk7CisJaWYgKGxl biAhPSBzaXplb2YoZGVzYykpCisJCXJldHVybiAtRUZBVUxUOworCisJY2xpZW50LT5kb29yYmVs bF9pZCA9IG5ld19pZDsKKwlpZiAobmV3X2lkID09IEdVQ19JTlZBTElEX0RPT1JCRUxMX0lEKQor CQlyZXR1cm4gMDsKKworCS8qIEFjdGl2YXRlIHRoZSBuZXcgZG9vcmJlbGwgKi8KKwlfX3NldF9i aXQobmV3X2lkLCBkb29yYmVsbF9iaXRtYXApOwogCWRvb3JiZWxsLT5jb29raWUgPSAwOworCWRv b3JiZWxsLT5kYl9zdGF0dXMgPSBHVUNfRE9PUkJFTExfRU5BQkxFRDsKKwlyZXR1cm4gaG9zdDJn dWNfYWxsb2NhdGVfZG9vcmJlbGwoZ3VjLCBjbGllbnQpOworfQorCitzdGF0aWMgaW50IGd1Y19p bml0X2Rvb3JiZWxsKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKKwkJCSAgICAgIHN0cnVjdCBpOTE1 X2d1Y19jbGllbnQgKmNsaWVudCwKKwkJCSAgICAgIHVpbnQxNl90IGRiX2lkKQoreworCXJldHVy biBndWNfdXBkYXRlX2Rvb3JiZWxsX2lkKGd1YywgY2xpZW50LCBkYl9pZCk7CiB9CiAKIHN0YXRp YyB2b2lkIGd1Y19kaXNhYmxlX2Rvb3JiZWxsKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJCQkg c3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1Yyk7Ci0Jc3RydWN0IGd1Y19kb29yYmVsbF9p bmZvICpkb29yYmVsbDsKLQlpOTE1X3JlZ190IGRyYnJlZyA9IEdFTjhfRFJCUkVHTChjbGllbnQt PmRvb3JiZWxsX2lkKTsKLQlpbnQgdmFsdWU7Ci0KLQlkb29yYmVsbCA9IGNsaWVudC0+Y2xpZW50 X2Jhc2UgKyBjbGllbnQtPmRvb3JiZWxsX29mZnNldDsKLQotCWRvb3JiZWxsLT5kYl9zdGF0dXMg PSBHVUNfRE9PUkJFTExfRElTQUJMRUQ7Ci0KLQl2YWx1ZSA9IEk5MTVfUkVBRChkcmJyZWcpOwot CVdBUk5fT04oKHZhbHVlICYgR0VOOF9EUkJfVkFMSUQpICE9IDApOworCSh2b2lkKWd1Y191cGRh dGVfZG9vcmJlbGxfaWQoZ3VjLCBjbGllbnQsIEdVQ19JTlZBTElEX0RPT1JCRUxMX0lEKTsKIAog CS8qIFhYWDogd2FpdCBmb3IgYW55IGludGVycnVwdHMgKi8KIAkvKiBYWFg6IHdhaXQgZm9yIHdv cmtxdWV1ZSB0byBkcmFpbiAqLwpAQCAtMjU0LDExICsyODIsNiBAQCBzdGF0aWMgdWludDE2X3Qg YXNzaWduX2Rvb3JiZWxsKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdWludDMyX3QgcHJpb3JpdHkp CiAJcmV0dXJuIGlkOwogfQogCi1zdGF0aWMgdm9pZCByZWxlYXNlX2Rvb3JiZWxsKHN0cnVjdCBp bnRlbF9ndWMgKmd1YywgdWludDE2X3QgaWQpCi17Ci0JX19jbGVhcl9iaXQoaWQsIGd1Yy0+ZG9v cmJlbGxfYml0bWFwKTsKLX0KLQogLyoKICAqIEluaXRpYWxpc2UgdGhlIHByb2Nlc3MgZGVzY3Jp cHRvciBzaGFyZWQgd2l0aCB0aGUgR3VDIGZpcm13YXJlLgogICovCkBAIC02NTIsMjEgKzY3NSwx MSBAQCBzdGF0aWMgdm9pZCBndWNfY2xpZW50X2ZyZWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK IAkgKi8KIAogCWlmIChjbGllbnQtPmNsaWVudF9iYXNlKSB7Ci0JCXVpbnQxNl90IGRiX2lkID0g Y2xpZW50LT5kb29yYmVsbF9pZDsKLQogCQkvKgotCQkgKiBJZiB3ZSBnb3QgYXMgZmFyIGFzIHNl dHRpbmcgdXAgYSBkb29yYmVsbCwgbWFrZSBzdXJlCi0JCSAqIHdlIHNodXQgaXQgZG93biBiZWZv cmUgdW5tYXBwaW5nICYgZGVhbGxvY2F0aW5nIHRoZQotCQkgKiBtZW1vcnkuIFNvIGZpcnN0IGRp c2FibGUgdGhlIGRvb3JiZWxsLCB0aGVuIHRlbGwgdGhlCi0JCSAqIEd1QyB0aGF0IHdlJ3ZlIGZp bmlzaGVkIHdpdGggaXQsIGZpbmFsbHkgZGVhbGxvY2F0ZQotCQkgKiBpdCBpbiBvdXIgYml0bWFw CisJCSAqIElmIHdlIGdvdCBhcyBmYXIgYXMgc2V0dGluZyB1cCBhIGRvb3JiZWxsLCBtYWtlIHN1 cmUgd2UKKwkJICogc2h1dCBpdCBkb3duIGJlZm9yZSB1bm1hcHBpbmcgJiBkZWFsbG9jYXRpbmcg dGhlIG1lbW9yeS4KIAkJICovCi0JCWlmIChkYl9pZCAhPSBHVUNfSU5WQUxJRF9ET09SQkVMTF9J RCkgewotCQkJZ3VjX2Rpc2FibGVfZG9vcmJlbGwoZ3VjLCBjbGllbnQpOwotCQkJaWYgKHRlc3Rf Yml0KGRiX2lkLCBndWMtPmRvb3JiZWxsX2JpdG1hcCkpCi0JCQkJaG9zdDJndWNfcmVsZWFzZV9k b29yYmVsbChndWMsIGNsaWVudCk7Ci0JCQlyZWxlYXNlX2Rvb3JiZWxsKGd1YywgZGJfaWQpOwot CQl9CisJCWd1Y19kaXNhYmxlX2Rvb3JiZWxsKGd1YywgY2xpZW50KTsKIAogCQlrdW5tYXAoa21h cF90b19wYWdlKGNsaWVudC0+Y2xpZW50X2Jhc2UpKTsKIAl9CkBAIC03MDEsNiArNzE0LDcgQEAg c3RhdGljIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmd1Y19jbGllbnRfYWxsb2Moc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9ICZkZXZfcHJpdi0+Z3VjOwog CXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CisJdWludDE2X3QgZGJfaWQ7CiAKIAlj bGllbnQgPSBremFsbG9jKHNpemVvZigqY2xpZW50KSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFjbGll bnQpCkBAIC03NDEsMjIgKzc1NSwyMCBAQCBzdGF0aWMgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAq Z3VjX2NsaWVudF9hbGxvYyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWVsc2UKIAkJY2xpZW50 LT5wcm9jX2Rlc2Nfb2Zmc2V0ID0gKEdVQ19EQl9TSVpFIC8gMik7CiAKLQljbGllbnQtPmRvb3Ji ZWxsX2lkID0gYXNzaWduX2Rvb3JiZWxsKGd1YywgY2xpZW50LT5wcmlvcml0eSk7Ci0JaWYgKGNs aWVudC0+ZG9vcmJlbGxfaWQgPT0gR1VDX0lOVkFMSURfRE9PUkJFTExfSUQpCisJZGJfaWQgPSBh c3NpZ25fZG9vcmJlbGwoZ3VjLCBjbGllbnQtPnByaW9yaXR5KTsKKwlpZiAoZGJfaWQgPT0gR1VD X0lOVkFMSURfRE9PUkJFTExfSUQpCiAJCS8qIFhYWDogZXZpY3QgYSBkb29yYmVsbCBpbnN0ZWFk ICovCiAJCWdvdG8gZXJyOwogCiAJZ3VjX2luaXRfcHJvY19kZXNjKGd1YywgY2xpZW50KTsKIAln dWNfaW5pdF9jdHhfZGVzYyhndWMsIGNsaWVudCk7Ci0JZ3VjX2luaXRfZG9vcmJlbGwoZ3VjLCBj bGllbnQpOwotCi0JLyogWFhYOiBBbnkgY2FjaGUgZmx1c2hlcyBuZWVkZWQ/IEdlbmVyYWwgZG9t YWluIG1nbXQgY2FsbHM/ICovCi0KLQlpZiAoaG9zdDJndWNfYWxsb2NhdGVfZG9vcmJlbGwoZ3Vj LCBjbGllbnQpKQorCWlmIChndWNfaW5pdF9kb29yYmVsbChndWMsIGNsaWVudCwgZGJfaWQpKQog CQlnb3RvIGVycjsKIAotCURSTV9ERUJVR19EUklWRVIoIm5ldyBwcmlvcml0eSAldSBjbGllbnQg JXA6IGN0eF9pbmRleCAldSBkYl9pZCAldVxuIiwKLQkJcHJpb3JpdHksIGNsaWVudCwgY2xpZW50 LT5jdHhfaW5kZXgsIGNsaWVudC0+ZG9vcmJlbGxfaWQpOworCURSTV9ERUJVR19EUklWRVIoIm5l dyBwcmlvcml0eSAldSBjbGllbnQgJXA6IGN0eF9pbmRleCAldVxuIiwKKwkJcHJpb3JpdHksIGNs aWVudCwgY2xpZW50LT5jdHhfaW5kZXgpOworCURSTV9ERUJVR19EUklWRVIoImRvb3JiZWxsIGlk ICV1LCBjYWNoZWxpbmUgb2Zmc2V0IDB4JXhcbiIsCisJCWNsaWVudC0+ZG9vcmJlbGxfaWQsIGNs aWVudC0+ZG9vcmJlbGxfb2Zmc2V0KTsKIAogCXJldHVybiBjbGllbnQ7CiAKLS0gCjEuOS4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK