From: Michel Thierry Subject: [PATCH v2 14/18] drm/i915/gen8: Add ppgtt info and debug_dump Date: Wed, 10 Jun 2015 17:46:51 +0100 Message-ID: <1433954816-13787-15-git-send-email-michel.thierry@intel.com> References: <1433954816-13787-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B2467A0F3 for ; Wed, 10 Jun 2015 09:47:26 -0700 (PDT) In-Reply-To: <1433954816-13787-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 List-Id: intel-gfx@lists.freedesktop.org djI6IENsZWFuIHVwIHBhdGNoIGFmdGVyIHJlYmFzZXMuCnYzOiBnZW44X2R1bXBfcHBndHQgZm9y IDMyYiBhbmQgNDhiIFBQR1RULgp2NDogVXNlIHVzZWRfcG1sNGVzL3BkcGVzIChBa2FzaCkuCnY1 OiBSZWJhc2UgYWZ0ZXIgTWlrYSdzIHBwZ3R0IGNsZWFudXAgLyBzY3JhdGNoIG1lcmdlIHBhdGNo IHNlcmllcy4KClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4K U2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4g KHYyKykKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDE4ICsrKyst LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDkyICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTAyIGluc2VydGlv bnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRl eCAyMjc3MGFhLi4xYzg3NmNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAt MjIyNyw3ICsyMjI3LDYgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbmZvKHN0cnVjdCBzZXFf ZmlsZSAqbSwgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmc7Ci0Jc3RydWN0IGRybV9maWxlICpmaWxlOwogCWludCBpOwogCiAJaWYgKElOVEVM X0lORk8oZGV2KS0+Z2VuID09IDYpCkBAIC0yMjUwLDEzICsyMjQ5LDYgQEAgc3RhdGljIHZvaWQg Z2VuNl9wcGd0dF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkJcHBndHQtPmRlYnVnX2R1bXAocHBndHQsIG0pOwogCX0KIAotCWxpc3RfZm9yX2VhY2hf ZW50cnlfcmV2ZXJzZShmaWxlLCAmZGV2LT5maWxlbGlzdCwgbGhlYWQpIHsKLQkJc3RydWN0IGRy bV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2ID0gZmlsZS0+ZHJpdmVyX3ByaXY7Ci0KLQkJ c2VxX3ByaW50ZihtLCAicHJvYzogJXNcbiIsCi0JCQkgICBnZXRfcGlkX3Rhc2soZmlsZS0+cGlk LCBQSURUWVBFX1BJRCktPmNvbW0pOwotCQlpZHJfZm9yX2VhY2goJmZpbGVfcHJpdi0+Y29udGV4 dF9pZHIsIHBlcl9maWxlX2N0eCwgbSk7Ci0JfQogCXNlcV9wcmludGYobSwgIkVDT0NISzogMHgl MDh4XG4iLCBJOTE1X1JFQUQoR0FNX0VDT0NISykpOwogfQogCkBAIC0yMjY1LDYgKzIyNTcsNyBA QCBzdGF0aWMgaW50IGk5MTVfcHBndHRfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRh dGEpCiAJc3RydWN0IGRybV9pbmZvX25vZGUgKm5vZGUgPSBtLT5wcml2YXRlOwogCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBub2RlLT5taW5vci0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGRybV9maWxlICpmaWxl OwogCiAJaW50IHJldCA9IG11dGV4X2xvY2tfaW50ZXJydXB0aWJsZSgmZGV2LT5zdHJ1Y3RfbXV0 ZXgpOwogCWlmIChyZXQpCkBAIC0yMjc2LDYgKzIyNjksMTUgQEAgc3RhdGljIGludCBpOTE1X3Bw Z3R0X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCWVsc2UgaWYgKElOVEVM X0lORk8oZGV2KS0+Z2VuID49IDYpCiAJCWdlbjZfcHBndHRfaW5mbyhtLCBkZXYpOwogCisJbGlz dF9mb3JfZWFjaF9lbnRyeV9yZXZlcnNlKGZpbGUsICZkZXYtPmZpbGVsaXN0LCBsaGVhZCkgewor CQlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXYgPSBmaWxlLT5kcml2ZXJf cHJpdjsKKworCQlzZXFfcHJpbnRmKG0sICJcbnByb2M6ICVzXG4iLAorCQkJICAgZ2V0X3BpZF90 YXNrKGZpbGUtPnBpZCwgUElEVFlQRV9QSUQpLT5jb21tKTsKKwkJaWRyX2Zvcl9lYWNoKCZmaWxl X3ByaXYtPmNvbnRleHRfaWRyLCBwZXJfZmlsZV9jdHgsCisJCQkgICAgICh2b2lkICopKHVuc2ln bmVkIGxvbmcpbSk7CisJfQorCiAJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOwogCW11 dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCmluZGV4IDY1ZDA3ODcuLjRjNDFkNTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCkBAIC0xNDYzLDYgKzE0NjMsOTcgQEAgc3RhdGljIGludCBnZW44X3ByZWFsbG9jYXRl X3RvcF9sZXZlbF9wZHBzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlyZXR1cm4gcmV0 OwogfQogCitzdGF0aWMgdm9pZCBnZW44X2R1bXBfcGRwKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0 b3J5X3BvaW50ZXIgKnBkcCwKKwkJCSAgdWludDY0X3Qgc3RhcnQsIHVpbnQ2NF90IGxlbmd0aCwK KwkJCSAgZ2VuOF9wdGVfdCBzY3JhdGNoX3B0ZSwKKwkJCSAgc3RydWN0IHNlcV9maWxlICptKQor eworCXN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZDsKKwl1aW50NjRfdCB0ZW1wOworCXVp bnQzMl90IHBkcGU7CisKKwlnZW44X2Zvcl9lYWNoX3BkcGUocGQsIHBkcCwgc3RhcnQsIGxlbmd0 aCwgdGVtcCwgcGRwZSkgeworCQlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlICpwdDsKKwkJdWludDY0 X3QgcGRfbGVuID0gbGVuZ3RoOworCQl1aW50NjRfdCBwZF9zdGFydCA9IHN0YXJ0OworCQl1aW50 MzJfdCBwZGU7CisKKwkJaWYgKCFwZCkKKwkJCWNvbnRpbnVlOworCisJCWlmKCF0ZXN0X2JpdChw ZHBlLCBwZHAtPnVzZWRfcGRwZXMpKQorCQkJY29udGludWU7CisKKwkJc2VxX3ByaW50ZihtLCAi XHRQRFBFICMlZFxuIiwgcGRwZSk7CisJCWdlbjhfZm9yX2VhY2hfcGRlKHB0LCBwZCwgcGRfc3Rh cnQsIHBkX2xlbiwgdGVtcCwgcGRlKSB7CisJCQl1aW50MzJfdCAgcHRlOworCQkJZ2VuOF9wdGVf dCAqcHRfdmFkZHI7CisKKwkJCWlmICghcHQpCisJCQkJY29udGludWU7CisKKwkJCXB0X3ZhZGRy ID0ga21hcF9weChwdCk7CisJCQlmb3IgKHB0ZSA9IDA7IHB0ZSA8IEdFTjhfUFRFUzsgcHRlKz00 KSB7CisJCQkJdWludDY0X3QgdmEgPQorCQkJCQkocGRwZSA8PCBHRU44X1BEUEVfU0hJRlQpIHwK KwkJCQkJKHBkZSA8PCBHRU44X1BERV9TSElGVCkgfAorCQkJCQkocHRlIDw8IEdFTjhfUFRFX1NI SUZUKTsKKwkJCQlpbnQgaTsKKwkJCQlib29sIGZvdW5kID0gZmFsc2U7CisJCQkJZm9yIChpID0g MDsgaSA8IDQ7IGkrKykKKwkJCQkJaWYgKHB0X3ZhZGRyW3B0ZSArIGldICE9IHNjcmF0Y2hfcHRl KQorCQkJCQkJZm91bmQgPSB0cnVlOworCQkJCWlmICghZm91bmQpCisJCQkJCWNvbnRpbnVlOwor CisJCQkJc2VxX3ByaW50ZihtLCAiXHRcdDB4JWxseCBbJTAzZCwlMDNkLCUwNGRdOiA9IiwgdmEs IHBkcGUsIHBkZSwgcHRlKTsKKwkJCQlmb3IgKGkgPSAwOyBpIDwgNDsgaSsrKSB7CisJCQkJCWlm IChwdF92YWRkcltwdGUgKyBpXSAhPSBzY3JhdGNoX3B0ZSkKKwkJCQkJCXNlcV9wcmludGYobSwg IiAlbGx4IiwgcHRfdmFkZHJbcHRlICsgaV0pOworCQkJCQllbHNlCisJCQkJCQlzZXFfcHV0cyht LCAiICBTQ1JBVENIICIpOworCQkJCX0KKwkJCQlzZXFfcHV0cyhtLCAiXG4iKTsKKwkJCX0KKwkJ CS8qIGRvbid0IHVzZSBrdW5tYXBfcHgsIGl0IGNvdWxkIHRyaWdnZXIKKwkJCSAqIGFuIHVubmVj ZXNzYXJ5IGZsdXNoLgorCQkJICovCisJCQlrdW5tYXBfYXRvbWljKHB0X3ZhZGRyKTsKKwkJfQor CX0KK30KKworc3RhdGljIHZvaWQgZ2VuOF9kdW1wX3BwZ3R0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICpwcGd0dCwgc3RydWN0IHNlcV9maWxlICptKQoreworCXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtID0gJnBwZ3R0LT5iYXNlOworCXVpbnQ2NF90IHN0YXJ0ID0gcHBndHQtPmJhc2Uuc3Rh cnQ7CisJdWludDY0X3QgbGVuZ3RoID0gcHBndHQtPmJhc2UudG90YWw7CisJZ2VuOF9wdGVfdCBz Y3JhdGNoX3B0ZSA9IGdlbjhfcHRlX2VuY29kZShweF9kbWEodm0tPnNjcmF0Y2hfcGFnZSksCisJ CQkJCQkgSTkxNV9DQUNIRV9MTEMsIHRydWUpOworCisJaWYgKCFVU0VTX0ZVTExfNDhCSVRfUFBH VFQodm0tPmRldikpIHsKKwkJZ2VuOF9kdW1wX3BkcCgmcHBndHQtPnBkcCwgc3RhcnQsIGxlbmd0 aCwgc2NyYXRjaF9wdGUsIG0pOworCX0gZWxzZSB7CisJCXVpbnQ2NF90IHRlbXBsNCwgcG1sNGU7 CisJCXN0cnVjdCBpOTE1X3BtbDQgKnBtbDQgPSAmcHBndHQtPnBtbDQ7CisJCXN0cnVjdCBpOTE1 X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcDsKKworCQlnZW44X2Zvcl9lYWNoX3BtbDRlKHBk cCwgcG1sNCwgc3RhcnQsIGxlbmd0aCwgdGVtcGw0LCBwbWw0ZSkgeworCQkJdWludDY0X3QgcGRw X2xlbiA9IGxlbmd0aDsKKwkJCXVpbnQ2NF90IHBkcF9zdGFydCA9IHN0YXJ0OworCisJCQlpZiAo IXBkcCkKKwkJCQljb250aW51ZTsKKworCQkJaWYgKCF0ZXN0X2JpdChwbWw0ZSwgcG1sNC0+dXNl ZF9wbWw0ZXMpKQorCQkJCWNvbnRpbnVlOworCisJCQlzZXFfcHJpbnRmKG0sICIgICAgUE1MNEUg IyVsbHVcbiIsIHBtbDRlKTsKKwkJCWdlbjhfZHVtcF9wZHAocGRwLCBwZHBfc3RhcnQsIHBkcF9s ZW4sIHNjcmF0Y2hfcHRlLCBtKTsKKwkJfQorCX0KK30KKwogLyoKICAqIEdFTjggbGVnYWN5IHBw Z3R0IHByb2dyYW1taW5nIGlzIGFjY29tcGxpc2hlZCB0aHJvdWdoIGEgbWF4IDQgUERQIHJlZ2lz dGVycwogICogd2l0aCBhIG5ldCBlZmZlY3QgcmVzZW1ibGluZyBhIDItbGV2ZWwgcGFnZSB0YWJs ZSBpbiBub3JtYWwgeDg2IHRlcm1zLiBFYWNoCkBAIC0xNDgxLDYgKzE1NzIsNyBAQCBzdGF0aWMg aW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJcHBndHQt PmJhc2UuY2xlYXJfcmFuZ2UgPSBnZW44X3BwZ3R0X2NsZWFyX3JhbmdlOwogCXBwZ3R0LT5iYXNl LnVuYmluZF92bWEgPSBwcGd0dF91bmJpbmRfdm1hOwogCXBwZ3R0LT5iYXNlLmJpbmRfdm1hID0g cHBndHRfYmluZF92bWE7CisJcHBndHQtPmRlYnVnX2R1bXAgPSBnZW44X2R1bXBfcHBndHQ7CiAK IAlyZXQgPSBzZXR1cF9zY3JhdGNoKCZwcGd0dC0+YmFzZSk7CiAJaWYgKHJldCkKLS0gCjIuNC4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=