From: Mika Kuoppala Subject: [PATCH] drm/i915: Print error state times relative to capture Date: Fri, 27 Apr 2018 18:12:48 +0300 Message-ID: <20180427151248.31699-1-mika.kuoppala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id E08416E953 for ; Fri, 27 Apr 2018 15:12:57 +0000 (UTC) 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 VXNpbmcgcGxhaW4gamlmZmllcyBpbiBlcnJvciBzdGF0ZSBvdXRwdXQgbWFrZXMgdGhlIG91dHB1 dAp0aW1lIGRpZmZlcmVuY2VzIHJlbGF0aXZlIHRvIHRoZSBjdXJyZW50IHN5c3RlbSB0aW1lLiBU aGlzCmlzIHdyb25nIGFzIGl0IG1ha2VzIG91dHB1dCB0aW1lIGRpZmZlcmVuY2VzIGRlcGVuZGVu dApvZiB3aGVuIHRoZSBlcnJvciBzdGF0ZSBpcyBwcmludGVkIHJhdGhlciB0aGFuIHdoZW4gaXQg aXMKY2FwdHVyZWQuCgpTdG9yZSBjYXB0dXJlIGppZmZpZXMgaW50byBlcnJvciBzdGF0ZSBhbmQg dXNlIGl0CndoZW4gb3V0cHV0dGluZyB0aGUgc3RhdGUgdG8gZml4IHRpbWUgZGlmZmVyZW5jZXMg b3V0cHV0LgoKdjI6IHVzZSBlbmdpbmUgdGltZXN0YW1wIGFzIGVwb2NoLCBvdXRwdXQgZm9ybWF0 dGluZyAoQ2hyaXMpCgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ ClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgfCA0OCArKysr KysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ncHVfZXJyb3IuaCB8ICAyICsrCiAyIGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyks IDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n cHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXgg NjcxZmZhMzc2MTRlLi5mY2E1NTA5NTRiZTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVf ZXJyb3IuYwpAQCAtNDAzLDE2ICs0MDMsMTcgQEAgc3RhdGljIGNvbnN0IGNoYXIgKmJhbm5hYmxl KGNvbnN0IHN0cnVjdCBkcm1faTkxNV9lcnJvcl9jb250ZXh0ICpjdHgpCiB9CiAKIHN0YXRpYyB2 b2lkIGVycm9yX3ByaW50X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAq bSwKKwkJCQljb25zdCBzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUgKmVycm9yLAogCQkJCWNvbnN0IGNo YXIgKnByZWZpeCwKIAkJCQljb25zdCBzdHJ1Y3QgZHJtX2k5MTVfZXJyb3JfcmVxdWVzdCAqZXJx KQogewogCWlmICghZXJxLT5zZXFubykKIAkJcmV0dXJuOwogCi0JZXJyX3ByaW50ZihtLCAiJXMg cGlkICVkLCBiYW4gc2NvcmUgJWQsIHNlcW5vICU4eDolMDh4LCBwcmlvICVkLCBlbWl0dGVkICVk bXMgYWdvLCBoZWFkICUwOHgsIHRhaWwgJTA4eFxuIiwKKwllcnJfcHJpbnRmKG0sICIlcyBwaWQg JWQsIGJhbiBzY29yZSAlZCwgc2Vxbm8gJTh4OiUwOHgsIHByaW8gJWQsIGVtaXR0ZWQgJWRtcywg aGVhZCAlMDh4LCB0YWlsICUwOHhcbiIsCiAJCSAgIHByZWZpeCwgZXJxLT5waWQsIGVycS0+YmFu X3Njb3JlLAogCQkgICBlcnEtPmNvbnRleHQsIGVycS0+c2Vxbm8sIGVycS0+c2NoZWRfYXR0ci5w cmlvcml0eSwKLQkJICAgamlmZmllc190b19tc2VjcyhqaWZmaWVzIC0gZXJxLT5qaWZmaWVzKSwK KwkJICAgamlmZmllc190b19tc2VjcyhlcnEtPmppZmZpZXMgLSBlcnJvci0+ZXBvY2gpLAogCQkg ICBlcnEtPmhlYWQsIGVycS0+dGFpbCk7CiB9CiAKQEAgLTQyNyw4ICs0MjgsMTAgQEAgc3RhdGlj IHZvaWQgZXJyb3JfcHJpbnRfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVm ICptLAogfQogCiBzdGF0aWMgdm9pZCBlcnJvcl9wcmludF9lbmdpbmUoc3RydWN0IGRybV9pOTE1 X2Vycm9yX3N0YXRlX2J1ZiAqbSwKLQkJCSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfZXJy b3JfZW5naW5lICplZSkKKwkJCSAgICAgICBjb25zdCBzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUgKmVy cm9yLAorCQkJICAgICAgIGNvbnN0IGludCBlbmdpbmVfbikKIHsKKwljb25zdCBzdHJ1Y3QgZHJt X2k5MTVfZXJyb3JfZW5naW5lICplZSA9ICZlcnJvci0+ZW5naW5lW2VuZ2luZV9uXTsKIAlpbnQg bjsKIAogCWVycl9wcmludGYobSwgIiVzIGNvbW1hbmQgc3RyZWFtOlxuIiwKQEAgLTQ5NywxNCAr NTAwLDE4IEBAIHN0YXRpYyB2b2lkIGVycm9yX3ByaW50X2VuZ2luZShzdHJ1Y3QgZHJtX2k5MTVf ZXJyb3Jfc3RhdGVfYnVmICptLAogCWVycl9wcmludGYobSwgIiAgaGFuZ2NoZWNrIHN0YWxsOiAl c1xuIiwgeWVzbm8oZWUtPmhhbmdjaGVja19zdGFsbGVkKSk7CiAJZXJyX3ByaW50ZihtLCAiICBo YW5nY2hlY2sgYWN0aW9uOiAlc1xuIiwKIAkJICAgaGFuZ2NoZWNrX2FjdGlvbl90b19zdHIoZWUt PmhhbmdjaGVja19hY3Rpb24pKTsKLQllcnJfcHJpbnRmKG0sICIgIGhhbmdjaGVjayBhY3Rpb24g dGltZXN0YW1wOiAlbHUsICV1IG1zIGFnb1xuIiwKKworCWVycl9wcmludGYobSwgIiAgaGFuZ2No ZWNrIGFjdGlvbiB0aW1lc3RhbXA6ICVkbXMgKCVsdSVzKVxuIiwKKwkJICAgamlmZmllc190b19t c2VjcyhlZS0+aGFuZ2NoZWNrX3RpbWVzdGFtcCAtCisJCQkJICAgIGVycm9yLT5lcG9jaCksCiAJ CSAgIGVlLT5oYW5nY2hlY2tfdGltZXN0YW1wLAotCQkgICBqaWZmaWVzX3RvX21zZWNzKGppZmZp ZXMgLSBlZS0+aGFuZ2NoZWNrX3RpbWVzdGFtcCkpOworCQkgICBlZS0+aGFuZ2NoZWNrX3RpbWVz dGFtcCA9PSBlcnJvci0+ZXBvY2ggPyAiOyBlcG9jaCIgOiAiIik7CisKIAllcnJfcHJpbnRmKG0s ICIgIGVuZ2luZSByZXNldCBjb3VudDogJXVcbiIsIGVlLT5yZXNldF9jb3VudCk7CiAKIAlmb3Ig KG4gPSAwOyBuIDwgZWUtPm51bV9wb3J0czsgbisrKSB7CiAJCWVycl9wcmludGYobSwgIiAgRUxT UFslZF06Iiwgbik7Ci0JCWVycm9yX3ByaW50X3JlcXVlc3QobSwgIiAiLCAmZWUtPmV4ZWNsaXN0 W25dKTsKKwkJZXJyb3JfcHJpbnRfcmVxdWVzdChtLCBlcnJvciwgIiAiLCAmZWUtPmV4ZWNsaXN0 W25dKTsKIAl9CiAKIAllcnJvcl9wcmludF9jb250ZXh0KG0sICIgIEFjdGl2ZSBjb250ZXh0OiAi LCAmZWUtPmNvbnRleHQpOwpAQCAtNjUwLDYgKzY1NywxMSBAQCBpbnQgaTkxNV9lcnJvcl9zdGF0 ZV90b19zdHIoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAl0cyA9IGt0aW1l X3RvX3RpbWVzcGVjNjQoZXJyb3ItPnVwdGltZSk7CiAJZXJyX3ByaW50ZihtLCAiVXB0aW1lOiAl bGxkIHMgJWxkIHVzXG4iLAogCQkgICAoczY0KXRzLnR2X3NlYywgdHMudHZfbnNlYyAvIE5TRUNf UEVSX1VTRUMpOworCWVycl9wcmludGYobSwgIkVwb2NoOiAlbHUgamlmZmllcyAoJXUgSFopXG4i LCBlcnJvci0+ZXBvY2gsIEhaKTsKKwllcnJfcHJpbnRmKG0sICJDYXB0dXJlOiAlbHUgamlmZmll czsgJWQgbXMgYWdvLCAlZCBtcyBhZnRlciBlcG9jaFxuIiwKKwkJICAgZXJyb3ItPmNhcHR1cmUs CisJCSAgIGppZmZpZXNfdG9fbXNlY3MoamlmZmllcyAtIGVycm9yLT5jYXB0dXJlKSwKKwkJICAg amlmZmllc190b19tc2VjcyhlcnJvci0+Y2FwdHVyZSAtIGVycm9yLT5lcG9jaCkpOwogCiAJZm9y IChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZXJyb3ItPmVuZ2luZSk7IGkrKykgewogCQlpZiAoZXJy b3ItPmVuZ2luZVtpXS5oYW5nY2hlY2tfc3RhbGxlZCAmJgpAQCAtNzEwLDcgKzcyMiw3IEBAIGlu dCBpOTE1X2Vycm9yX3N0YXRlX3RvX3N0cihzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVm ICptLAogCiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZXJyb3ItPmVuZ2luZSk7IGkrKykg ewogCQlpZiAoZXJyb3ItPmVuZ2luZVtpXS5lbmdpbmVfaWQgIT0gLTEpCi0JCQllcnJvcl9wcmlu dF9lbmdpbmUobSwgJmVycm9yLT5lbmdpbmVbaV0pOworCQkJZXJyb3JfcHJpbnRfZW5naW5lKG0s IGVycm9yLCBpKTsKIAl9CiAKIAlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShlcnJvci0+YWN0 aXZlX3ZtKTsgaSsrKSB7CkBAIC03NjksNyArNzgxLDggQEAgaW50IGk5MTVfZXJyb3Jfc3RhdGVf dG9fc3RyKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJCQkJICAgZGV2X3By aXYtPmVuZ2luZVtpXS0+bmFtZSwKIAkJCQkgICBlZS0+bnVtX3JlcXVlc3RzKTsKIAkJCWZvciAo aiA9IDA7IGogPCBlZS0+bnVtX3JlcXVlc3RzOyBqKyspCi0JCQkJZXJyb3JfcHJpbnRfcmVxdWVz dChtLCAiICIsICZlZS0+cmVxdWVzdHNbal0pOworCQkJCWVycm9yX3ByaW50X3JlcXVlc3QobSwg ZXJyb3IsICIgIiwKKwkJCQkJCSAgICAmZWUtPnJlcXVlc3RzW2pdKTsKIAkJfQogCiAJCWlmIChJ U19FUlIoZWUtPndhaXRlcnMpKSB7CkBAIC0xNzM1LDYgKzE3NDgsMjIgQEAgc3RhdGljIHZvaWQg Y2FwdHVyZV9wYXJhbXMoc3RydWN0IGk5MTVfZ3B1X3N0YXRlICplcnJvcikKICN1bmRlZiBEVVAK IH0KIAorc3RhdGljIHVuc2lnbmVkIGxvbmcgY2FwdHVyZV9maW5kX2Vwb2NoKGNvbnN0IHN0cnVj dCBpOTE1X2dwdV9zdGF0ZSAqZXJyb3IpCit7CisJdW5zaWduZWQgbG9uZyBlcG9jaCA9IGVycm9y LT5jYXB0dXJlOworCWludCBpOworCisJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZXJyb3It PmVuZ2luZSk7IGkrKykgeworCQljb25zdCBzdHJ1Y3QgZHJtX2k5MTVfZXJyb3JfZW5naW5lICpl ZSA9ICZlcnJvci0+ZW5naW5lW2ldOworCisJCWlmIChlZS0+aGFuZ2NoZWNrX3N0YWxsZWQgJiYK KwkJICAgIHRpbWVfYmVmb3JlKGVlLT5oYW5nY2hlY2tfdGltZXN0YW1wLCBlcG9jaCkpCisJCQll cG9jaCA9IGVlLT5oYW5nY2hlY2tfdGltZXN0YW1wOworCX0KKworCXJldHVybiBlcG9jaDsKK30K Kwogc3RhdGljIGludCBjYXB0dXJlKHZvaWQgKmRhdGEpCiB7CiAJc3RydWN0IGk5MTVfZ3B1X3N0 YXRlICplcnJvciA9IGRhdGE7CkBAIC0xNzQzLDYgKzE3NzIsNyBAQCBzdGF0aWMgaW50IGNhcHR1 cmUodm9pZCAqZGF0YSkKIAllcnJvci0+Ym9vdHRpbWUgPSBrdGltZV9nZXRfYm9vdHRpbWUoKTsK IAllcnJvci0+dXB0aW1lID0ga3RpbWVfc3ViKGt0aW1lX2dldCgpLAogCQkJCSAgZXJyb3ItPmk5 MTUtPmd0Lmxhc3RfaW5pdF90aW1lKTsKKwllcnJvci0+Y2FwdHVyZSA9IGppZmZpZXM7CiAKIAlj YXB0dXJlX3BhcmFtcyhlcnJvcik7CiAJY2FwdHVyZV9nZW5fc3RhdGUoZXJyb3IpOwpAQCAtMTc1 Niw2ICsxNzg2LDggQEAgc3RhdGljIGludCBjYXB0dXJlKHZvaWQgKmRhdGEpCiAJZXJyb3ItPm92 ZXJsYXkgPSBpbnRlbF9vdmVybGF5X2NhcHR1cmVfZXJyb3Jfc3RhdGUoZXJyb3ItPmk5MTUpOwog CWVycm9yLT5kaXNwbGF5ID0gaW50ZWxfZGlzcGxheV9jYXB0dXJlX2Vycm9yX3N0YXRlKGVycm9y LT5pOTE1KTsKIAorCWVycm9yLT5lcG9jaCA9IGNhcHR1cmVfZmluZF9lcG9jaChlcnJvcik7CisK IAlyZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n cHVfZXJyb3IuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmgKaW5kZXgg NWQ2ZmRjYmMwOTJjLi4wYWNjZDJlZDcyZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3B1X2Vycm9yLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVf ZXJyb3IuaApAQCAtMzEsNiArMzEsOCBAQCBzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUgewogCWt0aW1l X3QgdGltZTsKIAlrdGltZV90IGJvb3R0aW1lOwogCWt0aW1lX3QgdXB0aW1lOworCXVuc2lnbmVk IGxvbmcgY2FwdHVyZTsKKwl1bnNpZ25lZCBsb25nIGVwb2NoOwogCiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmk5MTU7CiAKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==