From: Tvrtko Ursulin Subject: [PATCH 05/10] drm/i915: dev_priv cleanup in bridge/bar/mmio init code Date: Wed, 30 Nov 2016 11:35:35 +0000 Message-ID: <1480505740-1920-6-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1480505740-1920-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-wj0-x243.google.com (mail-wj0-x243.google.com [IPv6:2a00:1450:400c:c01::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id F40E46E118 for ; Wed, 30 Nov 2016 11:35:53 +0000 (UTC) Received: by mail-wj0-x243.google.com with SMTP id xy5so21813925wjc.1 for ; Wed, 30 Nov 2016 03:35:53 -0800 (PST) In-Reply-To: <1480505740-1920-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpZ25lZC1v ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyB8IDUyICsrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMzMg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggM2MwZGViMGUwMDhmLi4y M2Q4MDAxZWEwYjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTQyLDkgKzE0Miw4IEBA IHN0YXRpYyBlbnVtIGludGVsX3BjaCBpbnRlbF92aXJ0X2RldGVjdF9wY2goc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyB2b2lkIGlu dGVsX2RldGVjdF9wY2goc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyB2b2lkIGludGVs X2RldGVjdF9wY2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgcGNp X2RldiAqcGNoID0gTlVMTDsKIAogCS8qIEluIGFsbCBjdXJyZW50IGNhc2VzLCBudW1fcGlwZXMg aXMgZXF1aXZhbGVudCB0byB0aGUgUENIX05PUCBzZXR0aW5nCkBAIC0zNjEsMTAgKzM2MCw4IEBA IHN0YXRpYyBpbnQgaTkxNV9nZXRwYXJhbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpk YXRhLAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGk5MTVfZ2V0X2JyaWRnZV9kZXYoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyBpbnQgaTkxNV9nZXRfYnJpZGdlX2RldihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCiAJZGV2X3ByaXYtPmJyaWRnZV9kZXYgPSBw Y2lfZ2V0X2J1c19hbmRfc2xvdCgwLCBQQ0lfREVWRk4oMCwgMCkpOwogCWlmICghZGV2X3ByaXYt PmJyaWRnZV9kZXYpIHsKIAkJRFJNX0VSUk9SKCJicmlkZ2UgZGV2aWNlIG5vdCBmb3VuZFxuIik7 CkBAIC0zNzUsOSArMzcyLDggQEAgc3RhdGljIGludCBpOTE1X2dldF9icmlkZ2VfZGV2KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAKIC8qIEFsbG9jYXRlIHNwYWNlIGZvciB0aGUgTUNIIHJlZ3Mg aWYgbmVlZGVkLCByZXR1cm4gbm9uemVybyBvbiBlcnJvciAqLwogc3RhdGljIGludAotaW50ZWxf YWxsb2NfbWNoYmFyX3Jlc291cmNlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpbnRlbF9hbGxv Y19tY2hiYXJfcmVzb3VyY2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewot CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlpbnQg cmVnID0gSU5URUxfR0VOKGRldl9wcml2KSA+PSA0ID8gTUNIQkFSX0k5NjUgOiBNQ0hCQVJfSTkx NTsKIAl1MzIgdGVtcF9sbywgdGVtcF9oaSA9IDA7CiAJdTY0IG1jaGJhcl9hZGRyOwpAQCAtNDIx LDkgKzQxNyw4IEBAIGludGVsX2FsbG9jX21jaGJhcl9yZXNvdXJjZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCiAvKiBTZXR1cCBNQ0hCQVIgaWYgcG9zc2libGUsIHJldHVybiB0cnVlIGlmIHdl IHNob3VsZCBkaXNhYmxlIGl0IGFnYWluICovCiBzdGF0aWMgdm9pZAotaW50ZWxfc2V0dXBfbWNo YmFyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpbnRlbF9zZXR1cF9tY2hiYXIoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlpbnQgbWNoYmFyX3JlZyA9IElOVEVMX0dFTihkZXZf cHJpdikgPj0gNCA/IE1DSEJBUl9JOTY1IDogTUNIQkFSX0k5MTU7CiAJdTMyIHRlbXA7CiAJYm9v bCBlbmFibGVkOwpAQCAtNDQ1LDcgKzQ0MCw3IEBAIGludGVsX3NldHVwX21jaGJhcihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCWlmIChlbmFibGVkKQogCQlyZXR1cm47CiAKLQlpZiAoaW50ZWxf YWxsb2NfbWNoYmFyX3Jlc291cmNlKGRldikpCisJaWYgKGludGVsX2FsbG9jX21jaGJhcl9yZXNv dXJjZShkZXZfcHJpdikpCiAJCXJldHVybjsKIAogCWRldl9wcml2LT5tY2hiYXJfbmVlZF9kaXNh YmxlID0gdHJ1ZTsKQEAgLTQ2MSw5ICs0NTYsOCBAQCBpbnRlbF9zZXR1cF9tY2hiYXIoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIH0KIAogc3RhdGljIHZvaWQKLWludGVsX3RlYXJkb3duX21jaGJh cihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoraW50ZWxfdGVhcmRvd25fbWNoYmFyKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJaW50IG1jaGJhcl9yZWcgPSBJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDQgPyBNQ0hCQVJfSTk2NSA6IE1DSEJBUl9JOTE1OwogCiAJaWYgKGRldl9wcml2 LT5tY2hiYXJfbmVlZF9kaXNhYmxlKSB7CkBAIC00OTMsOSArNDg3LDkgQEAgaW50ZWxfdGVhcmRv d25fbWNoYmFyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAvKiB0cnVlID0gZW5hYmxlIGRlY29k ZSwgZmFsc2UgPSBkaXNhYmxlIGRlY29kZXIgKi8KIHN0YXRpYyB1bnNpZ25lZCBpbnQgaTkxNV92 Z2Ffc2V0X2RlY29kZSh2b2lkICpjb29raWUsIGJvb2wgc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGNvb2tpZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBjb29raWU7CiAKLQlpbnRlbF9tb2Rlc2V0X3ZnYV9zZXRfc3RhdGUodG9faTkxNShkZXYpLCBz dGF0ZSk7CisJaW50ZWxfbW9kZXNldF92Z2Ffc2V0X3N0YXRlKGRldl9wcml2LCBzdGF0ZSk7CiAJ aWYgKHN0YXRlKQogCQlyZXR1cm4gVkdBX1JTUkNfTEVHQUNZX0lPIHwgVkdBX1JTUkNfTEVHQUNZ X01FTSB8CiAJCSAgICAgICBWR0FfUlNSQ19OT1JNQUxfSU8gfCBWR0FfUlNSQ19OT1JNQUxfTUVN OwpAQCAtNTc0LDcgKzU2OCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9sb2FkX21vZGVzZXRfaW5pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqIHRoZW4gd2UgZG8gbm90IHRha2UgcGFydCBpbiBW R0EgYXJiaXRyYXRpb24gYW5kIHRoZQogCSAqIHZnYV9jbGllbnRfcmVnaXN0ZXIoKSBmYWlscyB3 aXRoIC1FTk9ERVYuCiAJICovCi0JcmV0ID0gdmdhX2NsaWVudF9yZWdpc3RlcihwZGV2LCBkZXYs IE5VTEwsIGk5MTVfdmdhX3NldF9kZWNvZGUpOworCXJldCA9IHZnYV9jbGllbnRfcmVnaXN0ZXIo cGRldiwgZGV2X3ByaXYsIE5VTEwsIGk5MTVfdmdhX3NldF9kZWNvZGUpOwogCWlmIChyZXQgJiYg cmV0ICE9IC1FTk9ERVYpCiAJCWdvdG8gb3V0OwogCkBAIC04MzAsNyArODI0LDcgQEAgc3RhdGlj IGludCBpOTE1X2RyaXZlcl9pbml0X2Vhcmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKIAkJZ290byBlcnJfd29ya3F1ZXVlczsKIAogCS8qIFRoaXMgbXVzdCBiZSBjYWxsZWQg YmVmb3JlIGFueSBjYWxscyB0byBIQVNfUENIXyogKi8KLQlpbnRlbF9kZXRlY3RfcGNoKCZkZXZf cHJpdi0+ZHJtKTsKKwlpbnRlbF9kZXRlY3RfcGNoKGRldl9wcml2KTsKIAogCWludGVsX3BtX3Nl dHVwKCZkZXZfcHJpdi0+ZHJtKTsKIAlpbnRlbF9pbml0X2RwaW8oZGV2X3ByaXYpOwpAQCAtODcy LDEwICs4NjYsOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2RyaXZlcl9jbGVhbnVwX2Vhcmx5KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpOTE1X3dvcmtxdWV1ZXNfY2xlYW51cChk ZXZfcHJpdik7CiB9CiAKLXN0YXRpYyBpbnQgaTkxNV9tbWlvX3NldHVwKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCitzdGF0aWMgaW50IGk5MTVfbW1pb19zZXR1cChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkZXYpOwotCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2 OwogCWludCBtbWlvX2JhcjsKIAlpbnQgbW1pb19zaXplOwogCkBAIC04OTIsNyArODg0LDcgQEAg c3RhdGljIGludCBpOTE1X21taW9fc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJbW1p b19zaXplID0gNTEyICogMTAyNDsKIAllbHNlCiAJCW1taW9fc2l6ZSA9IDIgKiAxMDI0ICogMTAy NDsKLQlkZXZfcHJpdi0+cmVncyA9IHBjaV9pb21hcChwZGV2LCBtbWlvX2JhciwgbW1pb19zaXpl KTsKKwlkZXZfcHJpdi0+cmVncyA9IHBjaV9pb21hcChkZXZfcHJpdi0+ZHJtLnBkZXYsIG1taW9f YmFyLCBtbWlvX3NpemUpOwogCWlmIChkZXZfcHJpdi0+cmVncyA9PSBOVUxMKSB7CiAJCURSTV9F UlJPUigiZmFpbGVkIHRvIG1hcCByZWdpc3RlcnNcbiIpOwogCkBAIC05MDAsMTggKzg5MiwxNSBA QCBzdGF0aWMgaW50IGk5MTVfbW1pb19zZXR1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0K IAogCS8qIFRyeSB0byBtYWtlIHN1cmUgTUNIQkFSIGlzIGVuYWJsZWQgYmVmb3JlIHBva2luZyBh dCBpdCAqLwotCWludGVsX3NldHVwX21jaGJhcihkZXYpOworCWludGVsX3NldHVwX21jaGJhcihk ZXZfcHJpdik7CiAKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgaTkxNV9tbWlvX2NsZWFu dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyB2b2lkIGk5MTVfbW1pb19jbGVhbnVw KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IHBjaV9kZXYgKnBkZXYg PSBkZXZfcHJpdi0+ZHJtLnBkZXY7Ci0KLQlpbnRlbF90ZWFyZG93bl9tY2hiYXIoZGV2KTsKLQlw Y2lfaW91bm1hcChwZGV2LCBkZXZfcHJpdi0+cmVncyk7CisJaW50ZWxfdGVhcmRvd25fbWNoYmFy KGRldl9wcml2KTsKKwlwY2lfaW91bm1hcChkZXZfcHJpdi0+ZHJtLnBkZXYsIGRldl9wcml2LT5y ZWdzKTsKIH0KIAogLyoqCkBAIC05MjUsMTYgKzkxNCwxNSBAQCBzdGF0aWMgdm9pZCBpOTE1X21t aW9fY2xlYW51cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogICovCiBzdGF0aWMgaW50IGk5MTVf ZHJpdmVyX2luaXRfbW1pbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwogCWludCByZXQ7CiAKIAlp ZiAoaTkxNV9pbmplY3RfbG9hZF9mYWlsdXJlKCkpCiAJCXJldHVybiAtRU5PREVWOwogCi0JaWYg KGk5MTVfZ2V0X2JyaWRnZV9kZXYoZGV2KSkKKwlpZiAoaTkxNV9nZXRfYnJpZGdlX2RldihkZXZf cHJpdikpCiAJCXJldHVybiAtRUlPOwogCi0JcmV0ID0gaTkxNV9tbWlvX3NldHVwKGRldik7CisJ cmV0ID0gaTkxNV9tbWlvX3NldHVwKGRldl9wcml2KTsKIAlpZiAocmV0IDwgMCkKIAkJZ290byBw dXRfYnJpZGdlOwogCkBAIC05NTQsMTAgKzk0Miw4IEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJf aW5pdF9tbWlvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICAqLwogc3RhdGlj IHZvaWQgaTkxNV9kcml2ZXJfY2xlYW51cF9tbWlvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2LT5kcm07Ci0K IAlpbnRlbF91bmNvcmVfZmluaShkZXZfcHJpdik7Ci0JaTkxNV9tbWlvX2NsZWFudXAoZGV2KTsK KwlpOTE1X21taW9fY2xlYW51cChkZXZfcHJpdik7CiAJcGNpX2Rldl9wdXQoZGV2X3ByaXYtPmJy aWRnZV9kZXYpOwogfQogCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==