From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tursulin@ursulin.net>
Subject: [PATCH 07/15] drm/i915: dev_priv cleanup in
	i915_gpu_error.c
Date: Wed, 16 Nov 2016 08:55:37 +0000
Message-ID: <1479286545-15020-8-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: <intel-gfx-bounces@lists.freedesktop.org>
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 B73D36E661
 for <Intel-gfx@lists.freedesktop.org>; Wed, 16 Nov 2016 08:55:59 +0000 (UTC)
Received: by mail-wm0-x242.google.com with SMTP id u144so8749235wmu.0
 for <Intel-gfx@lists.freedesktop.org>; Wed, 16 Nov 2016 00:55:59 -0800 (PST)
In-Reply-To: <1479286545-15020-1-git-send-email-tvrtko.ursulin@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkFuZCBhIGxp
dHRsZSBiaXQgb2YgY2FzY2FkZWQgZnVuY3Rpb24gcHJvdG90eXBlIGNoYW5nZXMuCgpTaWduZWQt
b2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyB8IDIwICsrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgIHwgIDcgKysrLS0tLQogMyBmaWxlcyBj
aGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kcnYuaAppbmRleCAxZjM2ZTBmMDAyMWQuLjc3NmI2NGUwYmQ3ZSAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2Rydi5oCkBAIC0zNDg4LDcgKzM0ODgsNyBAQCBleHRlcm4gdm9pZCBpbnRlbF9vdmVybGF5
X3ByaW50X2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKmUsCiBl
eHRlcm4gc3RydWN0IGludGVsX2Rpc3BsYXlfZXJyb3Jfc3RhdGUgKgogaW50ZWxfZGlzcGxheV9j
YXB0dXJlX2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBl
eHRlcm4gdm9pZCBpbnRlbF9kaXNwbGF5X3ByaW50X2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1faTkx
NV9lcnJvcl9zdGF0ZV9idWYgKmUsCi0JCQkJCSAgICBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAor
CQkJCQkgICAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCQkgICAgc3Ry
dWN0IGludGVsX2Rpc3BsYXlfZXJyb3Jfc3RhdGUgKmVycm9yKTsKIAogaW50IHNhbmR5YnJpZGdl
X3Bjb2RlX3JlYWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgbWJveCwg
dTMyICp2YWwpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJy
b3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggNWQ2MjBi
ZDVkZDIyLi5kOTUxZGNjYmU4MWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ3B1X2Vycm9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3Iu
YwpAQCAtNTI4LDggKzUyOCw3IEBAIHN0YXRpYyB2b2lkIGVycl9wcmludF9jYXBhYmlsaXRpZXMo
c3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIGludCBpOTE1X2Vycm9yX3N0YXRl
X3RvX3N0cihzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQkJICAgIGNvbnN0
IHN0cnVjdCBpOTE1X2Vycm9yX3N0YXRlX2ZpbGVfcHJpdiAqZXJyb3JfcHJpdikKIHsKLQlzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2ID0gZXJyb3JfcHJpdi0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9w
cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0
ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGVycm9yX3ByaXYtPmRldik7CiAJc3RydWN0IHBjaV9kZXYg
KnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAJc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRl
ICplcnJvciA9IGVycm9yX3ByaXYtPmVycm9yOwogCXN0cnVjdCBkcm1faTkxNV9lcnJvcl9vYmpl
Y3QgKm9iajsKQEAgLTU4NSw3ICs1ODQsNyBAQCBpbnQgaTkxNV9lcnJvcl9zdGF0ZV90b19zdHIo
c3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAogCWVycl9wcmludGYobSwgIkVJ
UjogMHglMDh4XG4iLCBlcnJvci0+ZWlyKTsKIAllcnJfcHJpbnRmKG0sICJJRVI6IDB4JTA4eFxu
IiwgZXJyb3ItPmllcik7Ci0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDgpIHsKKwlpZiAo
SU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7CiAJCWZvciAoaSA9IDA7IGkgPCA0OyBpKyspCiAJ
CQllcnJfcHJpbnRmKG0sICJHVElFUiBndCAlZDogMHglMDh4XG4iLCBpLAogCQkJCSAgIGVycm9y
LT5ndGllcltpXSk7CkBAIC02MDAsMTAgKzU5OSwxMCBAQCBpbnQgaTkxNV9lcnJvcl9zdGF0ZV90
b19zdHIoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAlmb3IgKGkgPSAwOyBp
IDwgZGV2X3ByaXYtPm51bV9mZW5jZV9yZWdzOyBpKyspCiAJCWVycl9wcmludGYobSwgIiAgZmVu
Y2VbJWRdID0gJTA4bGx4XG4iLCBpLCBlcnJvci0+ZmVuY2VbaV0pOwogCi0JaWYgKElOVEVMX0lO
Rk8oZGV2KS0+Z2VuID49IDYpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2KSB7CiAJ
CWVycl9wcmludGYobSwgIkVSUk9SOiAweCUwOHhcbiIsIGVycm9yLT5lcnJvcik7CiAKLQkJaWYg
KElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDgpCisJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49
IDgpCiAJCQllcnJfcHJpbnRmKG0sICJGQVVMVF9UTEJfREFUQTogMHglMDh4IDB4JTA4eFxuIiwK
IAkJCQkgICBlcnJvci0+ZmF1bHRfZGF0YTEsIGVycm9yLT5mYXVsdF9kYXRhMCk7CiAKQEAgLTcw
OCw3ICs3MDcsNyBAQCBpbnQgaTkxNV9lcnJvcl9zdGF0ZV90b19zdHIoc3RydWN0IGRybV9pOTE1
X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAkJaW50ZWxfb3ZlcmxheV9wcmludF9lcnJvcl9zdGF0ZSht
LCBlcnJvci0+b3ZlcmxheSk7CiAKIAlpZiAoZXJyb3ItPmRpc3BsYXkpCi0JCWludGVsX2Rpc3Bs
YXlfcHJpbnRfZXJyb3Jfc3RhdGUobSwgZGV2LCBlcnJvci0+ZGlzcGxheSk7CisJCWludGVsX2Rp
c3BsYXlfcHJpbnRfZXJyb3Jfc3RhdGUobSwgZGV2X3ByaXYsIGVycm9yLT5kaXNwbGF5KTsKIAog
b3V0OgogCWlmIChtLT5ieXRlcyA9PSAwICYmIG0tPmVycikKQEAgLTE0NDMsNyArMTQ0Miw2IEBA
IHN0YXRpYyB2b2lkIGk5MTVfZ2VtX2NhcHR1cmVfZ3VjX2xvZ19idWZmZXIoc3RydWN0IGRybV9p
OTE1X3ByaXZhdGUgKmRldl9wcml2LAogc3RhdGljIHZvaWQgaTkxNV9jYXB0dXJlX3JlZ19zdGF0
ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJICAgc3RydWN0IGRybV9p
OTE1X2Vycm9yX3N0YXRlICplcnJvcikKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRl
dl9wcml2LT5kcm07CiAJaW50IGk7CiAKIAkvKiBHZW5lcmFsIG9yZ2FuaXphdGlvbgpAQCAtMTQ2
NCw3ICsxNDYyLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9jYXB0dXJlX3JlZ19zdGF0ZShzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJaWYgKElTX0dFTjcoZGV2X3ByaXYpKQogCQll
cnJvci0+ZXJyX2ludCA9IEk5MTVfUkVBRChHRU43X0VSUl9JTlQpOwogCi0JaWYgKElOVEVMX0lO
Rk8oZGV2KS0+Z2VuID49IDgpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7CiAJ
CWVycm9yLT5mYXVsdF9kYXRhMCA9IEk5MTVfUkVBRChHRU44X0ZBVUxUX1RMQl9EQVRBMCk7CiAJ
CWVycm9yLT5mYXVsdF9kYXRhMSA9IEk5MTVfUkVBRChHRU44X0ZBVUxUX1RMQl9EQVRBMSk7CiAJ
fQpAQCAtMTQ3NiwxMCArMTQ3NCwxMCBAQCBzdGF0aWMgdm9pZCBpOTE1X2NhcHR1cmVfcmVnX3N0
YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAl9CiAKIAkvKiAyOiBSZWdp
c3RlcnMgd2hpY2ggYmVsb25nIHRvIG11bHRpcGxlIGdlbmVyYXRpb25zICovCi0JaWYgKElOVEVM
X0lORk8oZGV2KS0+Z2VuID49IDcpCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNykKIAkJ
ZXJyb3ItPmZvcmNld2FrZSA9IEk5MTVfUkVBRF9GVyhGT1JDRVdBS0VfTVQpOwogCi0JaWYgKElO
VEVMX0lORk8oZGV2KS0+Z2VuID49IDYpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2
KSB7CiAJCWVycm9yLT5kZXJybXIgPSBJOTE1X1JFQUQoREVSUk1SKTsKIAkJZXJyb3ItPmVycm9y
ID0gSTkxNV9SRUFEKEVSUk9SX0dFTjYpOwogCQllcnJvci0+ZG9uZV9yZWcgPSBJOTE1X1JFQUQo
RE9ORV9SRUcpOwpAQCAtMTQ5NSw3ICsxNDkzLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9jYXB0dXJl
X3JlZ19zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJaWYgKEhBU19I
V19DT05URVhUUyhkZXZfcHJpdikpCiAJCWVycm9yLT5jY2lkID0gSTkxNV9SRUFEKENDSUQpOwog
Ci0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDgpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9w
cml2KSA+PSA4KSB7CiAJCWVycm9yLT5pZXIgPSBJOTE1X1JFQUQoR0VOOF9ERV9NSVNDX0lFUik7
CiAJCWZvciAoaSA9IDA7IGkgPCA0OyBpKyspCiAJCQllcnJvci0+Z3RpZXJbaV0gPSBJOTE1X1JF
QUQoR0VOOF9HVF9JRVIoaSkpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4
IDJlYmI4YjgzMzM5NS4uOTI2OTRlODMxNGUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz
cGxheS5jCkBAIC0xNzMzOCwxMCArMTczMzgsOSBAQCBpbnRlbF9kaXNwbGF5X2NhcHR1cmVfZXJy
b3Jfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiB2b2lkCiBpbnRl
bF9kaXNwbGF5X3ByaW50X2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9i
dWYgKm0sCi0JCQkJc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQlzdHJ1Y3QgZHJtX2k5MTVf
cHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJc3RydWN0IGludGVsX2Rpc3BsYXlfZXJyb3Jfc3RhdGUg
KmVycm9yKQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo
ZGV2KTsKIAlpbnQgaTsKIAogCWlmICghZXJyb3IpCkBAIC0xNzM2MSwxMyArMTczNjAsMTMgQEAg
aW50ZWxfZGlzcGxheV9wcmludF9lcnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3Rh
dGVfYnVmICptLAogCQllcnJfcHJpbnRmKG0sICJQbGFuZSBbJWRdOlxuIiwgaSk7CiAJCWVycl9w
cmludGYobSwgIiAgQ05UUjogJTA4eFxuIiwgZXJyb3ItPnBsYW5lW2ldLmNvbnRyb2wpOwogCQll
cnJfcHJpbnRmKG0sICIgIFNUUklERTogJTA4eFxuIiwgZXJyb3ItPnBsYW5lW2ldLnN0cmlkZSk7
Ci0JCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSAzKSB7CisJCWlmIChJTlRFTF9HRU4oZGV2
X3ByaXYpIDw9IDMpIHsKIAkJCWVycl9wcmludGYobSwgIiAgU0laRTogJTA4eFxuIiwgZXJyb3It
PnBsYW5lW2ldLnNpemUpOwogCQkJZXJyX3ByaW50ZihtLCAiICBQT1M6ICUwOHhcbiIsIGVycm9y
LT5wbGFuZVtpXS5wb3MpOwogCQl9CiAJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDw9IDcgJiYg
IUlTX0hBU1dFTEwoZGV2X3ByaXYpKQogCQkJZXJyX3ByaW50ZihtLCAiICBBRERSOiAlMDh4XG4i
LCBlcnJvci0+cGxhbmVbaV0uYWRkcik7Ci0JCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA0
KSB7CisJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQpIHsKIAkJCWVycl9wcmludGYobSwg
IiAgU1VSRjogJTA4eFxuIiwgZXJyb3ItPnBsYW5lW2ldLnN1cmZhY2UpOwogCQkJZXJyX3ByaW50
ZihtLCAiICBUSUxFT0ZGOiAlMDh4XG4iLCBlcnJvci0+cGxhbmVbaV0udGlsZV9vZmZzZXQpOwog
CQl9Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au
b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt
Z2Z4Cg==