From: Michel Thierry Subject: [PATCH v5 13/19] drm/i915/gen8: Add ppgtt info and debug_dump Date: Thu, 16 Jul 2015 10:33:25 +0100 Message-ID: <1437039211-2507-14-git-send-email-michel.thierry@intel.com> References: <1437039211-2507-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 866DF6EC15 for ; Thu, 16 Jul 2015 02:33:55 -0700 (PDT) In-Reply-To: <1437039211-2507-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 IDMyYiBhbmQgNDhiIFBQR1RULgp2NDogVXNlIHVzZWRfcG1sNGVzL3BkcGVzIChBa2FzaCkuCnY1 OiBSZWJhc2UgYWZ0ZXIgTWlrYSdzIHBwZ3R0IGNsZWFudXAgLyBzY3JhdGNoIG1lcmdlIHBhdGNo IHNlcmllcy4KdjY6IFJlbHkgb24gdXNlZF9weCBiaXRzIGluc3RlYWQgb2YgbnVsbCBjaGVja2lu ZyAoQWthc2gpCgpDYzogQWthc2ggR29lbCA8YWthc2guZ29lbEBpbnRlbC5jb20+ClNpZ25lZC1v ZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KU2lnbmVkLW9mZi1ieTogTWlj aGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4gKHYyKykKLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDE4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDgzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgOTMgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IGIyNzY2YTguLmYwNWMzODYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0yMjQ4LDcgKzIyNDgsNiBAQCBz dGF0aWMgdm9pZCBnZW42X3BwZ3R0X2luZm8oc3RydWN0IHNlcV9maWxlICptLCBzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRl di0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZzsKLQlzdHJ1Y3Qg ZHJtX2ZpbGUgKmZpbGU7CiAJaW50IGk7CiAKIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPT0g NikKQEAgLTIyNzEsMTMgKzIyNzAsNiBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2luZm8oc3Ry dWN0IHNlcV9maWxlICptLCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlwcGd0dC0+ZGVidWdf ZHVtcChwcGd0dCwgbSk7CiAJfQogCi0JbGlzdF9mb3JfZWFjaF9lbnRyeV9yZXZlcnNlKGZpbGUs ICZkZXYtPmZpbGVsaXN0LCBsaGVhZCkgewotCQlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRl ICpmaWxlX3ByaXYgPSBmaWxlLT5kcml2ZXJfcHJpdjsKLQotCQlzZXFfcHJpbnRmKG0sICJwcm9j OiAlc1xuIiwKLQkJCSAgIGdldF9waWRfdGFzayhmaWxlLT5waWQsIFBJRFRZUEVfUElEKS0+Y29t bSk7Ci0JCWlkcl9mb3JfZWFjaCgmZmlsZV9wcml2LT5jb250ZXh0X2lkciwgcGVyX2ZpbGVfY3R4 LCBtKTsKLQl9CiAJc2VxX3ByaW50ZihtLCAiRUNPQ0hLOiAweCUwOHhcbiIsIEk5MTVfUkVBRChH QU1fRUNPQ0hLKSk7CiB9CiAKQEAgLTIyODYsNiArMjI3OCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9w cGd0dF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAlzdHJ1Y3QgZHJtX2lu Zm9fbm9kZSAqbm9kZSA9IG0tPnByaXZhdGU7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG5v ZGUtPm1pbm9yLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGU7CiAKIAlpbnQgcmV0ID0gbXV0 ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJaWYgKHJldCkKQEAg LTIyOTcsNiArMjI5MCwxNSBAQCBzdGF0aWMgaW50IGk5MTVfcHBndHRfaW5mbyhzdHJ1Y3Qgc2Vx X2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0g NikKIAkJZ2VuNl9wcGd0dF9pbmZvKG0sIGRldik7CiAKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5X3Jl dmVyc2UoZmlsZSwgJmRldi0+ZmlsZWxpc3QsIGxoZWFkKSB7CisJCXN0cnVjdCBkcm1faTkxNV9m aWxlX3ByaXZhdGUgKmZpbGVfcHJpdiA9IGZpbGUtPmRyaXZlcl9wcml2OworCisJCXNlcV9wcmlu dGYobSwgIlxucHJvYzogJXNcbiIsCisJCQkgICBnZXRfcGlkX3Rhc2soZmlsZS0+cGlkLCBQSURU WVBFX1BJRCktPmNvbW0pOworCQlpZHJfZm9yX2VhY2goJmZpbGVfcHJpdi0+Y29udGV4dF9pZHIs IHBlcl9maWxlX2N0eCwKKwkJCSAgICAgKHZvaWQgKikodW5zaWduZWQgbG9uZyltKTsKKwl9CisK IAlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0 cnVjdF9tdXRleCk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggY2ExMjFl Yi4uMTQzNTcwMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTEzMjIsNiAr MTMyMiw4OSBAQCBzdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCiAJCXJldHVybiBnZW44X2FsbG9jX3ZhX3JhbmdlXzNsdmwodm0sICZw cGd0dC0+cGRwLCBzdGFydCwgbGVuZ3RoKTsKIH0KIAorc3RhdGljIHZvaWQgZ2VuOF9kdW1wX3Bk cChzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHAsCisJCQkgIHVpbnQ2NF90 IHN0YXJ0LCB1aW50NjRfdCBsZW5ndGgsCisJCQkgIGdlbjhfcHRlX3Qgc2NyYXRjaF9wdGUsCisJ CQkgIHN0cnVjdCBzZXFfZmlsZSAqbSkKK3sKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAq cGQ7CisJdWludDY0X3QgdGVtcDsKKwl1aW50MzJfdCBwZHBlOworCisJZ2VuOF9mb3JfZWFjaF9w ZHBlKHBkLCBwZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKKwkJc3RydWN0IGk5MTVf cGFnZV90YWJsZSAqcHQ7CisJCXVpbnQ2NF90IHBkX2xlbiA9IGxlbmd0aDsKKwkJdWludDY0X3Qg cGRfc3RhcnQgPSBzdGFydDsKKwkJdWludDMyX3QgcGRlOworCisJCWlmICghdGVzdF9iaXQocGRw ZSwgcGRwLT51c2VkX3BkcGVzKSkKKwkJCWNvbnRpbnVlOworCisJCXNlcV9wcmludGYobSwgIlx0 UERQRSAjJWRcbiIsIHBkcGUpOworCQlnZW44X2Zvcl9lYWNoX3BkZShwdCwgcGQsIHBkX3N0YXJ0 LCBwZF9sZW4sIHRlbXAsIHBkZSkgeworCQkJdWludDMyX3QgIHB0ZTsKKwkJCWdlbjhfcHRlX3Qg KnB0X3ZhZGRyOworCisJCQlpZiAoIXRlc3RfYml0KHBkZSwgcGQtPnVzZWRfcGRlcykpCisJCQkJ Y29udGludWU7CisKKwkJCXB0X3ZhZGRyID0ga21hcF9weChwdCk7CisJCQlmb3IgKHB0ZSA9IDA7 IHB0ZSA8IEdFTjhfUFRFUzsgcHRlICs9IDQpIHsKKwkJCQl1aW50NjRfdCB2YSA9CisJCQkJCShw ZHBlIDw8IEdFTjhfUERQRV9TSElGVCkgfAorCQkJCQkocGRlIDw8IEdFTjhfUERFX1NISUZUKSB8 CisJCQkJCShwdGUgPDwgR0VOOF9QVEVfU0hJRlQpOworCQkJCWludCBpOworCQkJCWJvb2wgZm91 bmQgPSBmYWxzZTsKKworCQkJCWZvciAoaSA9IDA7IGkgPCA0OyBpKyspCisJCQkJCWlmIChwdF92 YWRkcltwdGUgKyBpXSAhPSBzY3JhdGNoX3B0ZSkKKwkJCQkJCWZvdW5kID0gdHJ1ZTsKKwkJCQlp ZiAoIWZvdW5kKQorCQkJCQljb250aW51ZTsKKworCQkJCXNlcV9wcmludGYobSwgIlx0XHQweCVs bHggWyUwM2QsJTAzZCwlMDRkXTogPSIsIHZhLCBwZHBlLCBwZGUsIHB0ZSk7CisJCQkJZm9yIChp ID0gMDsgaSA8IDQ7IGkrKykgeworCQkJCQlpZiAocHRfdmFkZHJbcHRlICsgaV0gIT0gc2NyYXRj aF9wdGUpCisJCQkJCQlzZXFfcHJpbnRmKG0sICIgJWxseCIsIHB0X3ZhZGRyW3B0ZSArIGldKTsK KwkJCQkJZWxzZQorCQkJCQkJc2VxX3B1dHMobSwgIiAgU0NSQVRDSCAiKTsKKwkJCQl9CisJCQkJ c2VxX3B1dHMobSwgIlxuIik7CisJCQl9CisJCQkvKiBkb24ndCB1c2Uga3VubWFwX3B4LCBpdCBj b3VsZCB0cmlnZ2VyCisJCQkgKiBhbiB1bm5lY2Vzc2FyeSBmbHVzaC4KKwkJCSAqLworCQkJa3Vu bWFwX2F0b21pYyhwdF92YWRkcik7CisJCX0KKwl9Cit9CisKK3N0YXRpYyB2b2lkIGdlbjhfZHVt cF9wcGd0dChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHN0cnVjdCBzZXFfZmlsZSAqbSkK K3sKKwlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSA9ICZwcGd0dC0+YmFzZTsKKwl1aW50 NjRfdCBzdGFydCA9IHBwZ3R0LT5iYXNlLnN0YXJ0OworCXVpbnQ2NF90IGxlbmd0aCA9IHBwZ3R0 LT5iYXNlLnRvdGFsOworCWdlbjhfcHRlX3Qgc2NyYXRjaF9wdGUgPSBnZW44X3B0ZV9lbmNvZGUo cHhfZG1hKHZtLT5zY3JhdGNoX3BhZ2UpLAorCQkJCQkJIEk5MTVfQ0FDSEVfTExDLCB0cnVlKTsK KworCWlmICghVVNFU19GVUxMXzQ4QklUX1BQR1RUKHZtLT5kZXYpKSB7CisJCWdlbjhfZHVtcF9w ZHAoJnBwZ3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgsIHNjcmF0Y2hfcHRlLCBtKTsKKwl9IGVsc2Ug eworCQl1aW50NjRfdCB0ZW1wbDQsIHBtbDRlOworCQlzdHJ1Y3QgaTkxNV9wbWw0ICpwbWw0ID0g JnBwZ3R0LT5wbWw0OworCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyICpwZHA7 CisKKwkJZ2VuOF9mb3JfZWFjaF9wbWw0ZShwZHAsIHBtbDQsIHN0YXJ0LCBsZW5ndGgsIHRlbXBs NCwgcG1sNGUpIHsKKwkJCWlmICghdGVzdF9iaXQocG1sNGUsIHBtbDQtPnVzZWRfcG1sNGVzKSkK KwkJCQljb250aW51ZTsKKworCQkJc2VxX3ByaW50ZihtLCAiICAgIFBNTDRFICMlbGx1XG4iLCBw bWw0ZSk7CisJCQlnZW44X2R1bXBfcGRwKHBkcCwgc3RhcnQsIGxlbmd0aCwgc2NyYXRjaF9wdGUs IG0pOworCQl9CisJfQorfQorCiAvKgogICogR0VOOCBsZWdhY3kgcHBndHQgcHJvZ3JhbW1pbmcg aXMgYWNjb21wbGlzaGVkIHRocm91Z2ggYSBtYXggNCBQRFAgcmVnaXN0ZXJzCiAgKiB3aXRoIGEg bmV0IGVmZmVjdCByZXNlbWJsaW5nIGEgMi1sZXZlbCBwYWdlIHRhYmxlIGluIG5vcm1hbCB4ODYg dGVybXMuIEVhY2gKQEAgLTEzNDQsNiArMTQyNiw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9p bml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlwcGd0dC0+YmFzZS5jbGVhcl9yYW5n ZSA9IGdlbjhfcHBndHRfY2xlYXJfcmFuZ2U7CiAJcHBndHQtPmJhc2UudW5iaW5kX3ZtYSA9IHBw Z3R0X3VuYmluZF92bWE7CiAJcHBndHQtPmJhc2UuYmluZF92bWEgPSBwcGd0dF9iaW5kX3ZtYTsK KwlwcGd0dC0+ZGVidWdfZHVtcCA9IGdlbjhfZHVtcF9wcGd0dDsKIAogCWlmIChVU0VTX0ZVTExf NDhCSVRfUFBHVFQocHBndHQtPmJhc2UuZGV2KSkgewogCQlyZXQgPSBzZXR1cF9weChwcGd0dC0+ YmFzZS5kZXYsICZwcGd0dC0+cG1sNCk7Ci0tIAoyLjQuNQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK