From: Dave Gordon Subject: [PATCH v4 3/6] drm/i915/guc: refactor doorbell management code Date: Thu, 7 Apr 2016 18:21:15 +0100 Message-ID: <1460049678-21918-4-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 367276E9EB for ; Thu, 7 Apr 2016 17:21:51 +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 RHVyaW5nIGEgaGliZXJuYXRlL3Jlc3VtZSBjeWNsZSwgdGhlIGRyaXZlciwgdGhlIEd1QywgYW5k IHRoZSBkb29yYmVsbApoYXJkd2FyZSBjYW4gZW5kIHVwIGluIGluY29uc2lzdGVudCBzdGF0ZXMu IFRoaXMgcGF0Y2ggcmVmYWN0b3JzIHRoZQpkcml2ZXIncyBoYW5kbGluZyBhbmQgdHJhY2tpbmcg b2YgZG9vcmJlbGxzLCBpbiBwcmVwYXJhdGlvbiBmb3IgYSBsYXRlcgpvbmUgd2hpY2ggd2lsbCBy ZXNvbHZlIHRoZSBpc3N1ZS4KClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdv cmRvbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlz c2lvbi5jIHwgODggKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgNTMgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDIxNzE3NTkuLjJmYzY5ZjEgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTE3NSw4ICsxNzUsNDgg QEAgc3RhdGljIGludCBob3N0Mmd1Y19zYW1wbGVfZm9yY2V3YWtlKHN0cnVjdCBpbnRlbF9ndWMg Kmd1YywKICAqIGNsaWVudCBvYmplY3Qgd2hpY2ggY29udGFpbnMgdGhlIHBhZ2UgYmVpbmcgdXNl ZCBmb3IgdGhlIGRvb3JiZWxsCiAgKi8KIAorc3RhdGljIGludCBndWNfdXBkYXRlX2Rvb3JiZWxs X2lkKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCwKKwkJCQkgIHN0cnVjdCBndWNfZG9v cmJlbGxfaW5mbyAqZG9vcmJlbGwsCisJCQkJICB1MTYgbmV3X2lkKQoreworCXN0cnVjdCBzZ190 YWJsZSAqc2cgPSBjbGllbnQtPmd1Yy0+Y3R4X3Bvb2xfb2JqLT5wYWdlczsKKwl2b2lkICpkb29y YmVsbF9iaXRtYXAgPSBjbGllbnQtPmd1Yy0+ZG9vcmJlbGxfYml0bWFwOworCXN0cnVjdCBndWNf Y29udGV4dF9kZXNjIGRlc2M7CisJc2l6ZV90IGxlbjsKKworCWlmIChjbGllbnQtPmRvb3JiZWxs X2lkICE9IEdVQ19JTlZBTElEX0RPT1JCRUxMX0lEICYmCisJICAgIHRlc3RfYml0KGNsaWVudC0+ ZG9vcmJlbGxfaWQsIGRvb3JiZWxsX2JpdG1hcCkpIHsKKwkJLyogRGVhY3RpdmF0ZSB0aGUgb2xk IGRvb3JiZWxsICovCisJCWRvb3JiZWxsLT5kYl9zdGF0dXMgPSBHVUNfRE9PUkJFTExfRElTQUJM RUQ7CisJCSh2b2lkKWhvc3QyZ3VjX3JlbGVhc2VfZG9vcmJlbGwoY2xpZW50LT5ndWMsIGNsaWVu dCk7CisJCWNsZWFyX2JpdChjbGllbnQtPmRvb3JiZWxsX2lkLCBkb29yYmVsbF9iaXRtYXApOwor CX0KKworCS8qIFVwZGF0ZSB0aGUgR3VDJ3MgaWRlYSBvZiB0aGUgZG9vcmJlbGwgSUQgKi8KKwls ZW4gPSBzZ19wY29weV90b19idWZmZXIoc2ctPnNnbCwgc2ctPm5lbnRzLCAmZGVzYywgc2l6ZW9m KGRlc2MpLAorCQkJICAgICBzaXplb2YoZGVzYykgKiBjbGllbnQtPmN0eF9pbmRleCk7CisJaWYg KGxlbiAhPSBzaXplb2YoZGVzYykpCisJCXJldHVybiAtRUZBVUxUOworCWRlc2MuZGJfaWQgPSBu ZXdfaWQ7CisJbGVuID0gc2dfcGNvcHlfZnJvbV9idWZmZXIoc2ctPnNnbCwgc2ctPm5lbnRzLCAm ZGVzYywgc2l6ZW9mKGRlc2MpLAorCQkJICAgICBzaXplb2YoZGVzYykgKiBjbGllbnQtPmN0eF9p bmRleCk7CisJaWYgKGxlbiAhPSBzaXplb2YoZGVzYykpCisJCXJldHVybiAtRUZBVUxUOworCisJ Y2xpZW50LT5kb29yYmVsbF9pZCA9IG5ld19pZDsKKwlpZiAobmV3X2lkID09IEdVQ19JTlZBTElE X0RPT1JCRUxMX0lEKQorCQlyZXR1cm4gMDsKKworCS8qIEFjdGl2YXRlIHRoZSBuZXcgZG9vcmJl bGwgKi8KKwlzZXRfYml0KGNsaWVudC0+ZG9vcmJlbGxfaWQsIGRvb3JiZWxsX2JpdG1hcCk7CisJ ZG9vcmJlbGwtPmRiX3N0YXR1cyA9IEdVQ19ET09SQkVMTF9FTkFCTEVEOworCWRvb3JiZWxsLT5j b29raWUgPSAwOworCXJldHVybiBob3N0Mmd1Y19hbGxvY2F0ZV9kb29yYmVsbChjbGllbnQtPmd1 YywgY2xpZW50KTsKK30KKwogc3RhdGljIHZvaWQgZ3VjX2luaXRfZG9vcmJlbGwoc3RydWN0IGlu dGVsX2d1YyAqZ3VjLAotCQkJICAgICAgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQor CQkJICAgICAgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50LAorCQkJICAgICAgdWludDE2 X3QgZGJfaWQpCiB7CiAJc3RydWN0IGd1Y19kb29yYmVsbF9pbmZvICpkb29yYmVsbDsKIAl2b2lk ICpiYXNlOwpAQCAtMTg0LDggKzIyNCw3IEBAIHN0YXRpYyB2b2lkIGd1Y19pbml0X2Rvb3JiZWxs KHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAliYXNlID0ga21hcF9hdG9taWMoaTkxNV9nZW1fb2Jq ZWN0X2dldF9wYWdlKGNsaWVudC0+Y2xpZW50X29iaiwgMCkpOwogCWRvb3JiZWxsID0gYmFzZSAr IGNsaWVudC0+ZG9vcmJlbGxfb2Zmc2V0OwogCi0JZG9vcmJlbGwtPmRiX3N0YXR1cyA9IDE7Ci0J ZG9vcmJlbGwtPmNvb2tpZSA9IDA7CisJZ3VjX3VwZGF0ZV9kb29yYmVsbF9pZChjbGllbnQsIGRv b3JiZWxsLCBkYl9pZCk7CiAKIAlrdW5tYXBfYXRvbWljKGJhc2UpOwogfQpAQCAtMTkzLDI3ICsy MzIsMTYgQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfZG9vcmJlbGwoc3RydWN0IGludGVsX2d1YyAq Z3VjLAogc3RhdGljIHZvaWQgZ3VjX2Rpc2FibGVfZG9vcmJlbGwoc3RydWN0IGludGVsX2d1YyAq Z3VjLAogCQkJCSBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQpCiB7Ci0Jc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKIAlzdHJ1Y3QgZ3Vj X2Rvb3JiZWxsX2luZm8gKmRvb3JiZWxsOwogCXZvaWQgKmJhc2U7Ci0JaTkxNV9yZWdfdCBkcmJy ZWcgPSBHRU44X0RSQlJFR0woY2xpZW50LT5kb29yYmVsbF9pZCk7Ci0JaW50IHZhbHVlOwogCiAJ YmFzZSA9IGttYXBfYXRvbWljKGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShjbGllbnQtPmNsaWVu dF9vYmosIDApKTsKIAlkb29yYmVsbCA9IGJhc2UgKyBjbGllbnQtPmRvb3JiZWxsX29mZnNldDsK IAotCWRvb3JiZWxsLT5kYl9zdGF0dXMgPSAwOworCWd1Y191cGRhdGVfZG9vcmJlbGxfaWQoY2xp ZW50LCBkb29yYmVsbCwgR1VDX0lOVkFMSURfRE9PUkJFTExfSUQpOwogCiAJa3VubWFwX2F0b21p YyhiYXNlKTsKIAotCUk5MTVfV1JJVEUoZHJicmVnLCBJOTE1X1JFQUQoZHJicmVnKSAmIH5HRU44 X0RSQl9WQUxJRCk7Ci0KLQl2YWx1ZSA9IEk5MTVfUkVBRChkcmJyZWcpOwotCVdBUk5fT04oKHZh bHVlICYgR0VOOF9EUkJfVkFMSUQpICE9IDApOwotCi0JSTkxNV9XUklURShHRU44X0RSQlJFR1Uo Y2xpZW50LT5kb29yYmVsbF9pZCksIDApOwotCUk5MTVfV1JJVEUoZHJicmVnLCAwKTsKLQogCS8q IFhYWDogd2FpdCBmb3IgYW55IGludGVycnVwdHMgKi8KIAkvKiBYWFg6IHdhaXQgZm9yIHdvcmtx dWV1ZSB0byBkcmFpbiAqLwogfQpAQCAtMjYwLDcgKzI4OCw3IEBAIHN0YXRpYyB1aW50MTZfdCBh c3NpZ25fZG9vcmJlbGwoc3RydWN0IGludGVsX2d1YyAqZ3VjLCB1aW50MzJfdCBwcmlvcml0eSkK IAlpZiAoaWQgPT0gZW5kKQogCQlpZCA9IEdVQ19JTlZBTElEX0RPT1JCRUxMX0lEOwogCWVsc2UK LQkJYml0bWFwX3NldChndWMtPmRvb3JiZWxsX2JpdG1hcCwgaWQsIDEpOworCQlzZXRfYml0KGlk LCBndWMtPmRvb3JiZWxsX2JpdG1hcCk7CiAKIAlEUk1fREVCVUdfRFJJVkVSKCJhc3NpZ25lZCAl cyBwcmlvcml0eSBkb29yYmVsbCBpZCAweCV4XG4iLAogCQkJaGlfcHJpID8gImhpZ2giIDogIm5v cm1hbCIsIGlkKTsKQEAgLTI2OCwxMSArMjk2LDYgQEAgc3RhdGljIHVpbnQxNl90IGFzc2lnbl9k b29yYmVsbChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIHVpbnQzMl90IHByaW9yaXR5KQogCXJldHVy biBpZDsKIH0KIAotc3RhdGljIHZvaWQgcmVsZWFzZV9kb29yYmVsbChzdHJ1Y3QgaW50ZWxfZ3Vj ICpndWMsIHVpbnQxNl90IGlkKQotewotCWJpdG1hcF9jbGVhcihndWMtPmRvb3JiZWxsX2JpdG1h cCwgaWQsIDEpOwotfQotCiAvKgogICogSW5pdGlhbGlzZSB0aGUgcHJvY2VzcyBkZXNjcmlwdG9y IHNoYXJlZCB3aXRoIHRoZSBHdUMgZmlybXdhcmUuCiAgKi8KQEAgLTY2NywxNSArNjkwLDcgQEAg c3RhdGljIHZvaWQgZ3VjX2NsaWVudF9mcmVlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaWYg KCFjbGllbnQpCiAJCXJldHVybjsKIAotCWlmIChjbGllbnQtPmRvb3JiZWxsX2lkICE9IEdVQ19J TlZBTElEX0RPT1JCRUxMX0lEKSB7Ci0JCS8qCi0JCSAqIEZpcnN0IGRpc2FibGUgdGhlIGRvb3Ji ZWxsLCB0aGVuIHRlbGwgdGhlIEd1QyB3ZSd2ZQotCQkgKiBmaW5pc2hlZCB3aXRoIGl0LCBmaW5h bGx5IGRlYWxsb2NhdGUgaXQgaW4gb3VyIGJpdG1hcAotCQkgKi8KLQkJZ3VjX2Rpc2FibGVfZG9v cmJlbGwoZ3VjLCBjbGllbnQpOwotCQlob3N0Mmd1Y19yZWxlYXNlX2Rvb3JiZWxsKGd1YywgY2xp ZW50KTsKLQkJcmVsZWFzZV9kb29yYmVsbChndWMsIGNsaWVudC0+ZG9vcmJlbGxfaWQpOwotCX0K KwlndWNfZGlzYWJsZV9kb29yYmVsbChndWMsIGNsaWVudCk7CiAKIAkvKgogCSAqIFhYWDogd2Fp dCBmb3IgYW55IG91dHN0YW5kaW5nIHN1Ym1pc3Npb25zIGJlZm9yZSBmcmVlaW5nIG1lbW9yeS4K QEAgLTcxMiw2ICs3MjcsNyBAQCBzdGF0aWMgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ3VjX2Ns aWVudF9hbGxvYyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2d1YyAqZ3Vj ID0gJmRldl9wcml2LT5ndWM7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKKwl1 aW50MTZfdCBkYl9pZDsKIAogCWNsaWVudCA9IGt6YWxsb2Moc2l6ZW9mKCpjbGllbnQpLCBHRlBf S0VSTkVMKTsKIAlpZiAoIWNsaWVudCkKQEAgLTc1MCwyMiArNzY2LDI0IEBAIHN0YXRpYyBzdHJ1 Y3QgaTkxNV9ndWNfY2xpZW50ICpndWNfY2xpZW50X2FsbG9jKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJZWxzZQogCQljbGllbnQtPnByb2NfZGVzY19vZmZzZXQgPSAoR1VDX0RCX1NJWkUgLyAy KTsKIAotCWNsaWVudC0+ZG9vcmJlbGxfaWQgPSBhc3NpZ25fZG9vcmJlbGwoZ3VjLCBjbGllbnQt PnByaW9yaXR5KTsKLQlpZiAoY2xpZW50LT5kb29yYmVsbF9pZCA9PSBHVUNfSU5WQUxJRF9ET09S QkVMTF9JRCkKKwlkYl9pZCA9IGFzc2lnbl9kb29yYmVsbChndWMsIGNsaWVudC0+cHJpb3JpdHkp OworCWlmIChkYl9pZCA9PSBHVUNfSU5WQUxJRF9ET09SQkVMTF9JRCkKIAkJLyogWFhYOiBldmlj dCBhIGRvb3JiZWxsIGluc3RlYWQgKi8KIAkJZ290byBlcnI7CiAKIAlndWNfaW5pdF9wcm9jX2Rl c2MoZ3VjLCBjbGllbnQpOwogCWd1Y19pbml0X2N0eF9kZXNjKGd1YywgY2xpZW50KTsKLQlndWNf aW5pdF9kb29yYmVsbChndWMsIGNsaWVudCk7CisJZ3VjX2luaXRfZG9vcmJlbGwoZ3VjLCBjbGll bnQsIGRiX2lkKTsKIAogCS8qIFhYWDogQW55IGNhY2hlIGZsdXNoZXMgbmVlZGVkPyBHZW5lcmFs IGRvbWFpbiBtZ210IGNhbGxzPyAqLwogCiAJaWYgKGhvc3QyZ3VjX2FsbG9jYXRlX2Rvb3JiZWxs KGd1YywgY2xpZW50KSkKIAkJZ290byBlcnI7CiAKLQlEUk1fREVCVUdfRFJJVkVSKCJuZXcgcHJp b3JpdHkgJXUgY2xpZW50ICVwOiBjdHhfaW5kZXggJXUgZGJfaWQgJXVcbiIsCi0JCXByaW9yaXR5 LCBjbGllbnQsIGNsaWVudC0+Y3R4X2luZGV4LCBjbGllbnQtPmRvb3JiZWxsX2lkKTsKKwlEUk1f REVCVUdfRFJJVkVSKCJuZXcgcHJpb3JpdHkgJXUgY2xpZW50ICVwOiBjdHhfaW5kZXggJXVcbiIs CisJCXByaW9yaXR5LCBjbGllbnQsIGNsaWVudC0+Y3R4X2luZGV4KTsKKwlEUk1fREVCVUdfRFJJ VkVSKCJkb29yYmVsbCBpZCAldSwgY2FjaGVsaW5lIG9mZnNldCAweCV4XG4iLAorCQljbGllbnQt PmRvb3JiZWxsX2lkLCBjbGllbnQtPmRvb3JiZWxsX29mZnNldCk7CiAKIAlyZXR1cm4gY2xpZW50 OwogCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==