From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 09/15] drm/i915: dev_priv cleanup in i915_suspend.c Date: Wed, 16 Nov 2016 08:55:39 +0000 Message-ID: <1479286545-15020-10-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 0CBD06E661 for ; Wed, 16 Nov 2016 08:56:01 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id m203so8725740wma.3 for ; Wed, 16 Nov 2016 00:56:00 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkFuZCBhIGxp dHRsZSBiaXQgb2YgZnVuY3Rpb24gcHJvdG90eXBlIGNoYW5nZXMuCgpTaWduZWQtb2ZmLWJ5OiBU dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfc3VzcGVuZC5jICAgICB8IDIyICsrKysrKysrKy0tLS0tLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICB8IDE4ICsrKysrKystLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIHwgIDIgKy0KIDQgZmls ZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKaW5kZXggNzc2YjY0ZTBiZDdlLi4wYmMzM2U1YmUwNWYgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaApAQCAtMzQ2OCw4ICszNDY4LDggQEAgZXh0ZXJuIGludCBpbnRlbF9jb25u ZWN0b3JfcmVnaXN0ZXIoc3RydWN0IGRybV9jb25uZWN0b3IgKik7CiBleHRlcm4gdm9pZCBpbnRl bF9jb25uZWN0b3JfdW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqKTsKIGV4dGVybiBp bnQgaW50ZWxfbW9kZXNldF92Z2Ffc2V0X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJv b2wgc3RhdGUpOwogZXh0ZXJuIHZvaWQgaW50ZWxfZGlzcGxheV9yZXN1bWUoc3RydWN0IGRybV9k ZXZpY2UgKmRldik7Ci1leHRlcm4gdm9pZCBpOTE1X3JlZGlzYWJsZV92Z2Eoc3RydWN0IGRybV9k ZXZpY2UgKmRldik7Ci1leHRlcm4gdm9pZCBpOTE1X3JlZGlzYWJsZV92Z2FfcG93ZXJfb24oc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7CitleHRlcm4gdm9pZCBpOTE1X3JlZGlzYWJsZV92Z2Eoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK2V4dGVybiB2b2lkIGk5MTVfcmVkaXNh YmxlX3ZnYV9wb3dlcl9vbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogZXh0 ZXJuIGJvb2wgaXJvbmxha2Vfc2V0X2RycHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LCB1OCB2YWwpOwogZXh0ZXJuIHZvaWQgaW50ZWxfaW5pdF9wY2hfcmVmY2xrKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpOwogZXh0ZXJuIHZvaWQgaW50ZWxfc2V0X3JwcyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHU4IHZhbCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3N1c3BlbmQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVu ZC5jCmluZGV4IDJjNzQ3YWM3YzU2NS4uYjBlMWU3Y2E3NWRhIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3N1c3BlbmQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3N1c3BlbmQuYwpAQCAtMjksMTIgKzI5LDEwIEBACiAjaW5jbHVkZSAiaW50ZWxfZHJ2Lmgi CiAjaW5jbHVkZSAiaTkxNV9yZWcuaCIKIAotc3RhdGljIHZvaWQgaTkxNV9zYXZlX2Rpc3BsYXko c3RydWN0IGRybV9kZXZpY2UgKmRldikKK3N0YXRpYyB2b2lkIGk5MTVfc2F2ZV9kaXNwbGF5KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0KIAkvKiBEaXNwbGF5IGFyYml0cmF0aW9u IGNvbnRyb2wgKi8KLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPD0gNCkKKwlpZiAoSU5URUxf R0VOKGRldl9wcml2KSA8PSA0KQogCQlkZXZfcHJpdi0+cmVnZmlsZS5zYXZlRFNQQVJCID0gSTkx NV9SRUFEKERTUEFSQik7CiAKIAkvKiBzYXZlIEZCQyBpbnRlcnZhbCAqLwpAQCAtNDIsMTIgKzQw LDEwIEBAIHN0YXRpYyB2b2lkIGk5MTVfc2F2ZV9kaXNwbGF5KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJCWRldl9wcml2LT5yZWdmaWxlLnNhdmVGQkNfQ09OVFJPTCA9IEk5MTVfUkVBRChGQkNf Q09OVFJPTCk7CiB9CiAKLXN0YXRpYyB2b2lkIGk5MTVfcmVzdG9yZV9kaXNwbGF5KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBpOTE1X3Jlc3RvcmVfZGlzcGxheShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCiAJLyogRGlzcGxheSBhcmJpdHJhdGlvbiAqLwot CWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA0KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYp IDw9IDQpCiAJCUk5MTVfV1JJVEUoRFNQQVJCLCBkZXZfcHJpdi0+cmVnZmlsZS5zYXZlRFNQQVJC KTsKIAogCS8qIG9ubHkgcmVzdG9yZSBGQkMgaW5mbyBvbiB0aGUgcGxhdGZvcm0gdGhhdCBzdXBw b3J0cyBGQkMqLwpAQCAtNTcsNyArNTMsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3Jlc3RvcmVfZGlz cGxheShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChIQVNfRkJDKGRldl9wcml2KSAmJiBJ TlRFTF9HRU4oZGV2X3ByaXYpIDw9IDQgJiYgIUlTX0c0WChkZXZfcHJpdikpCiAJCUk5MTVfV1JJ VEUoRkJDX0NPTlRST0wsIGRldl9wcml2LT5yZWdmaWxlLnNhdmVGQkNfQ09OVFJPTCk7CiAKLQlp OTE1X3JlZGlzYWJsZV92Z2EoZGV2KTsKKwlpOTE1X3JlZGlzYWJsZV92Z2EoZGV2X3ByaXYpOwog fQogCiBpbnQgaTkxNV9zYXZlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC02OCwx NCArNjQsMTQgQEAgaW50IGk5MTVfc2F2ZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCi0JaTkxNV9zYXZlX2Rpc3BsYXko ZGV2KTsKKwlpOTE1X3NhdmVfZGlzcGxheShkZXZfcHJpdik7CiAKIAlpZiAoSVNfR0VONChkZXZf cHJpdikpCiAJCXBjaV9yZWFkX2NvbmZpZ193b3JkKHBkZXYsIEdDREdNQlVTLAogCQkJCSAgICAg JmRldl9wcml2LT5yZWdmaWxlLnNhdmVHQ0RHTUJVUyk7CiAKIAkvKiBDYWNoZSBtb2RlIHN0YXRl ICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgNykKKwlpZiAoSU5URUxfR0VOKGRldl9w cml2KSA8IDcpCiAJCWRldl9wcml2LT5yZWdmaWxlLnNhdmVDQUNIRV9NT0RFXzAgPSBJOTE1X1JF QUQoQ0FDSEVfTU9ERV8wKTsKIAogCS8qIE1lbW9yeSBBcmJpdHJhdGlvbiBzdGF0ZSAqLwpAQCAt MTE5LDEwICsxMTUsMTAgQEAgaW50IGk5MTVfcmVzdG9yZV9zdGF0ZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCWlmIChJU19HRU40KGRldl9wcml2KSkKIAkJcGNpX3dyaXRlX2NvbmZpZ193b3Jk KHBkZXYsIEdDREdNQlVTLAogCQkJCSAgICAgIGRldl9wcml2LT5yZWdmaWxlLnNhdmVHQ0RHTUJV Uyk7Ci0JaTkxNV9yZXN0b3JlX2Rpc3BsYXkoZGV2KTsKKwlpOTE1X3Jlc3RvcmVfZGlzcGxheShk ZXZfcHJpdik7CiAKIAkvKiBDYWNoZSBtb2RlIHN0YXRlICovCi0JaWYgKElOVEVMX0lORk8oZGV2 KS0+Z2VuIDwgNykKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDcpCiAJCUk5MTVfV1JJVEUo Q0FDSEVfTU9ERV8wLCBkZXZfcHJpdi0+cmVnZmlsZS5zYXZlQ0FDSEVfTU9ERV8wIHwKIAkJCSAg IDB4ZmZmZjAwMDApOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOTI2 OTRlODMxNGUxLi5mNzIzMDc4Y2M1ZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTM1MDMsNyArMzUwMyw3IEBAIF9faW50ZWxfZGlzcGxheV9yZXN1bWUoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAlpbnQgaSwgcmV0OwogCiAJaW50ZWxfbW9kZXNldF9zZXR1cF9od19z dGF0ZShkZXYpOwotCWk5MTVfcmVkaXNhYmxlX3ZnYShkZXYpOworCWk5MTVfcmVkaXNhYmxlX3Zn YSh0b19pOTE1KGRldikpOwogCiAJaWYgKCFzdGF0ZSkKIAkJcmV0dXJuIDA7CkBAIC0xNjMxOSw5 ICsxNjMxOSw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2luaXRfcXVpcmtzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiB9CiAKIC8qIERpc2FibGUgdGhlIFZHQSBwbGFuZSB0aGF0IHdlIG5ldmVyIHVz ZSAqLwotc3RhdGljIHZvaWQgaTkxNV9kaXNhYmxlX3ZnYShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQorc3RhdGljIHZvaWQgaTkxNV9kaXNhYmxlX3ZnYShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwogCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2OwogCXU4 IHNyMTsKIAlpOTE1X3JlZ190IHZnYV9yZWcgPSBpOTE1X3ZnYWNudHJsX3JlZyhkZXZfcHJpdik7 CkBAIC0xNjUyNCw3ICsxNjUyMyw3IEBAIGludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkJaW50ZWxfdXBkYXRlX21heF9jZGNsayhkZXZfcHJpdik7CiAKIAkv KiBKdXN0IGRpc2FibGUgaXQgb25jZSBhdCBzdGFydHVwICovCi0JaTkxNV9kaXNhYmxlX3ZnYShk ZXYpOworCWk5MTVfZGlzYWJsZV92Z2EoZGV2X3ByaXYpOwogCWludGVsX3NldHVwX291dHB1dHMo ZGV2KTsKIAogCWRybV9tb2Rlc2V0X2xvY2tfYWxsKGRldik7CkBAIC0xNjc3MCwyMSArMTY3Njks MTggQEAgc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVfZW5jb2RlcihzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqZW5jb2RlcikKIAkgKiB0aGUgY3J0YyBmaXh1cC4gKi8KIH0KIAotdm9pZCBpOTE1X3Jl ZGlzYWJsZV92Z2FfcG93ZXJfb24oc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3ZvaWQgaTkxNV9y ZWRpc2FibGVfdmdhX3Bvd2VyX29uKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJ aTkxNV9yZWdfdCB2Z2FfcmVnID0gaTkxNV92Z2FjbnRybF9yZWcoZGV2X3ByaXYpOwogCiAJaWYg KCEoSTkxNV9SRUFEKHZnYV9yZWcpICYgVkdBX0RJU1BfRElTQUJMRSkpIHsKIAkJRFJNX0RFQlVH X0tNUygiU29tZXRoaW5nIGVuYWJsZWQgVkdBIHBsYW5lLCBkaXNhYmxpbmcgaXRcbiIpOwotCQlp OTE1X2Rpc2FibGVfdmdhKGRldik7CisJCWk5MTVfZGlzYWJsZV92Z2EoZGV2X3ByaXYpOwogCX0K IH0KIAotdm9pZCBpOTE1X3JlZGlzYWJsZV92Z2Eoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3Zv aWQgaTkxNV9yZWRpc2FibGVfdmdhKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0K IAkvKiBUaGlzIGZ1bmN0aW9uIGNhbiBiZSBjYWxsZWQgYm90aCBmcm9tIGludGVsX21vZGVzZXRf c2V0dXBfaHdfc3RhdGUgb3IKIAkgKiBhdCBhIHZlcnkgZWFybHkgcG9pbnQgaW4gb3VyIHJlc3Vt ZSBzZXF1ZW5jZSwgd2hlcmUgdGhlIHBvd2VyIHdlbGwKIAkgKiBzdHJ1Y3R1cmVzIGFyZSBub3Qg eWV0IHJlc3RvcmVkLiBTaW5jZSB0aGlzIGZ1bmN0aW9uIGlzIGF0IGEgdmVyeQpAQCAtMTY3OTUs NyArMTY3OTEsNyBAQCB2b2lkIGk5MTVfcmVkaXNhYmxlX3ZnYShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCWlmICghaW50ZWxfZGlzcGxheV9wb3dlcl9nZXRfaWZfZW5hYmxlZChkZXZfcHJpdiwg UE9XRVJfRE9NQUlOX1ZHQSkpCiAJCXJldHVybjsKIAotCWk5MTVfcmVkaXNhYmxlX3ZnYV9wb3dl cl9vbihkZXYpOworCWk5MTVfcmVkaXNhYmxlX3ZnYV9wb3dlcl9vbihkZXZfcHJpdik7CiAKIAlp bnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZfcHJpdiwgUE9XRVJfRE9NQUlOX1ZHQSk7CiB9CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKaW5kZXggMDU5OTQwODNlMTYxLi4z Nzk3NTVkNjExMDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRp bWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAg LTEwOTcsNyArMTA5Nyw3IEBAIHN0YXRpYyB2b2lkIHZsdl9kaXNwbGF5X3Bvd2VyX3dlbGxfaW5p dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQlpbnRlbF9jcnRfcmVzZXQo JmVuY29kZXItPmJhc2UpOwogCX0KIAotCWk5MTVfcmVkaXNhYmxlX3ZnYV9wb3dlcl9vbigmZGV2 X3ByaXYtPmRybSk7CisJaTkxNV9yZWRpc2FibGVfdmdhX3Bvd2VyX29uKGRldl9wcml2KTsKIAog CWludGVsX3Bwc191bmxvY2tfcmVnc193YShkZXZfcHJpdik7CiB9Ci0tIAoyLjcuNAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==