From: Tvrtko Ursulin Subject: [PATCH 08/10] drm/i915: Make i915_destroy_error_state take dev_priv Date: Thu, 1 Dec 2016 14:16:43 +0000 Message-ID: <1480601805-14391-9-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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4D6376E7FB for ; Thu, 1 Dec 2016 14:17:01 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id m203so34371850wma.3 for ; Thu, 01 Dec 2016 06:17:01 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpbmNlIGl0 IGRvZXMgbm90IG5lZWQgZGV2IGF0IGFsbC4KCkFsc28gY2hhbmdlIHRoZSBzdG9yZWQgcG9pbnRl ciBpbiBzdHJ1Y3QgaTkxNV9lcnJvcl9zdGF0ZV9maWxlX3ByaXYKdG8gaTkxNS4KClNpZ25lZC1v ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClJldmlld2Vk LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KUmV2aWV3ZWQtYnk6 IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgIHwgOCArKysrLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggICAgICAgfCA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ncHVfZXJyb3IuYyB8IDUgKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3lzZnMu YyAgICAgfCA0ICsrLS0KIDUgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTMgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCAyNDM0MTMwMDg3 YmUuLmQwMDZlZDEzMWE1NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTk0 Niw3ICs5NDYsNyBAQCBpOTE1X2Vycm9yX3N0YXRlX3dyaXRlKHN0cnVjdCBmaWxlICpmaWxwLAog CXN0cnVjdCBpOTE1X2Vycm9yX3N0YXRlX2ZpbGVfcHJpdiAqZXJyb3JfcHJpdiA9IGZpbHAtPnBy aXZhdGVfZGF0YTsKIAogCURSTV9ERUJVR19EUklWRVIoIlJlc2V0dGluZyBlcnJvciBzdGF0ZVxu Iik7Ci0JaTkxNV9kZXN0cm95X2Vycm9yX3N0YXRlKGVycm9yX3ByaXYtPmRldik7CisJaTkxNV9k ZXN0cm95X2Vycm9yX3N0YXRlKGVycm9yX3ByaXYtPmk5MTUpOwogCiAJcmV0dXJuIGNudDsKIH0K QEAgLTk2MCw3ICs5NjAsNyBAQCBzdGF0aWMgaW50IGk5MTVfZXJyb3Jfc3RhdGVfb3BlbihzdHJ1 Y3QgaW5vZGUgKmlub2RlLCBzdHJ1Y3QgZmlsZSAqZmlsZSkKIAlpZiAoIWVycm9yX3ByaXYpCiAJ CXJldHVybiAtRU5PTUVNOwogCi0JZXJyb3JfcHJpdi0+ZGV2ID0gJmRldl9wcml2LT5kcm07CisJ ZXJyb3JfcHJpdi0+aTkxNSA9IGRldl9wcml2OwogCiAJaTkxNV9lcnJvcl9zdGF0ZV9nZXQoJmRl dl9wcml2LT5kcm0sIGVycm9yX3ByaXYpOwogCkBAIC05ODgsOCArOTg4LDggQEAgc3RhdGljIHNz aXplX3QgaTkxNV9lcnJvcl9zdGF0ZV9yZWFkKHN0cnVjdCBmaWxlICpmaWxlLCBjaGFyIF9fdXNl ciAqdXNlcmJ1ZiwKIAlzc2l6ZV90IHJldF9jb3VudCA9IDA7CiAJaW50IHJldDsKIAotCXJldCA9 IGk5MTVfZXJyb3Jfc3RhdGVfYnVmX2luaXQoJmVycm9yX3N0ciwKLQkJCQkJdG9faTkxNShlcnJv cl9wcml2LT5kZXYpLCBjb3VudCwgKnBvcyk7CisJcmV0ID0gaTkxNV9lcnJvcl9zdGF0ZV9idWZf aW5pdCgmZXJyb3Jfc3RyLCBlcnJvcl9wcml2LT5pOTE1LAorCQkJCQljb3VudCwgKnBvcyk7CiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggZmVl MGI0NmEwNGJjLi44MDkzMTVjYWQzMTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTMw Nyw3ICsxMzA3LDcgQEAgdm9pZCBpOTE1X2RyaXZlcl91bmxvYWQoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAogCS8qIEZyZWUgZXJyb3Igc3RhdGUgYWZ0ZXIgaW50ZXJydXB0cyBhcmUgZnVsbHkg ZGlzYWJsZWQuICovCiAJY2FuY2VsX2RlbGF5ZWRfd29ya19zeW5jKCZkZXZfcHJpdi0+Z3B1X2Vy cm9yLmhhbmdjaGVja193b3JrKTsKLQlpOTE1X2Rlc3Ryb3lfZXJyb3Jfc3RhdGUoZGV2KTsKKwlp OTE1X2Rlc3Ryb3lfZXJyb3Jfc3RhdGUoZGV2X3ByaXYpOwogCiAJLyogRmx1c2ggYW55IG91dHN0 YW5kaW5nIHVucGluX3dvcmsuICovCiAJZHJhaW5fd29ya3F1ZXVlKGRldl9wcml2LT53cSk7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA0NGFlY2FkNDdiMjEuLjIwMDZlYTAzMzM1NCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xNDU5LDcgKzE0NTksNyBAQCBzdHJ1Y3QgZHJtX2k5 MTVfZXJyb3Jfc3RhdGVfYnVmIHsKIH07CiAKIHN0cnVjdCBpOTE1X2Vycm9yX3N0YXRlX2ZpbGVf cHJpdiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqaTkxNTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGUgKmVycm9yOwogfTsKIApAQCAt MzQzNCw3ICszNDM0LDcgQEAgdm9pZCBpOTE1X2NhcHR1cmVfZXJyb3Jfc3RhdGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogdm9pZCBpOTE1X2Vycm9yX3N0YXRlX2dldChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICBzdHJ1Y3QgaTkxNV9lcnJvcl9zdGF0ZV9maWxlX3By aXYgKmVycm9yX3ByaXYpOwogdm9pZCBpOTE1X2Vycm9yX3N0YXRlX3B1dChzdHJ1Y3QgaTkxNV9l cnJvcl9zdGF0ZV9maWxlX3ByaXYgKmVycm9yX3ByaXYpOwotdm9pZCBpOTE1X2Rlc3Ryb3lfZXJy b3Jfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Cit2b2lkIGk5MTVfZGVzdHJveV9lcnJv cl9zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogCiAjZWxzZQogCkBA IC0zNDQ0LDcgKzM0NDQsNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaTkxNV9jYXB0dXJlX2Vycm9y X3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIHsKIH0KIAotc3RhdGlj IGlubGluZSB2b2lkIGk5MTVfZGVzdHJveV9lcnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQorc3RhdGljIGlubGluZSB2b2lkIGk5MTVfZGVzdHJveV9lcnJvcl9zdGF0ZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dwdV9lcnJvci5jCmluZGV4IDgyNDU4ZWE2MDE1MC4uYTE0ZjdiYWRjMzM3IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTUxNCw3ICs1MTQsNyBAQCBzdGF0aWMgdm9p ZCBlcnJfcHJpbnRfY2FwYWJpbGl0aWVzKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYg Km0sCiBpbnQgaTkxNV9lcnJvcl9zdGF0ZV90b19zdHIoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0 YXRlX2J1ZiAqbSwKIAkJCSAgICBjb25zdCBzdHJ1Y3QgaTkxNV9lcnJvcl9zdGF0ZV9maWxlX3By aXYgKmVycm9yX3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShlcnJvcl9wcml2LT5kZXYpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGVycm9yX3ByaXYtPmk5MTU7CiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZfcHJp di0+ZHJtLnBkZXY7CiAJc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlICplcnJvciA9IGVycm9y X3ByaXYtPmVycm9yOwogCXN0cnVjdCBkcm1faTkxNV9lcnJvcl9vYmplY3QgKm9iajsKQEAgLTE2 NDQsOSArMTY0NCw4IEBAIHZvaWQgaTkxNV9lcnJvcl9zdGF0ZV9wdXQoc3RydWN0IGk5MTVfZXJy b3Jfc3RhdGVfZmlsZV9wcml2ICplcnJvcl9wcml2KQogCQlrcmVmX3B1dCgmZXJyb3JfcHJpdi0+ ZXJyb3ItPnJlZiwgaTkxNV9lcnJvcl9zdGF0ZV9mcmVlKTsKIH0KIAotdm9pZCBpOTE1X2Rlc3Ry b3lfZXJyb3Jfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKK3ZvaWQgaTkxNV9kZXN0cm95 X2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGRy bV9pOTE1X2Vycm9yX3N0YXRlICplcnJvcjsKIAogCXNwaW5fbG9ja19pcnEoJmRldl9wcml2LT5n cHVfZXJyb3IubG9jayk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N5 c2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N5c2ZzLmMKaW5kZXggNDc1OTBhYjA4 ZDdlLi5iOTlmZDk2NjgzMTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf c3lzZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N5c2ZzLmMKQEAgLTUzNSw3 ICs1MzUsNyBAQCBzdGF0aWMgc3NpemVfdCBlcnJvcl9zdGF0ZV9yZWFkKHN0cnVjdCBmaWxlICpm aWxwLCBzdHJ1Y3Qga29iamVjdCAqa29iaiwKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0J ZXJyb3JfcHJpdi5kZXYgPSBkZXY7CisJZXJyb3JfcHJpdi5pOTE1ID0gZGV2X3ByaXY7CiAJaTkx NV9lcnJvcl9zdGF0ZV9nZXQoZGV2LCAmZXJyb3JfcHJpdik7CiAKIAlyZXQgPSBpOTE1X2Vycm9y X3N0YXRlX3RvX3N0cigmZXJyb3Jfc3RyLCAmZXJyb3JfcHJpdik7CkBAIC01NjAsNyArNTYwLDcg QEAgc3RhdGljIHNzaXplX3QgZXJyb3Jfc3RhdGVfd3JpdGUoc3RydWN0IGZpbGUgKmZpbGUsIHN0 cnVjdCBrb2JqZWN0ICprb2JqLAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGtkZXZfbWlub3JfdG9faTkxNShrZGV2KTsKIAogCURSTV9ERUJVR19EUklWRVIoIlJlc2V0dGlu ZyBlcnJvciBzdGF0ZVxuIik7Ci0JaTkxNV9kZXN0cm95X2Vycm9yX3N0YXRlKCZkZXZfcHJpdi0+ ZHJtKTsKKwlpOTE1X2Rlc3Ryb3lfZXJyb3Jfc3RhdGUoZGV2X3ByaXYpOwogCiAJcmV0dXJuIGNv dW50OwogfQotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=