From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 05/10] drm/i915: dev_priv cleanup in bridge/bar/mmio init code Date: Thu, 1 Dec 2016 14:16:40 +0000 Message-ID: <1480601805-14391-6-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1480601805-14391-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 214456E7DD for ; Thu, 1 Dec 2016 14:16:59 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id g23so34499767wme.1 for ; Thu, 01 Dec 2016 06:16:59 -0800 (PST) In-Reply-To: <1480601805-14391-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCmRldl9wcml2 IGlzIG1vcmUgYXBwcm9wcmlhdGUgZm9yIHRoZXNlIHNvIGNvbnZlcnRpbmcgc2F2ZXMKc29tZSBs aW5lcyBvZiBzb3VyY2UuCgp2MjogQ29tbWl0IG1lc3NhZ2UgYW5kIGtlZXAgdGhlIHBkZXYgbG9j YWwgdmFyaWFibGUuIChKb29uYXMgTGFodGluZW4pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJz dWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29u IDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ICh2MSkKUmV2aWV3ZWQtYnk6IEpvb25hcyBMYWh0 aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jIHwgNDUgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCAzODNiZjFhYzFiZGQuLjEzMTJjZDVlNDQ2 NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0xNDIsOSArMTQyLDggQEAgc3RhdGljIGVu dW0gaW50ZWxfcGNoIGludGVsX3ZpcnRfZGV0ZWN0X3BjaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfZGV0ZWN0 X3BjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQorc3RhdGljIHZvaWQgaW50ZWxfZGV0ZWN0X3Bj aChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBwY2lfZGV2ICpwY2gg PSBOVUxMOwogCiAJLyogSW4gYWxsIGN1cnJlbnQgY2FzZXMsIG51bV9waXBlcyBpcyBlcXVpdmFs ZW50IHRvIHRoZSBQQ0hfTk9QIHNldHRpbmcKQEAgLTM2MSwxMCArMzYwLDggQEAgc3RhdGljIGlu dCBpOTE1X2dldHBhcmFtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJcmV0 dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgaTkxNV9nZXRfYnJpZGdlX2RldihzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQorc3RhdGljIGludCBpOTE1X2dldF9icmlkZ2VfZGV2KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGRldik7Ci0KIAlkZXZfcHJpdi0+YnJpZGdlX2RldiA9IHBjaV9nZXRfYnVz X2FuZF9zbG90KDAsIFBDSV9ERVZGTigwLCAwKSk7CiAJaWYgKCFkZXZfcHJpdi0+YnJpZGdlX2Rl dikgewogCQlEUk1fRVJST1IoImJyaWRnZSBkZXZpY2Ugbm90IGZvdW5kXG4iKTsKQEAgLTM3NSw5 ICszNzIsOCBAQCBzdGF0aWMgaW50IGk5MTVfZ2V0X2JyaWRnZV9kZXYoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAogLyogQWxsb2NhdGUgc3BhY2UgZm9yIHRoZSBNQ0ggcmVncyBpZiBuZWVkZWQs IHJldHVybiBub256ZXJvIG9uIGVycm9yICovCiBzdGF0aWMgaW50Ci1pbnRlbF9hbGxvY19tY2hi YXJfcmVzb3VyY2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK2ludGVsX2FsbG9jX21jaGJhcl9y ZXNvdXJjZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCWludCByZWcgPSBJTlRF TF9HRU4oZGV2X3ByaXYpID49IDQgPyBNQ0hCQVJfSTk2NSA6IE1DSEJBUl9JOTE1OwogCXUzMiB0 ZW1wX2xvLCB0ZW1wX2hpID0gMDsKIAl1NjQgbWNoYmFyX2FkZHI7CkBAIC00MjEsOSArNDE3LDgg QEAgaW50ZWxfYWxsb2NfbWNoYmFyX3Jlc291cmNlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAK IC8qIFNldHVwIE1DSEJBUiBpZiBwb3NzaWJsZSwgcmV0dXJuIHRydWUgaWYgd2Ugc2hvdWxkIGRp c2FibGUgaXQgYWdhaW4gKi8KIHN0YXRpYyB2b2lkCi1pbnRlbF9zZXR1cF9tY2hiYXIoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKK2ludGVsX3NldHVwX21jaGJhcihzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkZXYpOwogCWludCBtY2hiYXJfcmVnID0gSU5URUxfR0VOKGRldl9wcml2KSA+PSA0 ID8gTUNIQkFSX0k5NjUgOiBNQ0hCQVJfSTkxNTsKIAl1MzIgdGVtcDsKIAlib29sIGVuYWJsZWQ7 CkBAIC00NDUsNyArNDQwLDcgQEAgaW50ZWxfc2V0dXBfbWNoYmFyKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJaWYgKGVuYWJsZWQpCiAJCXJldHVybjsKIAotCWlmIChpbnRlbF9hbGxvY19tY2hi YXJfcmVzb3VyY2UoZGV2KSkKKwlpZiAoaW50ZWxfYWxsb2NfbWNoYmFyX3Jlc291cmNlKGRldl9w cml2KSkKIAkJcmV0dXJuOwogCiAJZGV2X3ByaXYtPm1jaGJhcl9uZWVkX2Rpc2FibGUgPSB0cnVl OwpAQCAtNDYxLDkgKzQ1Niw4IEBAIGludGVsX3NldHVwX21jaGJhcihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogfQogCiBzdGF0aWMgdm9pZAotaW50ZWxfdGVhcmRvd25fbWNoYmFyKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCitpbnRlbF90ZWFyZG93bl9tY2hiYXIoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKIAlpbnQgbWNoYmFyX3JlZyA9IElOVEVMX0dFTihkZXZfcHJpdikgPj0g NCA/IE1DSEJBUl9JOTY1IDogTUNIQkFSX0k5MTU7CiAKIAlpZiAoZGV2X3ByaXYtPm1jaGJhcl9u ZWVkX2Rpc2FibGUpIHsKQEAgLTQ5Myw5ICs0ODcsOSBAQCBpbnRlbF90ZWFyZG93bl9tY2hiYXIo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIC8qIHRydWUgPSBlbmFibGUgZGVjb2RlLCBmYWxzZSA9 IGRpc2FibGUgZGVjb2RlciAqLwogc3RhdGljIHVuc2lnbmVkIGludCBpOTE1X3ZnYV9zZXRfZGVj b2RlKHZvaWQgKmNvb2tpZSwgYm9vbCBzdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gY29va2llOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGNvb2tpZTsK IAotCWludGVsX21vZGVzZXRfdmdhX3NldF9zdGF0ZSh0b19pOTE1KGRldiksIHN0YXRlKTsKKwlp bnRlbF9tb2Rlc2V0X3ZnYV9zZXRfc3RhdGUoZGV2X3ByaXYsIHN0YXRlKTsKIAlpZiAoc3RhdGUp CiAJCXJldHVybiBWR0FfUlNSQ19MRUdBQ1lfSU8gfCBWR0FfUlNSQ19MRUdBQ1lfTUVNIHwKIAkJ ICAgICAgIFZHQV9SU1JDX05PUk1BTF9JTyB8IFZHQV9SU1JDX05PUk1BTF9NRU07CkBAIC01NzQs NyArNTY4LDcgQEAgc3RhdGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJICogdGhlbiB3ZSBkbyBub3QgdGFrZSBwYXJ0IGluIFZHQSBhcmJpdHJh dGlvbiBhbmQgdGhlCiAJICogdmdhX2NsaWVudF9yZWdpc3RlcigpIGZhaWxzIHdpdGggLUVOT0RF Vi4KIAkgKi8KLQlyZXQgPSB2Z2FfY2xpZW50X3JlZ2lzdGVyKHBkZXYsIGRldiwgTlVMTCwgaTkx NV92Z2Ffc2V0X2RlY29kZSk7CisJcmV0ID0gdmdhX2NsaWVudF9yZWdpc3RlcihwZGV2LCBkZXZf cHJpdiwgTlVMTCwgaTkxNV92Z2Ffc2V0X2RlY29kZSk7CiAJaWYgKHJldCAmJiByZXQgIT0gLUVO T0RFVikKIAkJZ290byBvdXQ7CiAKQEAgLTgyMyw3ICs4MTcsNyBAQCBzdGF0aWMgaW50IGk5MTVf ZHJpdmVyX2luaXRfZWFybHkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQln b3RvIGVycl93b3JrcXVldWVzOwogCiAJLyogVGhpcyBtdXN0IGJlIGNhbGxlZCBiZWZvcmUgYW55 IGNhbGxzIHRvIEhBU19QQ0hfKiAqLwotCWludGVsX2RldGVjdF9wY2goJmRldl9wcml2LT5kcm0p OworCWludGVsX2RldGVjdF9wY2goZGV2X3ByaXYpOwogCiAJaW50ZWxfcG1fc2V0dXAoJmRldl9w cml2LT5kcm0pOwogCWludGVsX2luaXRfZHBpbyhkZXZfcHJpdik7CkBAIC04NjUsOSArODU5LDgg QEAgc3RhdGljIHZvaWQgaTkxNV9kcml2ZXJfY2xlYW51cF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiAJaTkxNV93b3JrcXVldWVzX2NsZWFudXAoZGV2X3ByaXYpOwog fQogCi1zdGF0aWMgaW50IGk5MTVfbW1pb19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQor c3RhdGljIGludCBpOTE1X21taW9fc2V0dXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2 KTsKIAlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0ucGRldjsKIAlpbnQgbW1p b19iYXI7CiAJaW50IG1taW9fc2l6ZTsKQEAgLTg5MywxNyArODg2LDE2IEBAIHN0YXRpYyBpbnQg aTkxNV9tbWlvX3NldHVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJfQogCiAJLyogVHJ5IHRv IG1ha2Ugc3VyZSBNQ0hCQVIgaXMgZW5hYmxlZCBiZWZvcmUgcG9raW5nIGF0IGl0ICovCi0JaW50 ZWxfc2V0dXBfbWNoYmFyKGRldik7CisJaW50ZWxfc2V0dXBfbWNoYmFyKGRldl9wcml2KTsKIAog CXJldHVybiAwOwogfQogCi1zdGF0aWMgdm9pZCBpOTE1X21taW9fY2xlYW51cChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQorc3RhdGljIHZvaWQgaTkxNV9tbWlvX2NsZWFudXAoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5k cm0ucGRldjsKIAotCWludGVsX3RlYXJkb3duX21jaGJhcihkZXYpOworCWludGVsX3RlYXJkb3du X21jaGJhcihkZXZfcHJpdik7CiAJcGNpX2lvdW5tYXAocGRldiwgZGV2X3ByaXYtPnJlZ3MpOwog fQogCkBAIC05MTgsMTYgKzkxMCwxNSBAQCBzdGF0aWMgdm9pZCBpOTE1X21taW9fY2xlYW51cChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogICovCiBzdGF0aWMgaW50IGk5MTVfZHJpdmVyX2luaXRf bW1pbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwogCWludCByZXQ7CiAKIAlpZiAoaTkxNV9pbmpl Y3RfbG9hZF9mYWlsdXJlKCkpCiAJCXJldHVybiAtRU5PREVWOwogCi0JaWYgKGk5MTVfZ2V0X2Jy aWRnZV9kZXYoZGV2KSkKKwlpZiAoaTkxNV9nZXRfYnJpZGdlX2RldihkZXZfcHJpdikpCiAJCXJl dHVybiAtRUlPOwogCi0JcmV0ID0gaTkxNV9tbWlvX3NldHVwKGRldik7CisJcmV0ID0gaTkxNV9t bWlvX3NldHVwKGRldl9wcml2KTsKIAlpZiAocmV0IDwgMCkKIAkJZ290byBwdXRfYnJpZGdlOwog CkBAIC05NDcsMTAgKzkzOCw4IEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfaW5pdF9tbWlvKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICAqLwogc3RhdGljIHZvaWQgaTkxNV9k cml2ZXJfY2xlYW51cF9tbWlvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsK LQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2LT5kcm07Ci0KIAlpbnRlbF91bmNv cmVfZmluaShkZXZfcHJpdik7Ci0JaTkxNV9tbWlvX2NsZWFudXAoZGV2KTsKKwlpOTE1X21taW9f Y2xlYW51cChkZXZfcHJpdik7CiAJcGNpX2Rldl9wdXQoZGV2X3ByaXYtPmJyaWRnZV9kZXYpOwog fQogCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==