From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 09/10] drm/i915: Make i915_save/restore_state and intel_i2c_reset take dev_priv Date: Thu, 1 Dec 2016 14:16:44 +0000 Message-ID: <1480601805-14391-10-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A3656E805 for ; Thu, 1 Dec 2016 14:17:02 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id a20so34510925wme.2 for ; Thu, 01 Dec 2016 06:17:02 -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 IGlzIG1vcmUgYXBwcm9wcmlhdGUgc2luY2UgaXQgaXMgdXNlZCBtdWNoIG1vcmUgaW4gdGhlc2Uu Cgp2MjogQ29tbWl0IG1lc3NhZ2UgYW5kIGtlZXAgdGhlIGxvY2FsIHBkZXYgdmFyaWFibGUuIChK b29uYXMgTGFodGluZW4pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVy c3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+ClJldmlld2VkLWJ5OiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5l bkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAg ICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICB8ICA2ICsr Ky0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMgfCAxNiArKysrKysrLS0t LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYyAgICB8ICA4ICsrKy0tLS0t CiA0IGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IDgwOTMxNWNhZDMxNi4uYmQ4OTk0ZDAyODEzIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTE0MzksNyArMTQzOSw3IEBAIHN0YXRpYyBpbnQgaTkx NV9kcm1fc3VzcGVuZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaTkxNV9nZW1fc3VzcGVu ZF9ndHRfbWFwcGluZ3MoZGV2X3ByaXYpOwogCi0JaTkxNV9zYXZlX3N0YXRlKGRldik7CisJaTkx NV9zYXZlX3N0YXRlKGRldl9wcml2KTsKIAogCW9wcmVnaW9uX3RhcmdldF9zdGF0ZSA9IHN1c3Bl bmRfdG9faWRsZShkZXZfcHJpdikgPyBQQ0lfRDEgOiBQQ0lfRDNjb2xkOwogCWludGVsX29wcmVn aW9uX25vdGlmeV9hZGFwdGVyKGRldl9wcml2LCBvcHJlZ2lvbl90YXJnZXRfc3RhdGUpOwpAQCAt MTU2Miw3ICsxNTYyLDcgQEAgc3RhdGljIGludCBpOTE1X2RybV9yZXN1bWUoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAogCWk5MTVfZ2VtX3Jlc3VtZShkZXZfcHJpdik7CiAKLQlpOTE1X3Jlc3Rv cmVfc3RhdGUoZGV2KTsKKwlpOTE1X3Jlc3RvcmVfc3RhdGUoZGV2X3ByaXYpOwogCWludGVsX3Bw c191bmxvY2tfcmVnc193YShkZXZfcHJpdik7CiAJaW50ZWxfb3ByZWdpb25fc2V0dXAoZGV2X3By aXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyMDA2ZWEwMzMzNTQuLjkwZWY1YTA5 YjQwZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zNDcwLDggKzM0NzAsOCBAQCBleHRl cm4gdm9pZCBpOTE1X3BlcmZfcmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KTsKIGV4dGVybiB2b2lkIGk5MTVfcGVyZl91bnJlZ2lzdGVyKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7CiAKIC8qIGk5MTVfc3VzcGVuZC5jICovCi1leHRlcm4gaW50IGk5 MTVfc2F2ZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLWV4dGVybiBpbnQgaTkxNV9y ZXN0b3JlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOworZXh0ZXJuIGludCBpOTE1X3Nh dmVfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK2V4dGVybiBpbnQg aTkxNV9yZXN0b3JlX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiAK IC8qIGk5MTVfc3lzZnMuYyAqLwogdm9pZCBpOTE1X3NldHVwX3N5c2ZzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7CkBAIC0zNDkxLDcgKzM0OTEsNyBAQCBzdGF0aWMgaW5saW5l IGJvb2wgaW50ZWxfZ21idXNfaXNfZm9yY2VkX2JpdChzdHJ1Y3QgaTJjX2FkYXB0ZXIgKmFkYXB0 ZXIpCiB7CiAJcmV0dXJuIGNvbnRhaW5lcl9vZihhZGFwdGVyLCBzdHJ1Y3QgaW50ZWxfZ21idXMs IGFkYXB0ZXIpLT5mb3JjZV9iaXQ7CiB9Ci1leHRlcm4gdm9pZCBpbnRlbF9pMmNfcmVzZXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7CitleHRlcm4gdm9pZCBpbnRlbF9pMmNfcmVzZXQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIAogLyogaW50ZWxfYmlvcy5jICovCiBpbnQg aW50ZWxfYmlvc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N1c3BlbmQuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfc3VzcGVuZC5jCmluZGV4IGIwZTFlN2NhNzVkYS4uNWM4NjkyNWEwMjk0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N1c3BlbmQuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N1c3BlbmQuYwpAQCAtNTYsMTMgKzU2LDEyIEBAIHN0 YXRpYyB2b2lkIGk5MTVfcmVzdG9yZV9kaXNwbGF5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIAlpOTE1X3JlZGlzYWJsZV92Z2EoZGV2X3ByaXYpOwogfQogCi1pbnQgaTkxNV9z YXZlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitpbnQgaTkxNV9zYXZlX3N0YXRlKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBk ZXZfcHJpdi0+ZHJtLnBkZXY7CiAJaW50IGk7CiAKLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9t dXRleCk7CisJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCiAJaTkx NV9zYXZlX2Rpc3BsYXkoZGV2X3ByaXYpOwogCkBAIC05NywxOCArOTYsMTcgQEAgaW50IGk5MTVf c2F2ZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJZGV2X3ByaXYtPnJlZ2ZpbGUu c2F2ZVNXRjNbaV0gPSBJOTE1X1JFQUQoU1dGMyhpKSk7CiAJfQogCi0JbXV0ZXhfdW5sb2NrKCZk ZXYtPnN0cnVjdF9tdXRleCk7CisJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9t dXRleCk7CiAKIAlyZXR1cm4gMDsKIH0KIAotaW50IGk5MTVfcmVzdG9yZV9zdGF0ZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQoraW50IGk5MTVfcmVzdG9yZV9zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5w ZGV2OwogCWludCBpOwogCi0JbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCW11dGV4 X2xvY2soJmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIAogCWk5MTVfZ2VtX3Jlc3RvcmVf ZmVuY2VzKGRldl9wcml2KTsKIApAQCAtMTQ1LDkgKzE0Myw5IEBAIGludCBpOTE1X3Jlc3RvcmVf c3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCUk5MTVfV1JJVEUoU1dGMyhpKSwgZGV2 X3ByaXYtPnJlZ2ZpbGUuc2F2ZVNXRjNbaV0pOwogCX0KIAotCW11dGV4X3VubG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOworCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgp OwogCi0JaW50ZWxfaTJjX3Jlc2V0KGRldik7CisJaW50ZWxfaTJjX3Jlc2V0KGRldl9wcml2KTsK IAogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf aTJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9pMmMuYwppbmRleCA4NWZhYmE0MTU2 MzMuLjYyZmU1Mjk1MTZiMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf aTJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaTJjLmMKQEAgLTExMSwxMCAr MTExLDggQEAgdG9faW50ZWxfZ21idXMoc3RydWN0IGkyY19hZGFwdGVyICppMmMpCiB9CiAKIHZv aWQKLWludGVsX2kyY19yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoraW50ZWxfaTJjX3Jl c2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0KIAlJOTE1X1dSSVRFKEdNQlVT MCwgMCk7CiAJSTkxNV9XUklURShHTUJVUzQsIDApOwogfQpAQCAtMjExLDcgKzIwOSw3IEBAIGlu dGVsX2dwaW9fcHJlX3hmZXIoc3RydWN0IGkyY19hZGFwdGVyICphZGFwdGVyKQogCQkJCQkgICAg ICAgYWRhcHRlcik7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gYnVzLT5k ZXZfcHJpdjsKIAotCWludGVsX2kyY19yZXNldCgmZGV2X3ByaXYtPmRybSk7CisJaW50ZWxfaTJj X3Jlc2V0KGRldl9wcml2KTsKIAlpbnRlbF9pMmNfcXVpcmtfc2V0KGRldl9wcml2LCB0cnVlKTsK IAlzZXRfZGF0YShidXMsIDEpOwogCXNldF9jbG9jayhidXMsIDEpOwpAQCAtNjc3LDcgKzY3NSw3 IEBAIGludCBpbnRlbF9zZXR1cF9nbWJ1cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCiAJCQlnb3RvIGVycjsKIAl9CiAKLQlpbnRlbF9pMmNfcmVzZXQoJmRldl9wcml2LT5kcm0p OworCWludGVsX2kyY19yZXNldChkZXZfcHJpdik7CiAKIAlyZXR1cm4gMDsKIAotLSAKMi43LjQK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=