From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [RFC 13/37] drm/i915/guc: Improve action error reporting, add preemption debug Date: Mon, 23 Nov 2015 11:41:48 +0000 Message-ID: <1448278932-31551-14-git-send-email-John.C.Harrison@Intel.com> References: <1448278932-31551-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id F11566E544 for ; Mon, 23 Nov 2015 03:42:30 -0800 (PST) In-Reply-To: <1448278932-31551-1-git-send-email-John.C.Harrison@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 RnJvbTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KCkZvcjogVklaLTIw MjEKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgICAgICAgfCAyMCArKysr KysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMgfCAzMiArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Yy5oICAgICAgICAgICB8IDEyICsrKysrKysrKy0tCiAzIGZpbGVzIGNoYW5n ZWQsIDQ1IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kZWJ1Z2ZzLmMKaW5kZXggOWU4ZjYyNC4uZTkzNzJhYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kZWJ1Z2ZzLmMKQEAgLTI2OTMsNyArMjY5Myw3IEBAIHN0YXRpYyBpbnQgaTkxNV9ndWNfaW5m byhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJc3RydWN0IGk5MTVfZ3VjX2NsaWVu dCBwcmVlbXB0ID0ge307CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKIAllbnVtIGlu dGVsX3JpbmdfaWQgaTsKLQl1NjQgdG90YWwgPSAwOworCXU2NCB0b3RhbCA9IDAsIHByZWVtcHRz ID0gMDsKIAogCWlmICghSEFTX0dVQ19TQ0hFRChkZXZfcHJpdi0+ZGV2KSkKIAkJcmV0dXJuIDA7 CkBAIC0yNzE0LDE5ICsyNzE0LDI3IEBAIHN0YXRpYyBpbnQgaTkxNV9ndWNfaW5mbyhzdHJ1Y3Qg c2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJc3Bpbl91bmxvY2soJmRldl9wcml2LT5ndWMuaG9z dDJndWNfbG9jayk7CiAKIAlzZXFfcHJpbnRmKG0sICJHdUMgdG90YWwgYWN0aW9uIGNvdW50OiAl bGx1XG4iLCBndWMuYWN0aW9uX2NvdW50KTsKLQlzZXFfcHJpbnRmKG0sICJHdUMgYWN0aW9uIGZh aWx1cmUgY291bnQ6ICV1XG4iLCBndWMuYWN0aW9uX2ZhaWwpOwogCXNlcV9wcmludGYobSwgIkd1 QyBsYXN0IGFjdGlvbiBjb21tYW5kOiAweCV4XG4iLCBndWMuYWN0aW9uX2NtZCk7CiAJc2VxX3By aW50ZihtLCAiR3VDIGxhc3QgYWN0aW9uIHN0YXR1czogMHgleFxuIiwgZ3VjLmFjdGlvbl9zdGF0 dXMpOwotCXNlcV9wcmludGYobSwgIkd1QyBsYXN0IGFjdGlvbiBlcnJvciBjb2RlOiAlZFxuIiwg Z3VjLmFjdGlvbl9lcnIpOworCisJc2VxX3ByaW50ZihtLCAiR3VDIGFjdGlvbiBmYWlsdXJlIGNv dW50OiAldVxuIiwgZ3VjLmFjdGlvbl9mYWlsX2NvdW50KTsKKwlzZXFfcHJpbnRmKG0sICJHdUMg bGFzdCBmYWlsZWQgYWN0aW9uOiAweCV4XG4iLCBndWMuYWN0aW9uX2ZhaWxfY21kKTsKKwlzZXFf cHJpbnRmKG0sICJHdUMgbGFzdCBmYWlsZWQgc3RhdHVzOiAweCV4XG4iLCBndWMuYWN0aW9uX2Zh aWxfc3RhdHVzKTsKKwlzZXFfcHJpbnRmKG0sICJHdUMgbGFzdCBlcnJvciBjb2RlOiAlZFxuIiwg Z3VjLmFjdGlvbl9lcnIpOwogCiAJc2VxX3ByaW50ZihtLCAiXG5HdUMgc3VibWlzc2lvbnM6XG4i KTsKIAlmb3JfZWFjaF9yaW5nKHJpbmcsIGRldl9wcml2LCBpKSB7Ci0JCXNlcV9wcmludGYobSwg Ilx0JS0yNHM6ICUxMGxsdSwgbGFzdCBzZXFubyAweCUwOHggJTlkXG4iLAotCQkJcmluZy0+bmFt ZSwgZ3VjLnN1Ym1pc3Npb25zW2ldLAorCQlzZXFfcHJpbnRmKG0sICJcdCUtMjRzOiAlMTBsbHUs IGxhc3QgJS04cyAweCUwOHggJTlkXG4iLAorCQkJcmluZy0+bmFtZSwgZ3VjLnN1Ym1pc3Npb25z W2ldLCAic2Vxbm8iLAogCQkJZ3VjLmxhc3Rfc2Vxbm9baV0sIGd1Yy5sYXN0X3NlcW5vW2ldKTsK KwkJc2VxX3ByaW50ZihtLCAiXHQlLTI0czogJTEwdSwgbGFzdCAlLThzIDB4JTA4eCAlOWRcbiIs CisJCQkiICAgIHByZWVtcHRpb25zIiwgZ3VjLnByZWVtcHRpb25zW2ldLCAicHJlZW1wdCIsCisJ CQlndWMubGFzdF9wcmVlbXB0W2ldLCBndWMubGFzdF9wcmVlbXB0W2ldKTsKIAkJdG90YWwgKz0g Z3VjLnN1Ym1pc3Npb25zW2ldOworCQlwcmVlbXB0cyArPSBndWMucHJlZW1wdGlvbnNbaV07CiAJ fQotCXNlcV9wcmludGYobSwgIlx0JXM6ICVsbHVcbiIsICJUb3RhbCIsIHRvdGFsKTsKKwlzZXFf cHJpbnRmKG0sICJcdCVzOiAlMTBsbHVcbiIsICJUb3RhbCByZWd1bGFyIiwgdG90YWwpOworCXNl cV9wcmludGYobSwgIlx0JXM6ICUxMGxsdVxuIiwgIiAgICAgcHJlZW1wdHMiLCBwcmVlbXB0cyk7 CiAKIAlzZXFfcHJpbnRmKG0sICJcbkd1QyBleGVjYnVmIGNsaWVudCBAICVwOlxuIiwgZ3VjLmV4 ZWNidWZfY2xpZW50KTsKIAlpOTE1X2d1Y19jbGllbnRfaW5mbyhtLCBkZXZfcHJpdiwgJmNsaWVu dCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggNDAz NWFjNi4uMzhjNDMxZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNf c3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Np b24uYwpAQCAtNzgsOSArNzgsOCBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaG9zdDJndWNfYWN0aW9u X3Jlc3BvbnNlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIHN0YXRpYyBpbnQg aG9zdDJndWNfYWN0aW9uKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywgdTMyICpkYXRhLCB1MzIgbGVu KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1 Yyk7Ci0JdTMyIHN0YXR1czsKLQlpbnQgaTsKLQlpbnQgcmV0OworCXUzMiBzdGF0dXMsIHJlc3Bv bnNlOworCWludCByZXQsIGk7CiAKIAlpZiAoV0FSTl9PTihsZW4gPCAxIHx8IGxlbiA+IDE1KSkK IAkJcmV0dXJuIC1FSU5WQUw7CkBAIC0xMDEsNiArMTAwLDggQEAgc3RhdGljIGludCBob3N0Mmd1 Y19hY3Rpb24oc3RydWN0IGludGVsX2d1YyAqZ3VjLCB1MzIgKmRhdGEsIHUzMiBsZW4pCiAKIAkv KiBObyBIT1NUMkdVQyBjb21tYW5kIHNob3VsZCB0YWtlIGxvbmdlciB0aGFuIDEwbXMgKi8KIAly ZXQgPSB3YWl0X2Zvcl9hdG9taWMoaG9zdDJndWNfYWN0aW9uX3Jlc3BvbnNlKGRldl9wcml2LCAm c3RhdHVzKSwgMTApOworCXJlc3BvbnNlID0gSTkxNV9SRUFEKFNPRlRfU0NSQVRDSCgxNSkpOwor CWRldl9wcml2LT5ndWMuYWN0aW9uX3N0YXR1cyA9IHN0YXR1czsKIAlpZiAoc3RhdHVzICE9IEdV QzJIT1NUX1NUQVRVU19TVUNDRVNTKSB7CiAJCS8qCiAJCSAqIEVpdGhlciB0aGUgR3VDIGV4cGxp Y2l0bHkgcmV0dXJuZWQgYW4gZXJyb3IgKHdoaWNoCkBAIC0xMTAsMTUgKzExMSwxNSBAQCBzdGF0 aWMgaW50IGhvc3QyZ3VjX2FjdGlvbihzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIHUzMiAqZGF0YSwg dTMyIGxlbikKIAkJaWYgKHJldCAhPSAtRVRJTUVET1VUKQogCQkJcmV0ID0gLUVJTzsKIAotCQlE Uk1fRVJST1IoIkdVQzogaG9zdDJndWMgYWN0aW9uIDB4JVggZmFpbGVkLiByZXQ9JWQgIgorCQlE Uk1fRVJST1IoIkd1QzogaG9zdDJndWMgYWN0aW9uIDB4JVggZmFpbGVkLiByZXQ9JWQgIgogCQkJ CSJzdGF0dXM9MHglMDhYIHJlc3BvbnNlPTB4JTA4WFxuIiwKLQkJCQlkYXRhWzBdLCByZXQsIHN0 YXR1cywKLQkJCQlJOTE1X1JFQUQoU09GVF9TQ1JBVENIKDE1KSkpOworCQkJCWRhdGFbMF0sIHJl dCwgc3RhdHVzLCByZXNwb25zZSk7CiAKLQkJZGV2X3ByaXYtPmd1Yy5hY3Rpb25fZmFpbCArPSAx OworCQlkZXZfcHJpdi0+Z3VjLmFjdGlvbl9mYWlsX2NvdW50ICs9IDE7CisJCWRldl9wcml2LT5n dWMuYWN0aW9uX2ZhaWxfY21kID0gZGF0YVswXTsKKwkJZGV2X3ByaXYtPmd1Yy5hY3Rpb25fZmFp bF9zdGF0dXMgPSBzdGF0dXM7CiAJCWRldl9wcml2LT5ndWMuYWN0aW9uX2VyciA9IHJldDsKIAl9 Ci0JZGV2X3ByaXYtPmd1Yy5hY3Rpb25fc3RhdHVzID0gc3RhdHVzOwogCiAJc3Bpbl91bmxvY2so JmRldl9wcml2LT5ndWMuaG9zdDJndWNfbG9jayk7CiAJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9w dXQoZGV2X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwpAQCAtMTQxLDcgKzE0Miw3IEBAIGhvc3QyZ3Vj X3ByZWVtcHQoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50LAogCXN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmID0gY3R4LT5lbmdpbmVbZW5naW5lX2lkXS5yaW5nYnVmOwogCXN0 cnVjdCBndWNfcHJvY2Vzc19kZXNjICpkZXNjOwogCXZvaWQgKmJhc2U7Ci0JdTMyIGRhdGFbN107 CisJdTMyIGRhdGFbOF07CiAJaW50IHJldDsKIAogCWlmIChXQVJOX09OKCFjdHhfb2JqIHx8ICFy aW5nYnVmKSkKQEAgLTY3Miw4ICs2NzMsMTcgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3Qg aTkxNV9ndWNfY2xpZW50ICpjbGllbnQsCiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmY2xpZW50 LT53cV9sb2NrLCBmbGFncyk7CiAKIAlzcGluX2xvY2soJmd1Yy0+aG9zdDJndWNfbG9jayk7Ci0J Z3VjLT5zdWJtaXNzaW9uc1tyaW5nX2lkXSArPSAxOwotCWd1Yy0+bGFzdF9zZXFub1tyaW5nX2lk XSA9IHJxLT5zZXFubzsKKwlpZiAocHJlZW1wdGl2ZSkgeworCQlndWMtPnByZWVtcHRpb25zW3Jp bmdfaWRdICs9IDE7CisJCWd1Yy0+bGFzdF9wcmVlbXB0W3JpbmdfaWRdID0gcnEtPnNlcW5vOwor CQlpZiAocV9yZXQpCisJCQlndWMtPnByZWVtcHRfZmFpbHVyZXNbcmluZ19pZF0gKz0gMTsKKwl9 IGVsc2UgeworCQlndWMtPnN1Ym1pc3Npb25zW3JpbmdfaWRdICs9IDE7CisJCWd1Yy0+bGFzdF9z ZXFub1tyaW5nX2lkXSA9IHJxLT5zZXFubzsKKwkJaWYgKHFfcmV0KQorCQkJZ3VjLT5mYWlsdXJl c1tyaW5nX2lkXSArPSAxOworCX0KIAlzcGluX3VubG9jaygmZ3VjLT5ob3N0Mmd1Y19sb2NrKTsK IAogCXJldHVybiBxX3JldDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggZjU2ZTBkOS4u MDc5MzcxMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTEwNSwxMSArMTA1LDE5IEBA IHN0cnVjdCBpbnRlbF9ndWMgewogCXVpbnQ2NF90IGFjdGlvbl9jb3VudDsJCS8qIFRvdGFsIGNv bW1hbmRzIGlzc3VlZAkqLwogCXVpbnQzMl90IGFjdGlvbl9jbWQ7CQkvKiBMYXN0IGNvbW1hbmQg d29yZAkJKi8KIAl1aW50MzJfdCBhY3Rpb25fc3RhdHVzOwkJLyogTGFzdCByZXR1cm4gc3RhdHVz CQkqLwotCXVpbnQzMl90IGFjdGlvbl9mYWlsOwkJLyogVG90YWwgbnVtYmVyIG9mIGZhaWx1cmVz CSovCi0JaW50MzJfdCBhY3Rpb25fZXJyOwkJLyogTGFzdCBlcnJvciBjb2RlCQkqLwogCisJdWlu dDMyX3QgYWN0aW9uX2ZhaWxfY291bnQ7CS8qIFRvdGFsIG51bWJlciBvZiBmYWlsdXJlcwkqLwor CXVpbnQzMl90IGFjdGlvbl9mYWlsX2NtZDsJLyogTGFzdCBmYWlsZWQgY29tbWFuZAkJKi8KKwl1 aW50MzJfdCBhY3Rpb25fZmFpbF9zdGF0dXM7CS8qIExhc3QgYmFkIHJldHVybiBzdGF0dXMJKi8K KwlpbnQzMl90IGFjdGlvbl9lcnI7CQkvKiBMYXN0IChub256ZXJvKSBlcnJvciBjb2RlCSovCisK KwkvKiBTdWJtaXNzaW9uIHN0YXR1cyAmIHN0YXRpc3RpY3MgKi8KIAl1aW50NjRfdCBzdWJtaXNz aW9uc1tJOTE1X05VTV9SSU5HU107CiAJdWludDMyX3QgbGFzdF9zZXFub1tJOTE1X05VTV9SSU5H U107CisJdWludDMyX3QgZmFpbHVyZXNbSTkxNV9OVU1fUklOR1NdOworCXVpbnQzMl90IHByZWVt cHRpb25zW0k5MTVfTlVNX1JJTkdTXTsKKwl1aW50MzJfdCBsYXN0X3ByZWVtcHRbSTkxNV9OVU1f UklOR1NdOworCXVpbnQzMl90IHByZWVtcHRfZmFpbHVyZXNbSTkxNV9OVU1fUklOR1NdOwogfTsK IAogLyogaW50ZWxfZ3VjX2xvYWRlci5jICovCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK