From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 04/38] drm/i915: Consolidate error object printing Date: Tue, 20 Sep 2016 09:29:38 +0100 Message-ID: <20160920083012.2754-5-chris@chris-wilson.co.uk> References: <20160920083012.2754-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 38FF96E679 for ; Tue, 20 Sep 2016 08:30:24 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id l132so2072576wmf.1 for ; Tue, 20 Sep 2016 01:30:24 -0700 (PDT) In-Reply-To: <20160920083012.2754-1-chris@chris-wilson.co.uk> 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 Cc: mika.kuoppala@intel.com List-Id: intel-gfx@lists.freedesktop.org TGVhdmUgYWxsIHRoZSBwcmV0dHkgcHJpbnRpbmcgdG8gdXNlcnNwYWNlIGFuZCBzaW1wbGlmeSB0 aGUgZXJyb3IKY2FwdHVyZSB0byBvbmx5IGhhdmUgYSBzaW5nbGUgY29tbW9uIG9iamVjdCBwcmlu dGVyLiBJdCBtYWtlcyB0aGUga2VybmVsCmNvZGUgbW9yZSBjb21wYWN0LCBhbmQgdGhlIHJlZmFj dG9yaW5nIGFsbG93cyB1cyB0byBhcHBseSBtb3JlIGNvbXBsZXgKdHJhbnNmb3JtYXRpb25zIGxp a2UgY29tcHJlc3NpbmcgdGhlIG91dHB1dC4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8 Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxq b29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ3B1X2Vycm9yLmMgfCAxMDAgKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDc1IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IDgyYTkyOGIwYjJmMy4uZjRjYzY3 NDZkYzcyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTMxMSwxMCAr MzExLDIyIEBAIHZvaWQgaTkxNV9lcnJvcl9wcmludGYoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0 YXRlX2J1ZiAqZSwgY29uc3QgY2hhciAqZiwgLi4uKQogfQogCiBzdGF0aWMgdm9pZCBwcmludF9l cnJvcl9vYmooc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKKwkJCSAgICBzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCisJCQkgICAgY29uc3QgY2hhciAqbmFtZSwKIAkJ CSAgICBzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfb2JqZWN0ICpvYmopCiB7CiAJaW50IHBhZ2UsIG9m ZnNldCwgZWx0OwogCisJaWYgKCFvYmopCisJCXJldHVybjsKKworCWlmIChuYW1lKSB7CisJCWVy cl9wcmludGYobSwgIiVzIC0tLSAlcyA9IDB4JTA4eCAlMDh4XG4iLAorCQkJICAgZW5naW5lID8g ZW5naW5lLT5uYW1lIDogImdsb2JhbCIsIG5hbWUsCisJCQkgICB1cHBlcl8zMl9iaXRzKG9iai0+ Z3R0X29mZnNldCksCisJCQkgICBsb3dlcl8zMl9iaXRzKG9iai0+Z3R0X29mZnNldCkpOworCX0K KwogCWZvciAocGFnZSA9IG9mZnNldCA9IDA7IHBhZ2UgPCBvYmotPnBhZ2VfY291bnQ7IHBhZ2Ur KykgewogCQlmb3IgKGVsdCA9IDA7IGVsdCA8IFBBR0VfU0laRS80OyBlbHQrKykgewogCQkJZXJy X3ByaW50ZihtLCAiJTA4eCA6ICAlMDh4XG4iLCBvZmZzZXQsCkBAIC0zNDIsOCArMzU0LDggQEAg aW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3RyKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9i dWYgKm0sCiAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBkZXZfcHJpdi0+ZHJtLnBkZXY7CiAJc3Ry dWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlICplcnJvciA9IGVycm9yX3ByaXYtPmVycm9yOwogCXN0 cnVjdCBkcm1faTkxNV9lcnJvcl9vYmplY3QgKm9iajsKLQlpbnQgaSwgaiwgb2Zmc2V0LCBlbHQ7 CiAJaW50IG1heF9oYW5nY2hlY2tfc2NvcmU7CisJaW50IGksIGo7CiAKIAlpZiAoIWVycm9yKSB7 CiAJCWVycl9wcmludGYobSwgIm5vIGVycm9yIHN0YXRlIGNvbGxlY3RlZFxuIik7CkBAIC00Njcs MTUgKzQ3OSw3IEBAIGludCBpOTE1X2Vycm9yX3N0YXRlX3RvX3N0cihzdHJ1Y3QgZHJtX2k5MTVf ZXJyb3Jfc3RhdGVfYnVmICptLAogCQkJZXJyX3ByaW50ZihtLCAiIC0tLSBndHRfb2Zmc2V0ID0g MHglMDh4ICUwOHhcbiIsCiAJCQkJICAgdXBwZXJfMzJfYml0cyhvYmotPmd0dF9vZmZzZXQpLAog CQkJCSAgIGxvd2VyXzMyX2JpdHMob2JqLT5ndHRfb2Zmc2V0KSk7Ci0JCQlwcmludF9lcnJvcl9v YmoobSwgb2JqKTsKLQkJfQotCi0JCW9iaiA9IGVlLT53YV9iYXRjaGJ1ZmZlcjsKLQkJaWYgKG9i aikgewotCQkJZXJyX3ByaW50ZihtLCAiJXMgKHcvYSkgLS0tIGd0dF9vZmZzZXQgPSAweCUwOHhc biIsCi0JCQkJICAgZGV2X3ByaXYtPmVuZ2luZVtpXS5uYW1lLAotCQkJCSAgIGxvd2VyXzMyX2Jp dHMob2JqLT5ndHRfb2Zmc2V0KSk7Ci0JCQlwcmludF9lcnJvcl9vYmoobSwgb2JqKTsKKwkJCXBy aW50X2Vycm9yX29iaihtLCAmZGV2X3ByaXYtPmVuZ2luZVtpXSwgTlVMTCwgb2JqKTsKIAkJfQog CiAJCWlmIChlZS0+bnVtX3JlcXVlc3RzKSB7CkBAIC01MDcsNzcgKzUxMSwyMyBAQCBpbnQgaTkx NV9lcnJvcl9zdGF0ZV90b19zdHIoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwK IAkJCX0KIAkJfQogCi0JCWlmICgob2JqID0gZWUtPnJpbmdidWZmZXIpKSB7Ci0JCQllcnJfcHJp bnRmKG0sICIlcyAtLS0gcmluZ2J1ZmZlciA9IDB4JTA4eFxuIiwKLQkJCQkgICBkZXZfcHJpdi0+ ZW5naW5lW2ldLm5hbWUsCi0JCQkJICAgbG93ZXJfMzJfYml0cyhvYmotPmd0dF9vZmZzZXQpKTsK LQkJCXByaW50X2Vycm9yX29iaihtLCBvYmopOwotCQl9CisJCXByaW50X2Vycm9yX29iaihtLCAm ZGV2X3ByaXYtPmVuZ2luZVtpXSwKKwkJCQkicmluZ2J1ZmZlciIsIGVlLT5yaW5nYnVmZmVyKTsK IAotCQlpZiAoKG9iaiA9IGVlLT5od3NfcGFnZSkpIHsKLQkJCXU2NCBod3Nfb2Zmc2V0ID0gb2Jq LT5ndHRfb2Zmc2V0OwotCQkJdTMyICpod3NfcGFnZSA9ICZvYmotPnBhZ2VzWzBdWzBdOworCQlw cmludF9lcnJvcl9vYmoobSwgJmRldl9wcml2LT5lbmdpbmVbaV0sCisJCQkJIkhXIFN0YXR1cyIs IGVlLT5od3NfcGFnZSk7CiAKLQkJCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKLQkJCQlo d3Nfb2Zmc2V0ICs9IExSQ19QUEhXU1BfUE4gKiBQQUdFX1NJWkU7Ci0JCQkJaHdzX3BhZ2UgPSAm b2JqLT5wYWdlc1tMUkNfUFBIV1NQX1BOXVswXTsKLQkJCX0KLQkJCWVycl9wcmludGYobSwgIiVz IC0tLSBIVyBTdGF0dXMgPSAweCUwOGxseFxuIiwKLQkJCQkgICBkZXZfcHJpdi0+ZW5naW5lW2ld Lm5hbWUsIGh3c19vZmZzZXQpOwotCQkJb2Zmc2V0ID0gMDsKLQkJCWZvciAoZWx0ID0gMDsgZWx0 IDwgUEFHRV9TSVpFLzE2OyBlbHQgKz0gNCkgewotCQkJCWVycl9wcmludGYobSwgIlslMDR4XSAl MDh4ICUwOHggJTA4eCAlMDh4XG4iLAotCQkJCQkgICBvZmZzZXQsCi0JCQkJCSAgIGh3c19wYWdl W2VsdF0sCi0JCQkJCSAgIGh3c19wYWdlW2VsdCsxXSwKLQkJCQkJICAgaHdzX3BhZ2VbZWx0KzJd LAotCQkJCQkgICBod3NfcGFnZVtlbHQrM10pOwotCQkJCW9mZnNldCArPSAxNjsKLQkJCX0KLQkJ fQorCQlwcmludF9lcnJvcl9vYmoobSwgJmRldl9wcml2LT5lbmdpbmVbaV0sCisJCQkJIkhXIGNv bnRleHQiLCBlZS0+Y3R4KTsKIAotCQlvYmogPSBlZS0+d2FfY3R4OwotCQlpZiAob2JqKSB7Ci0J CQl1NjQgd2FfY3R4X29mZnNldCA9IG9iai0+Z3R0X29mZnNldDsKLQkJCXUzMiAqd2FfY3R4X3Bh Z2UgPSAmb2JqLT5wYWdlc1swXVswXTsKLQkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSA9ICZkZXZfcHJpdi0+ZW5naW5lW1JDU107Ci0JCQl1MzIgd2FfY3R4X3NpemUgPSAoZW5naW5l LT53YV9jdHguaW5kaXJlY3RfY3R4LnNpemUgKwotCQkJCQkgICBlbmdpbmUtPndhX2N0eC5wZXJf Y3R4LnNpemUpOwotCi0JCQllcnJfcHJpbnRmKG0sICIlcyAtLS0gV0EgY3R4IGJhdGNoIGJ1ZmZl ciA9IDB4JTA4bGx4XG4iLAotCQkJCSAgIGRldl9wcml2LT5lbmdpbmVbaV0ubmFtZSwgd2FfY3R4 X29mZnNldCk7Ci0JCQlvZmZzZXQgPSAwOwotCQkJZm9yIChlbHQgPSAwOyBlbHQgPCB3YV9jdHhf c2l6ZTsgZWx0ICs9IDQpIHsKLQkJCQllcnJfcHJpbnRmKG0sICJbJTA0eF0gJTA4eCAlMDh4ICUw OHggJTA4eFxuIiwKLQkJCQkJICAgb2Zmc2V0LAotCQkJCQkgICB3YV9jdHhfcGFnZVtlbHQgKyAw XSwKLQkJCQkJICAgd2FfY3R4X3BhZ2VbZWx0ICsgMV0sCi0JCQkJCSAgIHdhX2N0eF9wYWdlW2Vs dCArIDJdLAotCQkJCQkgICB3YV9jdHhfcGFnZVtlbHQgKyAzXSk7Ci0JCQkJb2Zmc2V0ICs9IDE2 OwotCQkJfQotCQl9CisJCXByaW50X2Vycm9yX29iaihtLCAmZGV2X3ByaXYtPmVuZ2luZVtpXSwK KwkJCQkiV0EgY29udGV4dCIsIGVlLT53YV9jdHgpOwogCi0JCWlmICgob2JqID0gZWUtPmN0eCkp IHsKLQkJCWVycl9wcmludGYobSwgIiVzIC0tLSBIVyBDb250ZXh0ID0gMHglMDh4XG4iLAotCQkJ CSAgIGRldl9wcml2LT5lbmdpbmVbaV0ubmFtZSwKLQkJCQkgICBsb3dlcl8zMl9iaXRzKG9iai0+ Z3R0X29mZnNldCkpOwotCQkJcHJpbnRfZXJyb3Jfb2JqKG0sIG9iaik7Ci0JCX0KKwkJcHJpbnRf ZXJyb3Jfb2JqKG0sICZkZXZfcHJpdi0+ZW5naW5lW2ldLAorCQkJCSJXQSBiYXRjaGJ1ZmZlciIs IGVlLT53YV9iYXRjaGJ1ZmZlcik7CiAJfQogCi0JaWYgKChvYmogPSBlcnJvci0+c2VtYXBob3Jl KSkgewotCQllcnJfcHJpbnRmKG0sICJTZW1hcGhvcmUgcGFnZSA9IDB4JTA4eFxuIiwKLQkJCSAg IGxvd2VyXzMyX2JpdHMob2JqLT5ndHRfb2Zmc2V0KSk7Ci0JCWZvciAoZWx0ID0gMDsgZWx0IDwg UEFHRV9TSVpFLzE2OyBlbHQgKz0gNCkgewotCQkJZXJyX3ByaW50ZihtLCAiWyUwNHhdICUwOHgg JTA4eCAlMDh4ICUwOHhcbiIsCi0JCQkJICAgZWx0ICogNCwKLQkJCQkgICBvYmotPnBhZ2VzWzBd W2VsdF0sCi0JCQkJICAgb2JqLT5wYWdlc1swXVtlbHQrMV0sCi0JCQkJICAgb2JqLT5wYWdlc1sw XVtlbHQrMl0sCi0JCQkJICAgb2JqLT5wYWdlc1swXVtlbHQrM10pOwotCQl9Ci0JfQorCXByaW50 X2Vycm9yX29iaihtLCBOVUxMLCAiU2VtYXBob3JlcyIsIGVycm9yLT5zZW1hcGhvcmUpOwogCiAJ aWYgKGVycm9yLT5vdmVybGF5KQogCQlpbnRlbF9vdmVybGF5X3ByaW50X2Vycm9yX3N0YXRlKG0s IGVycm9yLT5vdmVybGF5KTsKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK