From: Michel Thierry Subject: [PATCH 12/16] drm/i915/gen8: Add ppgtt info and debug_dump Date: Tue, 26 May 2015 15:21:19 +0100 Message-ID: <1432650084-24491-13-git-send-email-michel.thierry@intel.com> References: <1432650084-24491-1-git-send-email-michel.thierry@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 ESMTP id 9C5AC720EA for ; Tue, 26 May 2015 07:21:32 -0700 (PDT) In-Reply-To: <1432650084-24491-1-git-send-email-michel.thierry@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 Cc: akash.goel@intel.com List-Id: intel-gfx@lists.freedesktop.org djI6IENsZWFuIHVwIHBhdGNoIGFmdGVyIHJlYmFzZXMuCnYzOiBnZW44X2R1bXBfcHBndHQgZm9y IDMyYiBhbmQgNDhiIFBQR1RULgp2NDogVXNlIHVzZWRfcG1sNGVzL3BkcGVzIChBa2FzaCkuCgpT aWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ClNpZ25lZC1vZmYt Ynk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ICh2MispCi0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgfCAxOCArKysrLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCA4OCArKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDk4IGluc2VydGlvbnMoKyksIDggZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCBmZWNlOTIyLi5j MjRmNTA2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMjIyNyw3ICsyMjI3 LDYgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0J c3RydWN0IGRybV9maWxlICpmaWxlOwogCWludCBpOwogCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+ Z2VuID09IDYpCkBAIC0yMjUwLDEzICsyMjQ5LDYgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9p bmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcHBndHQt PmRlYnVnX2R1bXAocHBndHQsIG0pOwogCX0KIAotCWxpc3RfZm9yX2VhY2hfZW50cnlfcmV2ZXJz ZShmaWxlLCAmZGV2LT5maWxlbGlzdCwgbGhlYWQpIHsKLQkJc3RydWN0IGRybV9pOTE1X2ZpbGVf cHJpdmF0ZSAqZmlsZV9wcml2ID0gZmlsZS0+ZHJpdmVyX3ByaXY7Ci0KLQkJc2VxX3ByaW50Ziht LCAicHJvYzogJXNcbiIsCi0JCQkgICBnZXRfcGlkX3Rhc2soZmlsZS0+cGlkLCBQSURUWVBFX1BJ RCktPmNvbW0pOwotCQlpZHJfZm9yX2VhY2goJmZpbGVfcHJpdi0+Y29udGV4dF9pZHIsIHBlcl9m aWxlX2N0eCwgbSk7Ci0JfQogCXNlcV9wcmludGYobSwgIkVDT0NISzogMHglMDh4XG4iLCBJOTE1 X1JFQUQoR0FNX0VDT0NISykpOwogfQogCkBAIC0yMjY1LDYgKzIyNTcsNyBAQCBzdGF0aWMgaW50 IGk5MTVfcHBndHRfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJc3RydWN0 IGRybV9pbmZvX25vZGUgKm5vZGUgPSBtLT5wcml2YXRlOwogCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSBub2RlLT5taW5vci0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGRybV9maWxlICpmaWxlOwogCiAJaW50IHJl dCA9IG11dGV4X2xvY2tfaW50ZXJydXB0aWJsZSgmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCWlmIChy ZXQpCkBAIC0yMjc2LDYgKzIyNjksMTUgQEAgc3RhdGljIGludCBpOTE1X3BwZ3R0X2luZm8oc3Ry dWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+ Z2VuID49IDYpCiAJCWdlbjZfcHBndHRfaW5mbyhtLCBkZXYpOwogCisJbGlzdF9mb3JfZWFjaF9l bnRyeV9yZXZlcnNlKGZpbGUsICZkZXYtPmZpbGVsaXN0LCBsaGVhZCkgeworCQlzdHJ1Y3QgZHJt X2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXYgPSBmaWxlLT5kcml2ZXJfcHJpdjsKKworCQlz ZXFfcHJpbnRmKG0sICJcbnByb2M6ICVzXG4iLAorCQkJICAgZ2V0X3BpZF90YXNrKGZpbGUtPnBp ZCwgUElEVFlQRV9QSUQpLT5jb21tKTsKKwkJaWRyX2Zvcl9lYWNoKCZmaWxlX3ByaXYtPmNvbnRl eHRfaWRyLCBwZXJfZmlsZV9jdHgsCisJCQkgICAgICh2b2lkICopKHVuc2lnbmVkIGxvbmcpbSk7 CisJfQorCiAJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOwogCW11dGV4X3VubG9jaygm ZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4 IGRmMzdjODQuLmI1NzY5NWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0z NjUsNiArMzY1LDkzIEBAIHN0YXRpYyB2b2lkIHVubWFwX2FuZF9mcmVlX3B0KHN0cnVjdCBpOTE1 X3BhZ2VfdGFibGUgKnB0LAogCWtmcmVlKHB0KTsKIH0KIAorc3RhdGljIHZvaWQgZ2VuOF9kdW1w X3BkcChzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAsCisJCQkgIHVpbnQ2 NF90IHN0YXJ0LCB1aW50NjRfdCBsZW5ndGgsCisJCQkgIGdlbjhfcHRlX3Qgc2NyYXRjaF9wdGUs CisJCQkgIHN0cnVjdCBzZXFfZmlsZSAqbSkKK3sKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9y eSAqcGQ7CisJdWludDY0X3QgdGVtcDsKKwl1aW50MzJfdCBwZHBlOworCisJZ2VuOF9mb3JfZWFj aF9wZHBlKHBkLCBwZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKKwkJc3RydWN0IGk5 MTVfcGFnZV90YWJsZSAqcHQ7CisJCXVpbnQ2NF90IHBkX2xlbiA9IGxlbmd0aDsKKwkJdWludDY0 X3QgcGRfc3RhcnQgPSBzdGFydDsKKwkJdWludDMyX3QgcGRlOworCisJCWlmICghcGQpCisJCQlj b250aW51ZTsKKworCQlpZighdGVzdF9iaXQocGRwZSwgcGRwLT51c2VkX3BkcGVzKSkKKwkJCWNv bnRpbnVlOworCisJCXNlcV9wcmludGYobSwgIlx0UERQRSAjJWRcbiIsIHBkcGUpOworCQlnZW44 X2Zvcl9lYWNoX3BkZShwdCwgcGQsIHBkX3N0YXJ0LCBwZF9sZW4sIHRlbXAsIHBkZSkgeworCQkJ dWludDMyX3QgIHB0ZTsKKwkJCWdlbjhfcHRlX3QgKnB0X3ZhZGRyOworCisJCQlpZiAoIXB0KQor CQkJCWNvbnRpbnVlOworCisJCQlwdF92YWRkciA9IGttYXBfYXRvbWljKHB0LT5wYWdlKTsKKwkJ CWZvciAocHRlID0gMDsgcHRlIDwgR0VOOF9QVEVTOyBwdGUrPTQpIHsKKwkJCQl1aW50NjRfdCB2 YSA9CisJCQkJCShwZHBlIDw8IEdFTjhfUERQRV9TSElGVCkgfAorCQkJCQkocGRlIDw8IEdFTjhf UERFX1NISUZUKSB8CisJCQkJCShwdGUgPDwgR0VOOF9QVEVfU0hJRlQpOworCQkJCWludCBpOwor CQkJCWJvb2wgZm91bmQgPSBmYWxzZTsKKwkJCQlmb3IgKGkgPSAwOyBpIDwgNDsgaSsrKQorCQkJ CQlpZiAocHRfdmFkZHJbcHRlICsgaV0gIT0gc2NyYXRjaF9wdGUpCisJCQkJCQlmb3VuZCA9IHRy dWU7CisJCQkJaWYgKCFmb3VuZCkKKwkJCQkJY29udGludWU7CisKKwkJCQlzZXFfcHJpbnRmKG0s ICJcdFx0MHglbGx4IFslMDNkLCUwM2QsJTA0ZF06ID0iLCB2YSwgcGRwZSwgcGRlLCBwdGUpOwor CQkJCWZvciAoaSA9IDA7IGkgPCA0OyBpKyspIHsKKwkJCQkJaWYgKHB0X3ZhZGRyW3B0ZSArIGld ICE9IHNjcmF0Y2hfcHRlKQorCQkJCQkJc2VxX3ByaW50ZihtLCAiICVsbHgiLCBwdF92YWRkcltw dGUgKyBpXSk7CisJCQkJCWVsc2UKKwkJCQkJCXNlcV9wdXRzKG0sICIgIFNDUkFUQ0ggIik7CisJ CQkJfQorCQkJCXNlcV9wdXRzKG0sICJcbiIpOworCQkJfQorCQkJa3VubWFwX2F0b21pYyhwdF92 YWRkcik7CisJCX0KKwl9Cit9CisKK3N0YXRpYyB2b2lkIGdlbjhfZHVtcF9wcGd0dChzdHJ1Y3Qg aTkxNV9od19wcGd0dCAqcHBndHQsIHN0cnVjdCBzZXFfZmlsZSAqbSkKK3sKKwl1aW50NjRfdCBz dGFydCA9IHBwZ3R0LT5iYXNlLnN0YXJ0OworCXVpbnQ2NF90IGxlbmd0aCA9IHBwZ3R0LT5iYXNl LnRvdGFsOworCWdlbjhfcHRlX3Qgc2NyYXRjaF9wdGUgPSBnZW44X3B0ZV9lbmNvZGUocHBndHQt PmJhc2Uuc2NyYXRjaC5hZGRyLAorCQkJCQkJIEk5MTVfQ0FDSEVfTExDLCB0cnVlKTsKKworCWlm ICghVVNFU19GVUxMXzQ4QklUX1BQR1RUKHZtLT5kZXYpKSB7CisJCWdlbjhfZHVtcF9wZHAoJnBw Z3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgsIHNjcmF0Y2hfcHRlLCBtKTsKKwl9IGVsc2UgeworCQl1 aW50NjRfdCB0ZW1wbDQsIHBtbDRlOworCQlzdHJ1Y3QgaTkxNV9wbWw0ICpwbWw0ID0gJnBwZ3R0 LT5wbWw0OworCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHA7CisKKwkJ Z2VuOF9mb3JfZWFjaF9wbWw0ZShwZHAsIHBtbDQsIHN0YXJ0LCBsZW5ndGgsIHRlbXBsNCwgcG1s NGUpIHsKKwkJCXVpbnQ2NF90IHBkcF9sZW4gPSBsZW5ndGg7CisJCQl1aW50NjRfdCBwZHBfc3Rh cnQgPSBzdGFydDsKKworCQkJaWYgKCFwZHApCisJCQkJY29udGludWU7CisKKwkJCWlmICghdGVz dF9iaXQocG1sNGUsIHBtbDQtPnVzZWRfcG1sNGVzKSkKKwkJCQljb250aW51ZTsKKworCQkJc2Vx X3ByaW50ZihtLCAiICAgIFBNTDRFICMlbGx1XG4iLCBwbWw0ZSk7CisJCQlnZW44X2R1bXBfcGRw KHBkcCwgcGRwX3N0YXJ0LCBwZHBfbGVuLCBzY3JhdGNoX3B0ZSwgbSk7CisJCX0KKwl9Cit9CisK IHN0YXRpYyBzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlICphbGxvY19wdF9zaW5nbGUoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlICpwdDsKQEAgLTEzODQs NiArMTQ3MSw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3Bw Z3R0ICpwcGd0dCkKIAlwcGd0dC0+YmFzZS5jbGVhcl9yYW5nZSA9IGdlbjhfcHBndHRfY2xlYXJf cmFuZ2U7CiAJcHBndHQtPmJhc2UudW5iaW5kX3ZtYSA9IHBwZ3R0X3VuYmluZF92bWE7CiAJcHBn dHQtPmJhc2UuYmluZF92bWEgPSBwcGd0dF9iaW5kX3ZtYTsKKwlwcGd0dC0+ZGVidWdfZHVtcCA9 IGdlbjhfZHVtcF9wcGd0dDsKIAogCXJldHVybiAwOwogCi0tIAoyLjQuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK