From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 11/15] drm/i915: dev_priv cleanup in intel_dp.c Date: Wed, 16 Nov 2016 08:55:41 +0000 Message-ID: <1479286545-15020-12-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1479286545-15020-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-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 414756E66D for ; Wed, 16 Nov 2016 08:56:03 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id u144so8750055wmu.0 for ; Wed, 16 Nov 2016 00:56:03 -0800 (PST) In-Reply-To: <1479286545-15020-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkFuZCBhcyB1 c3VhbCBhIGxpdHRsZSBiaXQgb2YgY2FzY2FkZWQgZnVuY3Rpb24gcHJvdG90eXBlIGNoYW5nZXMu CgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICA2ICsrKy0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgIHwgMjYgKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAyICst CiAzIGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBmNzIzMDc4Y2M1ZDkuLmRhMWUyOWVj OWViNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTU1NTEsNyArMTU1 NTEsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zZXR1cF9vdXRwdXRzKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAKIAl9IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CiAJCWludCBm b3VuZDsKLQkJZHBkX2lzX2VkcCA9IGludGVsX2RwX2lzX2VkcChkZXYsIFBPUlRfRCk7CisJCWRw ZF9pc19lZHAgPSBpbnRlbF9kcF9pc19lZHAoZGV2X3ByaXYsIFBPUlRfRCk7CiAKIAkJaWYgKGhh c19lZHBfYShkZXZfcHJpdikpCiAJCQlpbnRlbF9kcF9pbml0KGRldiwgRFBfQSwgUE9SVF9BKTsK QEAgLTE1NTk0LDE0ICsxNTU5NCwxNCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zZXR1cF9vdXRwdXRz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCSAqIHRydXN0IHRoZSBwb3J0IHR5cGUgdGhlIFZC VCBkZWNsYXJlcyBhcyB3ZSd2ZSBzZWVuIGF0IGxlYXN0CiAJCSAqIEhETUkgcG9ydHMgdGhhdCB0 aGUgVkJUIGNsYWltIGFyZSBEUCBvciBlRFAuCiAJCSAqLwotCQloYXNfZWRwID0gaW50ZWxfZHBf aXNfZWRwKGRldiwgUE9SVF9CKTsKKwkJaGFzX2VkcCA9IGludGVsX2RwX2lzX2VkcChkZXZfcHJp diwgUE9SVF9CKTsKIAkJaGFzX3BvcnQgPSBpbnRlbF9iaW9zX2lzX3BvcnRfcHJlc2VudChkZXZf cHJpdiwgUE9SVF9CKTsKIAkJaWYgKEk5MTVfUkVBRChWTFZfRFBfQikgJiBEUF9ERVRFQ1RFRCB8 fCBoYXNfcG9ydCkKIAkJCWhhc19lZHAgJj0gaW50ZWxfZHBfaW5pdChkZXYsIFZMVl9EUF9CLCBQ T1JUX0IpOwogCQlpZiAoKEk5MTVfUkVBRChWTFZfSERNSUIpICYgU0RWT19ERVRFQ1RFRCB8fCBo YXNfcG9ydCkgJiYgIWhhc19lZHApCiAJCQlpbnRlbF9oZG1pX2luaXQoZGV2LCBWTFZfSERNSUIs IFBPUlRfQik7CiAKLQkJaGFzX2VkcCA9IGludGVsX2RwX2lzX2VkcChkZXYsIFBPUlRfQyk7CisJ CWhhc19lZHAgPSBpbnRlbF9kcF9pc19lZHAoZGV2X3ByaXYsIFBPUlRfQyk7CiAJCWhhc19wb3J0 ID0gaW50ZWxfYmlvc19pc19wb3J0X3ByZXNlbnQoZGV2X3ByaXYsIFBPUlRfQyk7CiAJCWlmIChJ OTE1X1JFQUQoVkxWX0RQX0MpICYgRFBfREVURUNURUQgfHwgaGFzX3BvcnQpCiAJCQloYXNfZWRw ICY9IGludGVsX2RwX2luaXQoZGV2LCBWTFZfRFBfQywgUE9SVF9DKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jCmluZGV4IGExYjAxODFmNDJjNC4uOTAyODNlZGNhZmJhIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMKQEAgLTE1NDIsOCArMTU0Miw3IEBAIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUg KnBpcGVfY29uZmlnLAogCQkJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUp CiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmJhc2UuZGV2OwotCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKIAlz dHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9ICZwaXBlX2NvbmZpZy0+YmFz ZS5hZGp1c3RlZF9tb2RlOwogCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9faW50 ZWxfZHAoJmVuY29kZXItPmJhc2UpOwogCWVudW0gcG9ydCBwb3J0ID0gZHBfdG9fZGlnX3BvcnQo aW50ZWxfZHApLT5wb3J0OwpAQCAtMTU3OCw3ICsxNTc3LDcgQEAgaW50ZWxfZHBfY29tcHV0ZV9j b25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCWludGVsX2ZpeGVkX3BhbmVs X21vZGUoaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXhlZF9tb2RlLAogCQkJCSAgICAgICBhZGp1 c3RlZF9tb2RlKTsKIAotCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgeworCQlpZiAo SU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7CiAJCQlpbnQgcmV0OwogCQkJcmV0ID0gc2tsX3Vw ZGF0ZV9zY2FsZXJfY3J0YyhwaXBlX2NvbmZpZyk7CiAJCQlpZiAocmV0KQpAQCAtMjk3NywxMyAr Mjk3NiwxMiBAQCBpbnRlbF9kcF9nZXRfbGlua19zdGF0dXMoc3RydWN0IGludGVsX2RwICppbnRl bF9kcCwgdWludDhfdCBsaW5rX3N0YXR1c1tEUF9MSU5LXwogdWludDhfdAogaW50ZWxfZHBfdm9s dGFnZV9tYXgoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsKLQlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gaW50ZWxfZHBfdG9fZGV2KGludGVsX2RwKTsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9kcF90b19kZXYoaW50ZWxfZHApKTsKIAllbnVtIHBv cnQgcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKS0+cG9ydDsKIAogCWlmIChJU19CUk9Y VE9OKGRldl9wcml2KSkKIAkJcmV0dXJuIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTEVWRUxfMzsK LQllbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSB7CisJZWxzZSBpZiAoSU5URUxf R0VOKGRldl9wcml2KSA+PSA5KSB7CiAJCWlmIChkZXZfcHJpdi0+dmJ0LmVkcC5sb3dfdnN3aW5n ICYmIHBvcnQgPT0gUE9SVF9BKQogCQkJcmV0dXJuIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTEVW RUxfMzsKIAkJcmV0dXJuIERQX1RSQUlOX1ZPTFRBR0VfU1dJTkdfTEVWRUxfMjsKQEAgLTQ4NzEs MTUgKzQ4NjksMTMgQEAgaW50ZWxfZHBfaHBkX3B1bHNlKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3Bv cnQgKmludGVsX2RpZ19wb3J0LCBib29sIGxvbmdfaHBkKQogfQogCiAvKiBjaGVjayB0aGUgVkJU IHRvIHNlZSB3aGV0aGVyIHRoZSBlRFAgaXMgb24gYW5vdGhlciBwb3J0ICovCi1ib29sIGludGVs X2RwX2lzX2VkcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBvcnQgcG9ydCkKK2Jvb2wg aW50ZWxfZHBfaXNfZWRwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBw b3J0IHBvcnQpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwotCiAJLyoKIAkgKiBlRFAgbm90IHN1cHBvcnRlZCBvbiBnNHguIHNvIGJhaWwgb3V0 IGVhcmx5IGp1c3QKIAkgKiBmb3IgYSBiaXQgZXh0cmEgc2FmZXR5IGluIGNhc2UgdGhlIFZCVCBp cyBib25rZXJzLgogCSAqLwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDUpCisJaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPCA1KQogCQlyZXR1cm4gZmFsc2U7CiAKIAlpZiAocG9ydCA9PSBQ T1JUX0EpCkBAIC01NDgxLDcgKzU0NzcsNyBAQCBpbnRlbF9kcF9kcnJzX2luaXQoc3RydWN0IGlu dGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yLAogCUlOSVRfREVMQVlFRF9XT1JLKCZkZXZf cHJpdi0+ZHJycy53b3JrLCBpbnRlbF9lZHBfZHJyc19kb3duY2xvY2tfd29yayk7CiAJbXV0ZXhf aW5pdCgmZGV2X3ByaXYtPmRycnMubXV0ZXgpOwogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu IDw9IDYpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8PSA2KSB7CiAJCURSTV9ERUJVR19L TVMoIkRSUlMgc3VwcG9ydGVkIGZvciBHZW43IGFuZCBhYm92ZVxuIik7CiAJCXJldHVybiBOVUxM OwogCX0KQEAgLTU2NTUsNyArNTY1MSw3IEBAIGludGVsX2RwX2luaXRfY29ubmVjdG9yKHN0cnVj dCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAogCWludGVsX2RwLT5wcHNfcGlw ZSA9IElOVkFMSURfUElQRTsKIAogCS8qIGludGVsX2RwIHZmdW5jcyAqLwotCWlmIChJTlRFTF9J TkZPKGRldiktPmdlbiA+PSA5KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCiAJCWlu dGVsX2RwLT5nZXRfYXV4X2Nsb2NrX2RpdmlkZXIgPSBza2xfZ2V0X2F1eF9jbG9ja19kaXZpZGVy OwogCWVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJp dikpCiAJCWludGVsX2RwLT5nZXRfYXV4X2Nsb2NrX2RpdmlkZXIgPSBoc3dfZ2V0X2F1eF9jbG9j a19kaXZpZGVyOwpAQCAtNTY2NCw3ICs1NjYwLDcgQEAgaW50ZWxfZHBfaW5pdF9jb25uZWN0b3Io c3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsCiAJZWxzZQogCQlpbnRl bF9kcC0+Z2V0X2F1eF9jbG9ja19kaXZpZGVyID0gZzR4X2dldF9hdXhfY2xvY2tfZGl2aWRlcjsK IAotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KQorCWlmIChJTlRFTF9HRU4oZGV2X3By aXYpID49IDkpCiAJCWludGVsX2RwLT5nZXRfYXV4X3NlbmRfY3RsID0gc2tsX2dldF9hdXhfc2Vu ZF9jdGw7CiAJZWxzZQogCQlpbnRlbF9kcC0+Z2V0X2F1eF9zZW5kX2N0bCA9IGc0eF9nZXRfYXV4 X3NlbmRfY3RsOwpAQCAtNTY3Niw3ICs1NjcyLDcgQEAgaW50ZWxfZHBfaW5pdF9jb25uZWN0b3Io c3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsCiAJaW50ZWxfZHAtPkRQ ID0gSTkxNV9SRUFEKGludGVsX2RwLT5vdXRwdXRfcmVnKTsKIAlpbnRlbF9kcC0+YXR0YWNoZWRf Y29ubmVjdG9yID0gaW50ZWxfY29ubmVjdG9yOwogCi0JaWYgKGludGVsX2RwX2lzX2VkcChkZXYs IHBvcnQpKQorCWlmIChpbnRlbF9kcF9pc19lZHAoZGV2X3ByaXYsIHBvcnQpKQogCQl0eXBlID0g RFJNX01PREVfQ09OTkVDVE9SX2VEUDsKIAllbHNlCiAJCXR5cGUgPSBEUk1fTU9ERV9DT05ORUNU T1JfRGlzcGxheVBvcnQ7CkBAIC01ODE0LDcgKzU4MTAsNyBAQCBib29sIGludGVsX2RwX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAl9IGVsc2UgewogCQlpbnRlbF9lbmNvZGVyLT5wcmVf ZW5hYmxlID0gZzR4X3ByZV9lbmFibGVfZHA7CiAJCWludGVsX2VuY29kZXItPmVuYWJsZSA9IGc0 eF9lbmFibGVfZHA7Ci0JCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1KQorCQlpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA+PSA1KQogCQkJaW50ZWxfZW5jb2Rlci0+cG9zdF9kaXNhYmxlID0g aWxrX3Bvc3RfZGlzYWJsZV9kcDsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXgg MGJlNDA3ZTUwZDYxLi43N2ZiNzMxZGYxNzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBA IC0xMzkwLDcgKzEzOTAsNyBAQCBpbnQgaW50ZWxfZHBfc2lua19jcmMoc3RydWN0IGludGVsX2Rw ICppbnRlbF9kcCwgdTggKmNyYyk7CiBib29sIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqcGlwZV9jb25maWcsCiAJCQkgICAgIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25u X3N0YXRlKTsKLWJvb2wgaW50ZWxfZHBfaXNfZWRwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVu dW0gcG9ydCBwb3J0KTsKK2Jvb2wgaW50ZWxfZHBfaXNfZWRwKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwgZW51bSBwb3J0IHBvcnQpOwogZW51bSBpcnFyZXR1cm4gaW50ZWxfZHBf aHBkX3B1bHNlKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAogCQkJ CSAgYm9vbCBsb25nX2hwZCk7CiB2b2lkIGludGVsX2VkcF9iYWNrbGlnaHRfb24oc3RydWN0IGlu dGVsX2RwICppbnRlbF9kcCk7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==