From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH v2 15/17] drm/i915: Split out load time MMIO initialization Date: Fri, 11 Mar 2016 18:31:40 +0200 Message-ID: <1457713902-2425-16-git-send-email-imre.deak@intel.com> References: <1457713902-2425-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 3A8FF6EB18 for ; Fri, 11 Mar 2016 16:32:09 +0000 (UTC) In-Reply-To: <1457713902-2425-1-git-send-email-imre.deak@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 QWNjb3JkaW5nIHRvIHRoZSBuZXcgaW5pdCBwaGFzZXMgc2NoZW1lIHdlIHNob3VsZCBoYXZlIGEg ZGVmaW5pdGUgc3RlcAppbiB0aGUgaW5pdCBzZXF1ZW5jZSB3aGVyZSBNTUlPIGFjY2VzcyBpcyBz ZXR1cCwgc28gbW92ZSB0aGUKY29ycmVzcG9uZGluZyBjb2RlIHRvIGEgc2VwYXJhdGUgZnVuY3Rp b24uIFRoaXMgYWxzbyBoYXMgdGhlIGJlbmVmaXQgb2YKbWFraW5nIHRoZSBlcnJvciBwYXRoIGNs ZWFuZXIgYm90aCBpbiB0aGUgbmV3IGZ1bmN0aW9uIGFuZCBpbgppOTE1X2RyaXZlcl9sb2FkKCkv dW5sb2FkKCkuCgpObyBmdW5jdGlvbmFsIGNoYW5nZS4KClN1Z2dlc3RlZCBieSBDaHJpcy4KCkNj OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTog SW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZG1hLmMgfCA2OSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDUwIGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RtYS5jCmluZGV4IDkzZTc5NTEuLmFiOTc0MDQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kbWEuYwpAQCAtMTA1MSw2ICsxMDUxLDUwIEBAIHN0YXRpYyB2b2lkIGk5MTVfbW1pb19j bGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB9CiAKIC8qKgorICogaTkxNV9kcml2ZXJf aW5pdF9tbWlvIC0gc2V0dXAgZGV2aWNlIE1NSU8KKyAqIEBkZXZfcHJpdjogZGV2aWNlIHByaXZh dGUKKyAqCisgKiBTZXR1cCBtaW5pbWFsIGRldmljZSBzdGF0ZSBuZWNlc3NhcnkgZm9yIE1NSU8g YWNjZXNzZXMgbGF0ZXIgaW4gdGhlCisgKiBpbml0aWFsaXphdGlvbiBzZXF1ZW5jZS4gVGhlIHNl dHVwIGhlcmUgc2hvdWxkIGF2b2lkIGFueSBvdGhlciBkZXZpY2Utd2lkZQorICogc2lkZSBlZmZl Y3RzIG9yIGV4cG9zaW5nIHRoZSBkcml2ZXIgdmlhIGtlcm5lbCBpbnRlcm5hbCBvciB1c2VyIHNw YWNlCisgKiBpbnRlcmZhY2VzLgorICovCitzdGF0aWMgaW50IGk5MTVfZHJpdmVyX2luaXRfbW1p byhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGRldl9wcml2LT5kZXY7CisJaW50IHJldDsKKworCWlmIChpOTE1X2dldF9icmlk Z2VfZGV2KGRldikpCisJCXJldHVybiAtRUlPOworCisJcmV0ID0gaTkxNV9tbWlvX3NldHVwKGRl dik7CisJaWYgKHJldCA8IDApCisJCWdvdG8gcHV0X2JyaWRnZTsKKworCWludGVsX3VuY29yZV9p bml0KGRldik7CisKKwlyZXR1cm4gMDsKKworcHV0X2JyaWRnZToKKwlwY2lfZGV2X3B1dChkZXZf cHJpdi0+YnJpZGdlX2Rldik7CisKKwlyZXR1cm4gcmV0OworfQorCisvKioKKyAqIGk5MTVfZHJp dmVyX2NsZWFudXBfbW1pbyAtIGNsZWFudXAgdGhlIHNldHVwIGRvbmUgaW4gaTkxNV9kcml2ZXJf aW5pdF9tbWlvKCkKKyAqIEBkZXZfcHJpdjogZGV2aWNlIHByaXZhdGUKKyAqLworc3RhdGljIHZv aWQgaTkxNV9kcml2ZXJfY2xlYW51cF9tbWlvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKK3sKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKKworCWlu dGVsX3VuY29yZV9maW5pKGRldik7CisJaTkxNV9tbWlvX2NsZWFudXAoZGV2KTsKKwlwY2lfZGV2 X3B1dChkZXZfcHJpdi0+YnJpZGdlX2Rldik7Cit9CisKKy8qKgogICogaTkxNV9kcml2ZXJfbG9h ZCAtIHNldHVwIGNoaXAgYW5kIGNyZWF0ZSBhbiBpbml0aWFsIGNvbmZpZwogICogQGRldjogRFJN IGRldmljZQogICogQGZsYWdzOiBzdGFydHVwIGZsYWdzCkBAIC0xMDgxLDIyICsxMTI1LDE1IEBA IGludCBpOTE1X2RyaXZlcl9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxv bmcgZmxhZ3MpCiAKIAlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAKLQlpZiAoaTkx NV9nZXRfYnJpZGdlX2RldihkZXYpKSB7Ci0JCXJldCA9IC1FSU87Ci0JCWdvdG8gb3V0X3J1bnRp bWVfcG1fcHV0OwotCX0KLQotCXJldCA9IGk5MTVfbW1pb19zZXR1cChkZXYpOworCXJldCA9IGk5 MTVfZHJpdmVyX2luaXRfbW1pbyhkZXZfcHJpdik7CiAJaWYgKHJldCA8IDApCi0JCWdvdG8gcHV0 X2JyaWRnZTsKLQotCWludGVsX3VuY29yZV9pbml0KGRldik7CisJCWdvdG8gb3V0X3J1bnRpbWVf cG1fcHV0OwogCiAJaW50ZWxfZGV2aWNlX2luZm9fcnVudGltZV9pbml0KGRldik7CiAKIAlyZXQg PSBpOTE1X2dlbV9ndHRfaW5pdChkZXYpOwogCWlmIChyZXQpCi0JCWdvdG8gb3V0X3VuY29yZV9m aW5pOworCQlnb3RvIG91dF9jbGVhbnVwX21taW87CiAKIAkvKiBXQVJOSU5HOiBBcHBhcmVudGx5 IHdlIG11c3Qga2ljayBmYmRldiBkcml2ZXJzIGJlZm9yZSB2Z2Fjb24sCiAJICogb3RoZXJ3aXNl IHRoZSB2Z2EgZmJkZXYgZHJpdmVyIGZhbGxzIG92ZXIuICovCkBAIC0xMjE5LDExICsxMjU2LDgg QEAgb3V0X2Rpc2FibGVfbXNpOgogCWlvX21hcHBpbmdfZnJlZShkZXZfcHJpdi0+Z3R0Lm1hcHBh YmxlKTsKIG91dF9ndHQ6CiAJaTkxNV9nbG9iYWxfZ3R0X2NsZWFudXAoZGV2KTsKLW91dF91bmNv cmVfZmluaToKLQlpbnRlbF91bmNvcmVfZmluaShkZXYpOwotCWk5MTVfbW1pb19jbGVhbnVwKGRl dik7Ci1wdXRfYnJpZGdlOgotCXBjaV9kZXZfcHV0KGRldl9wcml2LT5icmlkZ2VfZGV2KTsKK291 dF9jbGVhbnVwX21taW86CisJaTkxNV9kcml2ZXJfY2xlYW51cF9tbWlvKGRldl9wcml2KTsKIG91 dF9ydW50aW1lX3BtX3B1dDoKIAlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7CiAJaTkx NV9kcml2ZXJfY2xlYW51cF9lYXJseShkZXZfcHJpdik7CkBAIC0xMzA0LDEwICsxMzM4LDcgQEAg aW50IGk5MTVfZHJpdmVyX3VubG9hZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlvX21hcHBp bmdfZnJlZShkZXZfcHJpdi0+Z3R0Lm1hcHBhYmxlKTsKIAlpOTE1X2dsb2JhbF9ndHRfY2xlYW51 cChkZXYpOwogCi0JaW50ZWxfdW5jb3JlX2ZpbmkoZGV2KTsKLQlpOTE1X21taW9fY2xlYW51cChk ZXYpOwotCi0JcGNpX2Rldl9wdXQoZGV2X3ByaXYtPmJyaWRnZV9kZXYpOworCWk5MTVfZHJpdmVy X2NsZWFudXBfbW1pbyhkZXZfcHJpdik7CiAKIAlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZf cHJpdiwgUE9XRVJfRE9NQUlOX0lOSVQpOwogCi0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==