From: Matthew Auld Subject: [PATCH] drm/i915: include GTT page-size info in error state Date: Mon, 9 Sep 2019 18:16:46 +0100 Message-ID: <20190909171646.22090-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFDB089C1B for ; Mon, 9 Sep 2019 17:16:48 +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 SXQgbWlnaHQgcHJvdmUgdXNlZnVsIGluIHRoZSBmdXR1cmUgdG8ga25vdyBpZiB0aGUgdm1hIGlz IHV0aWxpc2luZwpodWdlLUdUVC1wYWdlcy4gUmVsYXRlZCB0byB0aGlzIGlzIHRoZSBHVFQgY2Fj aGUsIHdoZXJlIHRoZXJlIGlzIHNvbWUgSFcKInF1aXJraW5lc3MiIHdoZXJlIGl0IG11c3QgYmUg ZGlzYWJsZWQgaWYgdXNpbmcgMk0gcGFnZXMsIHNvIGluY2x1ZGUKdGhhdCBmb3IgZ29vZCBtZWFz dXJlLgoKU3VnZ2VzdGVkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51 az4KU2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgpD YzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvZ2VtL2k5MTVfZ2VtX29iamVjdF90eXBlcy5oIHwgIDEgLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyAgICAgICAgICAgIHwgMTAgKysrKysrKysrKwog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuaCAgICAgICAgICAgIHwgIDIgKysK IDMgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9vYmplY3RfdHlwZXMuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9vYmplY3RfdHlwZXMuaAppbmRleCAx M2I5ZGMwZTFhODkuLmE1NThlZGYxNWVjOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZ2VtL2k5MTVfZ2VtX29iamVjdF90eXBlcy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2dlbS9pOTE1X2dlbV9vYmplY3RfdHlwZXMuaApAQCAtMTYwLDcgKzE2MCw2IEBAIHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0IHsKIAkJc3RydWN0IHNnX3RhYmxlICpwYWdlczsKIAkJdm9pZCAq bWFwcGluZzsKIAotCQkvKiBUT0RPOiB3aGFjayBzb21lIG9mIHRoaXMgaW50byB0aGUgZXJyb3Ig c3RhdGUgKi8KIAkJc3RydWN0IGk5MTVfcGFnZV9zaXplcyB7CiAJCQkvKioKIAkJCSAqIFRoZSBz ZyBtYXNrIG9mIHRoZSBwYWdlcyBzZ190YWJsZS4gaS5lIHRoZSBtYXNrIG9mCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCAzY2NmN2ZkOTMwN2YuLjYzODRhMDZhYTViZiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC01NzUsNiArNTc1LDkgQEAg c3RhdGljIHZvaWQgcHJpbnRfZXJyb3Jfb2JqKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9i dWYgKm0sCiAJCQkgICBsb3dlcl8zMl9iaXRzKG9iai0+Z3R0X29mZnNldCkpOwogCX0KIAorCWlm IChvYmotPmd0dF9wYWdlX3NpemVzID4gSTkxNV9HVFRfUEFHRV9TSVpFXzRLKQorCQllcnJfcHJp bnRmKG0sICJndHRfcGFnZV9zaXplcyA9IDB4JTA4eFxuIiwgb2JqLT5ndHRfcGFnZV9zaXplcyk7 CisKIAllcnJfY29tcHJlc3Npb25fbWFya2VyKG0pOwogCWZvciAocGFnZSA9IDA7IHBhZ2UgPCBv YmotPnBhZ2VfY291bnQ7IHBhZ2UrKykgewogCQlpbnQgaSwgbGVuOwpAQCAtNzM1LDYgKzczOCw5 IEBAIHN0YXRpYyB2b2lkIF9fZXJyX3ByaW50X3RvX3NnbChzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jf c3RhdGVfYnVmICptLAogCWlmIChJU19HRU4obS0+aTkxNSwgNykpCiAJCWVycl9wcmludGYobSwg IkVSUl9JTlQ6IDB4JTA4eFxuIiwgZXJyb3ItPmVycl9pbnQpOwogCisJaWYgKElTX0dFTl9SQU5H RShtLT5pOTE1LCA4LCAxMSkpCisJCWVycl9wcmludGYobSwgIkdUVF9DQUNIRV9FTjogMHglMDh4 XG4iLCBlcnJvci0+Z3R0X2NhY2hlKTsKKwogCWZvciAoZWUgPSBlcnJvci0+ZW5naW5lOyBlZTsg ZWUgPSBlZS0+bmV4dCkKIAkJZXJyb3JfcHJpbnRfZW5naW5lKG0sIGVlLCBlcnJvci0+ZXBvY2gp OwogCkBAIC05ODUsNiArOTkxLDcgQEAgaTkxNV9lcnJvcl9vYmplY3RfY3JlYXRlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICppOTE1LAogCiAJZHN0LT5ndHRfb2Zmc2V0ID0gdm1hLT5ub2RlLnN0 YXJ0OwogCWRzdC0+Z3R0X3NpemUgPSB2bWEtPm5vZGUuc2l6ZTsKKwlkc3QtPmd0dF9wYWdlX3Np emVzID0gdm1hLT5wYWdlX3NpemVzLmd0dDsKIAlkc3QtPm51bV9wYWdlcyA9IG51bV9wYWdlczsK IAlkc3QtPnBhZ2VfY291bnQgPSAwOwogCWRzdC0+dW51c2VkID0gMDsKQEAgLTE1NTQsNiArMTU2 MSw5IEBAIHN0YXRpYyB2b2lkIGNhcHR1cmVfcmVnX3N0YXRlKHN0cnVjdCBpOTE1X2dwdV9zdGF0 ZSAqZXJyb3IpCiAJCWVycm9yLT5nYWNfZWNvID0gaW50ZWxfdW5jb3JlX3JlYWQodW5jb3JlLCBH QUNfRUNPX0JJVFMpOwogCX0KIAorCWlmIChJU19HRU5fUkFOR0UoaTkxNSwgOCwgMTEpKQorCQll cnJvci0+Z3R0X2NhY2hlID0gaW50ZWxfdW5jb3JlX3JlYWQodW5jb3JlLCBIU1dfR1RUX0NBQ0hF X0VOKTsKKwogCS8qIDQ6IEV2ZXJ5dGhpbmcgZWxzZSAqLwogCWlmIChJTlRFTF9HRU4oaTkxNSkg Pj0gMTEpIHsKIAkJZXJyb3ItPmllciA9IGludGVsX3VuY29yZV9yZWFkKHVuY29yZSwgR0VOOF9E RV9NSVNDX0lFUik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9l cnJvci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuaAppbmRleCBkZjlm NTc3NjY2MjYuLjYzY2YzODc0MTFlMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ncHVfZXJyb3IuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJv ci5oCkBAIC03NCw2ICs3NCw3IEBAIHN0cnVjdCBpOTE1X2dwdV9zdGF0ZSB7CiAJdTMyIGdhbV9l Y29jaGs7CiAJdTMyIGdhYl9jdGw7CiAJdTMyIGdmeF9tb2RlOworCXUzMiBndHRfY2FjaGU7CiAK IAl1MzIgbmZlbmNlOwogCXU2NCBmZW5jZVtJOTE1X01BWF9OVU1fRkVOQ0VTXTsKQEAgLTEyNyw2 ICsxMjgsNyBAQCBzdHJ1Y3QgaTkxNV9ncHVfc3RhdGUgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZXJy b3Jfb2JqZWN0IHsKIAkJCXU2NCBndHRfb2Zmc2V0OwogCQkJdTY0IGd0dF9zaXplOworCQkJdTMy IGd0dF9wYWdlX3NpemVzOwogCQkJaW50IG51bV9wYWdlczsKIAkJCWludCBwYWdlX2NvdW50Owog CQkJaW50IHVudXNlZDsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4