From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 32/33] drm/i915: Consolidate error object
	printing
Date: Sun,  7 Aug 2016 15:45:40 +0100
Message-ID: <1470581141-14432-33-git-send-email-chris@chris-wilson.co.uk>
References: <1470581141-14432-1-git-send-email-chris@chris-wilson.co.uk>
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 AC3176E30A
 for <intel-gfx@lists.freedesktop.org>; Sun,  7 Aug 2016 14:46:23 +0000 (UTC)
Received: by mail-wm0-x242.google.com with SMTP id x83so11039520wma.3
 for <intel-gfx@lists.freedesktop.org>; Sun, 07 Aug 2016 07:46:23 -0700 (PDT)
In-Reply-To: <1470581141-14432-1-git-send-email-chris@chris-wilson.co.uk>
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

TGVhdmUgYWxsIHRoZSBwcmV0dHkgcHJpbnRpbmcgdG8gdXNlcnNwYWNlIGFuZCBzaW1wbGlmeSB0
aGUgZXJyb3IKY2FwdHVyZSB0byBvbmx5IGhhdmUgYSBzaW5nbGUgY29tbW9uIG9iamVjdCBwcmlu
dGVyLiBJdCBtYWtlcyB0aGUga2VybmVsCmNvZGUgbW9yZSBjb21wYWN0LCBhbmQgdGhlIHJlZmFj
dG9yaW5nIGFsbG93cyB1cyB0byBhcHBseSBtb3JlIGNvbXBsZXgKdHJhbnNmb3JtYXRpb25zIGxp
a2UgY29tcHJlc3NpbmcgdGhlIG91dHB1dC4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8
Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
Z3B1X2Vycm9yLmMgfCAxMDAgKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBm
aWxlIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDc1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp
dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IGQ5YTY1Y2JkMTIzNC4uYTBlOTA2YmM2NGRj
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTMxMCwxMCArMzEwLDIy
IEBAIHZvaWQgaTkxNV9lcnJvcl9wcmludGYoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1
ZiAqZSwgY29uc3QgY2hhciAqZiwgLi4uKQogfQogCiBzdGF0aWMgdm9pZCBwcmludF9lcnJvcl9v
Ymooc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKKwkJCSAgICBzdHJ1Y3QgaW50
ZWxfZW5naW5lX2NzICplbmdpbmUsCisJCQkgICAgY29uc3QgY2hhciAqbmFtZSwKIAkJCSAgICBz
dHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfb2JqZWN0ICpvYmopCiB7CiAJaW50IHBhZ2UsIG9mZnNldCwg
ZWx0OwogCisJaWYgKCFvYmopCisJCXJldHVybjsKKworCWlmIChuYW1lKSB7CisJCWVycl9wcmlu
dGYobSwgIiVzIC0tLSAlcyBndHRfb2Zmc2V0ID0gMHglMDh4XyUwOHhcbiIsCisJCQkgICBlbmdp
bmUgPyBlbmdpbmUtPm5hbWUgOiAiZ2xvYmFsIiwgbmFtZSwKKwkJCSAgIHVwcGVyXzMyX2JpdHMo
b2JqLT5ndHRfb2Zmc2V0KSwKKwkJCSAgIGxvd2VyXzMyX2JpdHMob2JqLT5ndHRfb2Zmc2V0KSk7
CisJfQorCiAJZm9yIChwYWdlID0gb2Zmc2V0ID0gMDsgcGFnZSA8IG9iai0+cGFnZV9jb3VudDsg
cGFnZSsrKSB7CiAJCWZvciAoZWx0ID0gMDsgZWx0IDwgUEFHRV9TSVpFLzQ7IGVsdCsrKSB7CiAJ
CQllcnJfcHJpbnRmKG0sICIlMDh4IDogICUwOHhcbiIsIG9mZnNldCwKQEAgLTMzMCw4ICszNDIs
OCBAQCBpbnQgaTkxNV9lcnJvcl9zdGF0ZV90b19zdHIoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0
YXRlX2J1ZiAqbSwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1
KGRldik7CiAJc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlICplcnJvciA9IGVycm9yX3ByaXYt
PmVycm9yOwogCXN0cnVjdCBkcm1faTkxNV9lcnJvcl9vYmplY3QgKm9iajsKLQlpbnQgaSwgaiwg
b2Zmc2V0LCBlbHQ7CiAJaW50IG1heF9oYW5nY2hlY2tfc2NvcmU7CisJaW50IGksIGo7CiAKIAlp
ZiAoIWVycm9yKSB7CiAJCWVycl9wcmludGYobSwgIm5vIGVycm9yIHN0YXRlIGNvbGxlY3RlZFxu
Iik7CkBAIC00NDYsMTUgKzQ1OCw3IEBAIGludCBpOTE1X2Vycm9yX3N0YXRlX3RvX3N0cihzdHJ1
Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQkJZXJyX3ByaW50ZihtLCAiIC0tLSBn
dHRfb2Zmc2V0ID0gMHglMDh4ICUwOHhcbiIsCiAJCQkJICAgdXBwZXJfMzJfYml0cyhvYmotPmd0
dF9vZmZzZXQpLAogCQkJCSAgIGxvd2VyXzMyX2JpdHMob2JqLT5ndHRfb2Zmc2V0KSk7Ci0JCQlw
cmludF9lcnJvcl9vYmoobSwgb2JqKTsKLQkJfQotCi0JCW9iaiA9IGVlLT53YV9iYXRjaGJ1ZmZl
cjsKLQkJaWYgKG9iaikgewotCQkJZXJyX3ByaW50ZihtLCAiJXMgKHcvYSkgLS0tIGd0dF9vZmZz
ZXQgPSAweCUwOHhcbiIsCi0JCQkJICAgZGV2X3ByaXYtPmVuZ2luZVtpXS5uYW1lLAotCQkJCSAg
IGxvd2VyXzMyX2JpdHMob2JqLT5ndHRfb2Zmc2V0KSk7Ci0JCQlwcmludF9lcnJvcl9vYmoobSwg
b2JqKTsKKwkJCXByaW50X2Vycm9yX29iaihtLCAmZGV2X3ByaXYtPmVuZ2luZVtpXSwgTlVMTCwg
b2JqKTsKIAkJfQogCiAJCWlmIChlZS0+bnVtX3JlcXVlc3RzKSB7CkBAIC00ODIsNzcgKzQ4Niwy
MyBAQCBpbnQgaTkxNV9lcnJvcl9zdGF0ZV90b19zdHIoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0
YXRlX2J1ZiAqbSwKIAkJCX0KIAkJfQogCi0JCWlmICgob2JqID0gZWUtPnJpbmdidWZmZXIpKSB7
Ci0JCQllcnJfcHJpbnRmKG0sICIlcyAtLS0gcmluZ2J1ZmZlciA9IDB4JTA4eFxuIiwKLQkJCQkg
ICBkZXZfcHJpdi0+ZW5naW5lW2ldLm5hbWUsCi0JCQkJICAgbG93ZXJfMzJfYml0cyhvYmotPmd0
dF9vZmZzZXQpKTsKLQkJCXByaW50X2Vycm9yX29iaihtLCBvYmopOwotCQl9CisJCXByaW50X2Vy
cm9yX29iaihtLCAmZGV2X3ByaXYtPmVuZ2luZVtpXSwKKwkJCQkicmluZ2J1ZmZlciIsIGVlLT5y
aW5nYnVmZmVyKTsKIAotCQlpZiAoKG9iaiA9IGVlLT5od3NfcGFnZSkpIHsKLQkJCXU2NCBod3Nf
b2Zmc2V0ID0gb2JqLT5ndHRfb2Zmc2V0OwotCQkJdTMyICpod3NfcGFnZSA9ICZvYmotPnBhZ2Vz
WzBdWzBdOworCQlwcmludF9lcnJvcl9vYmoobSwgJmRldl9wcml2LT5lbmdpbmVbaV0sCisJCQkJ
IkhXIFN0YXR1cyIsIGVlLT5od3NfcGFnZSk7CiAKLQkJCWlmIChpOTE1LmVuYWJsZV9leGVjbGlz
dHMpIHsKLQkJCQlod3Nfb2Zmc2V0ICs9IExSQ19QUEhXU1BfUE4gKiBQQUdFX1NJWkU7Ci0JCQkJ
aHdzX3BhZ2UgPSAmb2JqLT5wYWdlc1tMUkNfUFBIV1NQX1BOXVswXTsKLQkJCX0KLQkJCWVycl9w
cmludGYobSwgIiVzIC0tLSBIVyBTdGF0dXMgPSAweCUwOGxseFxuIiwKLQkJCQkgICBkZXZfcHJp
di0+ZW5naW5lW2ldLm5hbWUsIGh3c19vZmZzZXQpOwotCQkJb2Zmc2V0ID0gMDsKLQkJCWZvciAo
ZWx0ID0gMDsgZWx0IDwgUEFHRV9TSVpFLzE2OyBlbHQgKz0gNCkgewotCQkJCWVycl9wcmludGYo
bSwgIlslMDR4XSAlMDh4ICUwOHggJTA4eCAlMDh4XG4iLAotCQkJCQkgICBvZmZzZXQsCi0JCQkJ
CSAgIGh3c19wYWdlW2VsdF0sCi0JCQkJCSAgIGh3c19wYWdlW2VsdCsxXSwKLQkJCQkJICAgaHdz
X3BhZ2VbZWx0KzJdLAotCQkJCQkgICBod3NfcGFnZVtlbHQrM10pOwotCQkJCW9mZnNldCArPSAx
NjsKLQkJCX0KLQkJfQorCQlwcmludF9lcnJvcl9vYmoobSwgJmRldl9wcml2LT5lbmdpbmVbaV0s
CisJCQkJIkhXIGNvbnRleHQiLCBlZS0+Y3R4KTsKIAotCQlvYmogPSBlZS0+d2FfY3R4OwotCQlp
ZiAob2JqKSB7Ci0JCQl1NjQgd2FfY3R4X29mZnNldCA9IG9iai0+Z3R0X29mZnNldDsKLQkJCXUz
MiAqd2FfY3R4X3BhZ2UgPSAmb2JqLT5wYWdlc1swXVswXTsKLQkJCXN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKmVuZ2luZSA9ICZkZXZfcHJpdi0+ZW5naW5lW1JDU107Ci0JCQl1MzIgd2FfY3R4X3Np
emUgPSAoZW5naW5lLT53YV9jdHguaW5kaXJlY3RfY3R4LnNpemUgKwotCQkJCQkgICBlbmdpbmUt
PndhX2N0eC5wZXJfY3R4LnNpemUpOwotCi0JCQllcnJfcHJpbnRmKG0sICIlcyAtLS0gV0EgY3R4
IGJhdGNoIGJ1ZmZlciA9IDB4JTA4bGx4XG4iLAotCQkJCSAgIGRldl9wcml2LT5lbmdpbmVbaV0u
bmFtZSwgd2FfY3R4X29mZnNldCk7Ci0JCQlvZmZzZXQgPSAwOwotCQkJZm9yIChlbHQgPSAwOyBl
bHQgPCB3YV9jdHhfc2l6ZTsgZWx0ICs9IDQpIHsKLQkJCQllcnJfcHJpbnRmKG0sICJbJTA0eF0g
JTA4eCAlMDh4ICUwOHggJTA4eFxuIiwKLQkJCQkJICAgb2Zmc2V0LAotCQkJCQkgICB3YV9jdHhf
cGFnZVtlbHQgKyAwXSwKLQkJCQkJICAgd2FfY3R4X3BhZ2VbZWx0ICsgMV0sCi0JCQkJCSAgIHdh
X2N0eF9wYWdlW2VsdCArIDJdLAotCQkJCQkgICB3YV9jdHhfcGFnZVtlbHQgKyAzXSk7Ci0JCQkJ
b2Zmc2V0ICs9IDE2OwotCQkJfQotCQl9CisJCXByaW50X2Vycm9yX29iaihtLCAmZGV2X3ByaXYt
PmVuZ2luZVtpXSwKKwkJCQkiV0EgY29udGV4dCIsIGVlLT53YV9jdHgpOwogCi0JCWlmICgob2Jq
ID0gZWUtPmN0eCkpIHsKLQkJCWVycl9wcmludGYobSwgIiVzIC0tLSBIVyBDb250ZXh0ID0gMHgl
MDh4XG4iLAotCQkJCSAgIGRldl9wcml2LT5lbmdpbmVbaV0ubmFtZSwKLQkJCQkgICBsb3dlcl8z
Ml9iaXRzKG9iai0+Z3R0X29mZnNldCkpOwotCQkJcHJpbnRfZXJyb3Jfb2JqKG0sIG9iaik7Ci0J
CX0KKwkJcHJpbnRfZXJyb3Jfb2JqKG0sICZkZXZfcHJpdi0+ZW5naW5lW2ldLAorCQkJCSJXQSBi
YXRjaGJ1ZmZlciIsIGVlLT53YV9iYXRjaGJ1ZmZlcik7CiAJfQogCi0JaWYgKChvYmogPSBlcnJv
ci0+c2VtYXBob3JlKSkgewotCQllcnJfcHJpbnRmKG0sICJTZW1hcGhvcmUgcGFnZSA9IDB4JTA4
eFxuIiwKLQkJCSAgIGxvd2VyXzMyX2JpdHMob2JqLT5ndHRfb2Zmc2V0KSk7Ci0JCWZvciAoZWx0
ID0gMDsgZWx0IDwgUEFHRV9TSVpFLzE2OyBlbHQgKz0gNCkgewotCQkJZXJyX3ByaW50ZihtLCAi
WyUwNHhdICUwOHggJTA4eCAlMDh4ICUwOHhcbiIsCi0JCQkJICAgZWx0ICogNCwKLQkJCQkgICBv
YmotPnBhZ2VzWzBdW2VsdF0sCi0JCQkJICAgb2JqLT5wYWdlc1swXVtlbHQrMV0sCi0JCQkJICAg
b2JqLT5wYWdlc1swXVtlbHQrMl0sCi0JCQkJICAgb2JqLT5wYWdlc1swXVtlbHQrM10pOwotCQl9
Ci0JfQorCXByaW50X2Vycm9yX29iaihtLCBOVUxMLCAiU2VtYXBob3JlcyIsIGVycm9yLT5zZW1h
cGhvcmUpOwogCiAJaWYgKGVycm9yLT5vdmVybGF5KQogCQlpbnRlbF9vdmVybGF5X3ByaW50X2Vy
cm9yX3N0YXRlKG0sIGVycm9yLT5vdmVybGF5KTsKLS0gCjIuOC4xCgpfX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu
dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v
cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK