From: Tvrtko Ursulin Subject: [PATCH 08/10] drm/i915: Make i915_destroy_error_state take dev_priv Date: Wed, 30 Nov 2016 11:35:38 +0000 Message-ID: <1480505740-1920-9-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 3A8BA6E118 for ; Wed, 30 Nov 2016 11:35:56 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id m203so28921907wma.3 for ; Wed, 30 Nov 2016 03:35:56 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpbmNlIGl0 IGRvZXMgbm90IG5lZWQgZGV2IGF0IGFsbC4KCkFsc28gY2hhbmdlIHRoZSBzdG9yZWQgcG9pbnRl ciBpbiBzdHJ1Y3QgaTkxNV9lcnJvcl9zdGF0ZV9maWxlX3ByaXYKdG8gaTkxNS4KClNpZ25lZC1v ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgICB8IDggKysrKy0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oICAgICAgIHwgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3B1X2Vycm9yLmMgfCA1ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N5c2ZzLmMg ICAgIHwgNCArKy0tCiA1IGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDEzIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggMjQzNDEzMDA4N2Jl Li5kMDA2ZWQxMzFhNTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVi dWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC05NDYs NyArOTQ2LDcgQEAgaTkxNV9lcnJvcl9zdGF0ZV93cml0ZShzdHJ1Y3QgZmlsZSAqZmlscCwKIAlz dHJ1Y3QgaTkxNV9lcnJvcl9zdGF0ZV9maWxlX3ByaXYgKmVycm9yX3ByaXYgPSBmaWxwLT5wcml2 YXRlX2RhdGE7CiAKIAlEUk1fREVCVUdfRFJJVkVSKCJSZXNldHRpbmcgZXJyb3Igc3RhdGVcbiIp OwotCWk5MTVfZGVzdHJveV9lcnJvcl9zdGF0ZShlcnJvcl9wcml2LT5kZXYpOworCWk5MTVfZGVz dHJveV9lcnJvcl9zdGF0ZShlcnJvcl9wcml2LT5pOTE1KTsKIAogCXJldHVybiBjbnQ7CiB9CkBA IC05NjAsNyArOTYwLDcgQEAgc3RhdGljIGludCBpOTE1X2Vycm9yX3N0YXRlX29wZW4oc3RydWN0 IGlub2RlICppbm9kZSwgc3RydWN0IGZpbGUgKmZpbGUpCiAJaWYgKCFlcnJvcl9wcml2KQogCQly ZXR1cm4gLUVOT01FTTsKIAotCWVycm9yX3ByaXYtPmRldiA9ICZkZXZfcHJpdi0+ZHJtOworCWVy cm9yX3ByaXYtPmk5MTUgPSBkZXZfcHJpdjsKIAogCWk5MTVfZXJyb3Jfc3RhdGVfZ2V0KCZkZXZf cHJpdi0+ZHJtLCBlcnJvcl9wcml2KTsKIApAQCAtOTg4LDggKzk4OCw4IEBAIHN0YXRpYyBzc2l6 ZV90IGk5MTVfZXJyb3Jfc3RhdGVfcmVhZChzdHJ1Y3QgZmlsZSAqZmlsZSwgY2hhciBfX3VzZXIg KnVzZXJidWYsCiAJc3NpemVfdCByZXRfY291bnQgPSAwOwogCWludCByZXQ7CiAKLQlyZXQgPSBp OTE1X2Vycm9yX3N0YXRlX2J1Zl9pbml0KCZlcnJvcl9zdHIsCi0JCQkJCXRvX2k5MTUoZXJyb3Jf cHJpdi0+ZGV2KSwgY291bnQsICpwb3MpOworCXJldCA9IGk5MTVfZXJyb3Jfc3RhdGVfYnVmX2lu aXQoJmVycm9yX3N0ciwgZXJyb3JfcHJpdi0+aTkxNSwKKwkJCQkJY291bnQsICpwb3MpOwogCWlm IChyZXQpCiAJCXJldHVybiByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IDJkMWYx MDkwYTFmZi4uM2NhMDBmYWZkYTIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTEzMTEs NyArMTMxMSw3IEBAIHZvaWQgaTkxNV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAKIAkvKiBGcmVlIGVycm9yIHN0YXRlIGFmdGVyIGludGVycnVwdHMgYXJlIGZ1bGx5IGRp c2FibGVkLiAqLwogCWNhbmNlbF9kZWxheWVkX3dvcmtfc3luYygmZGV2X3ByaXYtPmdwdV9lcnJv ci5oYW5nY2hlY2tfd29yayk7Ci0JaTkxNV9kZXN0cm95X2Vycm9yX3N0YXRlKGRldik7CisJaTkx NV9kZXN0cm95X2Vycm9yX3N0YXRlKGRldl9wcml2KTsKIAogCS8qIEZsdXNoIGFueSBvdXRzdGFu ZGluZyB1bnBpbl93b3JrLiAqLwogCWRyYWluX3dvcmtxdWV1ZShkZXZfcHJpdi0+d3EpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMDUyMmFhYjM1NzZiLi40MWFkMzE4M2FiOGUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTQ1Nyw3ICsxNDU3LDcgQEAgc3RydWN0IGRybV9pOTE1 X2Vycm9yX3N0YXRlX2J1ZiB7CiB9OwogCiBzdHJ1Y3QgaTkxNV9lcnJvcl9zdGF0ZV9maWxlX3By aXYgewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg Kmk5MTU7CiAJc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlICplcnJvcjsKIH07CiAKQEAgLTM0 MzgsNyArMzQzOCw3IEBAIHZvaWQgaTkxNV9jYXB0dXJlX2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIHZvaWQgaTkxNV9lcnJvcl9zdGF0ZV9nZXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAkJCSAgc3RydWN0IGk5MTVfZXJyb3Jfc3RhdGVfZmlsZV9wcml2 ICplcnJvcl9wcml2KTsKIHZvaWQgaTkxNV9lcnJvcl9zdGF0ZV9wdXQoc3RydWN0IGk5MTVfZXJy b3Jfc3RhdGVfZmlsZV9wcml2ICplcnJvcl9wcml2KTsKLXZvaWQgaTkxNV9kZXN0cm95X2Vycm9y X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwordm9pZCBpOTE1X2Rlc3Ryb3lfZXJyb3Jf c3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIAogI2Vsc2UKIApAQCAt MzQ0OCw3ICszNDQ4LDcgQEAgc3RhdGljIGlubGluZSB2b2lkIGk5MTVfY2FwdHVyZV9lcnJvcl9z dGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB7CiB9CiAKLXN0YXRpYyBp bmxpbmUgdm9pZCBpOTE1X2Rlc3Ryb3lfZXJyb3Jfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKK3N0YXRpYyBpbmxpbmUgdm9pZCBpOTE1X2Rlc3Ryb3lfZXJyb3Jfc3RhdGUoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n cHVfZXJyb3IuYwppbmRleCA4MjQ1OGVhNjAxNTAuLmExNGY3YmFkYzMzNyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC01MTQsNyArNTE0LDcgQEAgc3RhdGljIHZvaWQg ZXJyX3ByaW50X2NhcGFiaWxpdGllcyhzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICpt LAogaW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3RyKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0 ZV9idWYgKm0sCiAJCQkgICAgY29uc3Qgc3RydWN0IGk5MTVfZXJyb3Jfc3RhdGVfZmlsZV9wcml2 ICplcnJvcl9wcml2KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZXJyb3JfcHJpdi0+ZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBlcnJvcl9wcml2LT5pOTE1OwogCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYt PmRybS5wZGV2OwogCXN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZSAqZXJyb3IgPSBlcnJvcl9w cml2LT5lcnJvcjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfb2JqZWN0ICpvYmo7CkBAIC0xNjQ0 LDkgKzE2NDQsOCBAQCB2b2lkIGk5MTVfZXJyb3Jfc3RhdGVfcHV0KHN0cnVjdCBpOTE1X2Vycm9y X3N0YXRlX2ZpbGVfcHJpdiAqZXJyb3JfcHJpdikKIAkJa3JlZl9wdXQoJmVycm9yX3ByaXYtPmVy cm9yLT5yZWYsIGk5MTVfZXJyb3Jfc3RhdGVfZnJlZSk7CiB9CiAKLXZvaWQgaTkxNV9kZXN0cm95 X2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit2b2lkIGk5MTVfZGVzdHJveV9l cnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBkcm1f aTkxNV9lcnJvcl9zdGF0ZSAqZXJyb3I7CiAKIAlzcGluX2xvY2tfaXJxKCZkZXZfcHJpdi0+Z3B1 X2Vycm9yLmxvY2spOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zeXNm cy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zeXNmcy5jCmluZGV4IDQ3NTkwYWIwOGQ3 ZS4uYjk5ZmQ5NjY4MzE3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N5 c2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zeXNmcy5jCkBAIC01MzUsNyAr NTM1LDcgQEAgc3RhdGljIHNzaXplX3QgZXJyb3Jfc3RhdGVfcmVhZChzdHJ1Y3QgZmlsZSAqZmls cCwgc3RydWN0IGtvYmplY3QgKmtvYmosCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCWVy cm9yX3ByaXYuZGV2ID0gZGV2OworCWVycm9yX3ByaXYuaTkxNSA9IGRldl9wcml2OwogCWk5MTVf ZXJyb3Jfc3RhdGVfZ2V0KGRldiwgJmVycm9yX3ByaXYpOwogCiAJcmV0ID0gaTkxNV9lcnJvcl9z dGF0ZV90b19zdHIoJmVycm9yX3N0ciwgJmVycm9yX3ByaXYpOwpAQCAtNTYwLDcgKzU2MCw3IEBA IHN0YXRpYyBzc2l6ZV90IGVycm9yX3N0YXRlX3dyaXRlKHN0cnVjdCBmaWxlICpmaWxlLCBzdHJ1 Y3Qga29iamVjdCAqa29iaiwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBr ZGV2X21pbm9yX3RvX2k5MTUoa2Rldik7CiAKIAlEUk1fREVCVUdfRFJJVkVSKCJSZXNldHRpbmcg ZXJyb3Igc3RhdGVcbiIpOwotCWk5MTVfZGVzdHJveV9lcnJvcl9zdGF0ZSgmZGV2X3ByaXYtPmRy bSk7CisJaTkxNV9kZXN0cm95X2Vycm9yX3N0YXRlKGRldl9wcml2KTsKIAogCXJldHVybiBjb3Vu dDsKIH0KLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK