From: Tvrtko Ursulin Subject: [PATCH 09/10] drm/i915: Make i915_save/restore_state and intel_i2c_reset take dev_priv Date: Wed, 30 Nov 2016 11:35:39 +0000 Message-ID: <1480505740-1920-10-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-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3ADB56E118 for ; Wed, 30 Nov 2016 11:35:57 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id m203so28922005wma.3 for ; Wed, 30 Nov 2016 03:35:57 -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 dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICAgICB8ICA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9zdXNwZW5kLmMgfCAyMiArKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9pMmMuYyAgICB8ICA4ICsrKy0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDE3 IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmlu ZGV4IDNjYTAwZmFmZGEyMC4uZjYzMzFlODczNzM1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMK QEAgLTE0NDMsNyArMTQ0Myw3IEBAIHN0YXRpYyBpbnQgaTkxNV9kcm1fc3VzcGVuZChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQogCiAJaTkxNV9nZW1fc3VzcGVuZF9ndHRfbWFwcGluZ3MoZGV2X3By aXYpOwogCi0JaTkxNV9zYXZlX3N0YXRlKGRldik7CisJaTkxNV9zYXZlX3N0YXRlKGRldl9wcml2 KTsKIAogCW9wcmVnaW9uX3RhcmdldF9zdGF0ZSA9IHN1c3BlbmRfdG9faWRsZShkZXZfcHJpdikg PyBQQ0lfRDEgOiBQQ0lfRDNjb2xkOwogCWludGVsX29wcmVnaW9uX25vdGlmeV9hZGFwdGVyKGRl dl9wcml2LCBvcHJlZ2lvbl90YXJnZXRfc3RhdGUpOwpAQCAtMTU2Niw3ICsxNTY2LDcgQEAgc3Rh dGljIGludCBpOTE1X2RybV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWk5MTVf Z2VtX3Jlc3VtZShkZXZfcHJpdik7CiAKLQlpOTE1X3Jlc3RvcmVfc3RhdGUoZGV2KTsKKwlpOTE1 X3Jlc3RvcmVfc3RhdGUoZGV2X3ByaXYpOwogCWludGVsX3Bwc191bmxvY2tfcmVnc193YShkZXZf cHJpdik7CiAJaW50ZWxfb3ByZWdpb25fc2V0dXAoZGV2X3ByaXYpOwogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaAppbmRleCA0MWFkMzE4M2FiOGUuLmFhOTIwNDBkMTg0MSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCkBAIC0zNDc0LDggKzM0NzQsOCBAQCBleHRlcm4gdm9pZCBpOTE1X3BlcmZfcmVn aXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGV4dGVybiB2b2lkIGk5 MTVfcGVyZl91bnJlZ2lzdGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAK IC8qIGk5MTVfc3VzcGVuZC5jICovCi1leHRlcm4gaW50IGk5MTVfc2F2ZV9zdGF0ZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KTsKLWV4dGVybiBpbnQgaTkxNV9yZXN0b3JlX3N0YXRlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpOworZXh0ZXJuIGludCBpOTE1X3NhdmVfc3RhdGUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK2V4dGVybiBpbnQgaTkxNV9yZXN0b3JlX3N0YXRlKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAKIC8qIGk5MTVfc3lzZnMuYyAqLwog dm9pZCBpOTE1X3NldHVwX3N5c2ZzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7 CkBAIC0zNDk1LDcgKzM0OTUsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaW50ZWxfZ21idXNfaXNf Zm9yY2VkX2JpdChzdHJ1Y3QgaTJjX2FkYXB0ZXIgKmFkYXB0ZXIpCiB7CiAJcmV0dXJuIGNvbnRh aW5lcl9vZihhZGFwdGVyLCBzdHJ1Y3QgaW50ZWxfZ21idXMsIGFkYXB0ZXIpLT5mb3JjZV9iaXQ7 CiB9Ci1leHRlcm4gdm9pZCBpbnRlbF9pMmNfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7 CitleHRlcm4gdm9pZCBpbnRlbF9pMmNfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KTsKIAogLyogaW50ZWxfYmlvcy5jICovCiBpbnQgaW50ZWxfYmlvc19pbml0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3N1c3BlbmQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVu ZC5jCmluZGV4IGIwZTFlN2NhNzVkYS4uYzIxYmUwZDg4ZjhhIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3N1c3BlbmQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3N1c3BlbmQuYwpAQCAtNTYsMTggKzU2LDE2IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmVzdG9y ZV9kaXNwbGF5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpOTE1X3JlZGlz YWJsZV92Z2EoZGV2X3ByaXYpOwogfQogCi1pbnQgaTkxNV9zYXZlX3N0YXRlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCitpbnQgaTkxNV9zYXZlX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGRldik7Ci0Jc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAJ aW50IGk7CiAKLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJbXV0ZXhfbG9jaygm ZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCiAJaTkxNV9zYXZlX2Rpc3BsYXkoZGV2X3By aXYpOwogCiAJaWYgKElTX0dFTjQoZGV2X3ByaXYpKQotCQlwY2lfcmVhZF9jb25maWdfd29yZChw ZGV2LCBHQ0RHTUJVUywKKwkJcGNpX3JlYWRfY29uZmlnX3dvcmQoZGV2X3ByaXYtPmRybS5wZGV2 LCBHQ0RHTUJVUywKIAkJCQkgICAgICZkZXZfcHJpdi0+cmVnZmlsZS5zYXZlR0NER01CVVMpOwog CiAJLyogQ2FjaGUgbW9kZSBzdGF0ZSAqLwpAQCAtOTcsMjMgKzk1LDIxIEBAIGludCBpOTE1X3Nh dmVfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCWRldl9wcml2LT5yZWdmaWxlLnNh dmVTV0YzW2ldID0gSTkxNV9SRUFEKFNXRjMoaSkpOwogCX0KIAotCW11dGV4X3VubG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOworCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0 ZXgpOwogCiAJcmV0dXJuIDA7CiB9CiAKLWludCBpOTE1X3Jlc3RvcmVfc3RhdGUoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKK2ludCBpOTE1X3Jlc3RvcmVfc3RhdGUoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0ucGRl djsKIAlpbnQgaTsKIAotCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwltdXRleF9s b2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CiAKIAlpOTE1X2dlbV9yZXN0b3JlX2Zl bmNlcyhkZXZfcHJpdik7CiAKIAlpZiAoSVNfR0VONChkZXZfcHJpdikpCi0JCXBjaV93cml0ZV9j b25maWdfd29yZChwZGV2LCBHQ0RHTUJVUywKKwkJcGNpX3dyaXRlX2NvbmZpZ193b3JkKGRldl9w cml2LT5kcm0ucGRldiwgR0NER01CVVMsCiAJCQkJICAgICAgZGV2X3ByaXYtPnJlZ2ZpbGUuc2F2 ZUdDREdNQlVTKTsKIAlpOTE1X3Jlc3RvcmVfZGlzcGxheShkZXZfcHJpdik7CiAKQEAgLTE0NSw5 ICsxNDEsOSBAQCBpbnQgaTkxNV9yZXN0b3JlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCQlJOTE1X1dSSVRFKFNXRjMoaSksIGRldl9wcml2LT5yZWdmaWxlLnNhdmVTV0YzW2ldKTsK IAl9CiAKLQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwltdXRleF91bmxvY2so JmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIAotCWludGVsX2kyY19yZXNldChkZXYpOwor CWludGVsX2kyY19yZXNldChkZXZfcHJpdik7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfaTJjLmMKaW5kZXggODVmYWJhNDE1NjMzLi42MmZlNTI5NTE2YjEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2kyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2kyYy5jCkBAIC0xMTEsMTAgKzExMSw4IEBAIHRvX2ludGVsX2dtYnVzKHN0cnVj dCBpMmNfYWRhcHRlciAqaTJjKQogfQogCiB2b2lkCi1pbnRlbF9pMmNfcmVzZXQoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKK2ludGVsX2kyY19yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwotCiAJSTkxNV9XUklURShHTUJVUzAsIDApOwogCUk5MTVfV1JJVEUoR01CVVM0LCAw KTsKIH0KQEAgLTIxMSw3ICsyMDksNyBAQCBpbnRlbF9ncGlvX3ByZV94ZmVyKHN0cnVjdCBpMmNf YWRhcHRlciAqYWRhcHRlcikKIAkJCQkJICAgICAgIGFkYXB0ZXIpOwogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGJ1cy0+ZGV2X3ByaXY7CiAKLQlpbnRlbF9pMmNfcmVzZXQo JmRldl9wcml2LT5kcm0pOworCWludGVsX2kyY19yZXNldChkZXZfcHJpdik7CiAJaW50ZWxfaTJj X3F1aXJrX3NldChkZXZfcHJpdiwgdHJ1ZSk7CiAJc2V0X2RhdGEoYnVzLCAxKTsKIAlzZXRfY2xv Y2soYnVzLCAxKTsKQEAgLTY3Nyw3ICs2NzUsNyBAQCBpbnQgaW50ZWxfc2V0dXBfZ21idXMoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkJZ290byBlcnI7CiAJfQogCi0JaW50 ZWxfaTJjX3Jlc2V0KCZkZXZfcHJpdi0+ZHJtKTsKKwlpbnRlbF9pMmNfcmVzZXQoZGV2X3ByaXYp OwogCiAJcmV0dXJuIDA7CiAKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK