From: Matthew Auld Subject: [PATCH 16/21] drm/i915/debugfs: include some gtt page size metrics Date: Fri, 22 Sep 2017 18:32:47 +0100 Message-ID: <20170922173252.10137-17-matthew.auld@intel.com> References: <20170922173252.10137-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id E9F246EA6E for ; Fri, 22 Sep 2017 17:34:09 +0000 (UTC) In-Reply-To: <20170922173252.10137-1-matthew.auld@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 R29vZCB0byBrbm93LCBtb3N0bHkgZm9yIGRlYnVnZ2luZyBwdXJwb3Nlcy4KCnYyOiBzb21lIGlt cHJvdmVtZW50cyBmcm9tIENocmlzCgpTaWduZWQtb2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRo ZXcuYXVsZEBpbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBs aW51eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51 az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDYxICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCA1NyBpbnNlcnRp b25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5k ZXggMTNmYzI1OTk3ZDY1Li4wODNlZjYzNTRhY2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVi dWdmcy5jCkBAIC0xMTgsNiArMTE4LDM2IEBAIHN0YXRpYyB1NjQgaTkxNV9nZW1fb2JqX3RvdGFs X2dndHRfc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCXJldHVybiBzaXpl OwogfQogCitzdGF0aWMgY29uc3QgY2hhciAqCitzdHJpbmdpZnlfcGFnZV9zaXplcyh1bnNpZ25l ZCBpbnQgcGFnZV9zaXplcywgY2hhciAqYnVmLCBzaXplX3QgbGVuKQoreworCXNpemVfdCB4ID0g MDsKKworCXN3aXRjaCAocGFnZV9zaXplcykgeworCWNhc2UgMDoKKwkJcmV0dXJuICIiOworCWNh c2UgSTkxNV9HVFRfUEFHRV9TSVpFXzRLOgorCQlyZXR1cm4gIjRLIjsKKwljYXNlIEk5MTVfR1RU X1BBR0VfU0laRV82NEs6CisJCXJldHVybiAiNjRLIjsKKwljYXNlIEk5MTVfR1RUX1BBR0VfU0la RV8yTToKKwkJcmV0dXJuICIyTSI7CisJZGVmYXVsdDoKKwkJaWYgKCFidWYpCisJCQlyZXR1cm4g Ik0iOworCisJCWlmIChwYWdlX3NpemVzICYgSTkxNV9HVFRfUEFHRV9TSVpFXzJNKQorCQkJeCAr PSBzbnByaW50ZihidWYgKyB4LCBsZW4gLSB4LCAiMk0sICIpOworCQlpZiAocGFnZV9zaXplcyAm IEk5MTVfR1RUX1BBR0VfU0laRV82NEspCisJCQl4ICs9IHNucHJpbnRmKGJ1ZiArIHgsIGxlbiAt IHgsICI2NEssICIpOworCQlpZiAocGFnZV9zaXplcyAmIEk5MTVfR1RUX1BBR0VfU0laRV80SykK KwkJCXggKz0gc25wcmludGYoYnVmICsgeCwgbGVuIC0geCwgIjRLLCAiKTsKKwkJYnVmW3gtMl0g PSAnXDAnOworCisJCXJldHVybiBidWY7CisJfQorfQorCiBzdGF0aWMgdm9pZAogZGVzY3JpYmVf b2JqKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikK IHsKQEAgLTE1NSw5ICsxODUsMTAgQEAgZGVzY3JpYmVfb2JqKHN0cnVjdCBzZXFfZmlsZSAqbSwg c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAkJaWYgKCFkcm1fbW1fbm9kZV9hbGxv Y2F0ZWQoJnZtYS0+bm9kZSkpCiAJCQljb250aW51ZTsKIAotCQlzZXFfcHJpbnRmKG0sICIgKCVz Z3R0IG9mZnNldDogJTA4bGx4LCBzaXplOiAlMDhsbHgiLAorCQlzZXFfcHJpbnRmKG0sICIgKCVz Z3R0IG9mZnNldDogJTA4bGx4LCBzaXplOiAlMDhsbHgsIHBhZ2VzOiAlcyIsCiAJCQkgICBpOTE1 X3ZtYV9pc19nZ3R0KHZtYSkgPyAiZyIgOiAicHAiLAotCQkJICAgdm1hLT5ub2RlLnN0YXJ0LCB2 bWEtPm5vZGUuc2l6ZSk7CisJCQkgICB2bWEtPm5vZGUuc3RhcnQsIHZtYS0+bm9kZS5zaXplLAor CQkJICAgc3RyaW5naWZ5X3BhZ2Vfc2l6ZXModm1hLT5wYWdlX3NpemVzLmd0dCwgTlVMTCwgMCkp OwogCQlpZiAoaTkxNV92bWFfaXNfZ2d0dCh2bWEpKSB7CiAJCQlzd2l0Y2ggKHZtYS0+Z2d0dF92 aWV3LnR5cGUpIHsKIAkJCWNhc2UgSTkxNV9HR1RUX1ZJRVdfTk9STUFMOgpAQCAtNDAyLDEwICs0 MzMsMTIgQEAgc3RhdGljIGludCBpOTE1X2dlbV9vYmplY3RfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUg Km0sIHZvaWQgKmRhdGEpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gbm9k ZV90b19pOTE1KG0tPnByaXZhdGUpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3By aXYtPmRybTsKIAlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRldl9wcml2LT5nZ3R0OwotCXUz MiBjb3VudCwgbWFwcGVkX2NvdW50LCBwdXJnZWFibGVfY291bnQsIGRweV9jb3VudDsKLQl1NjQg c2l6ZSwgbWFwcGVkX3NpemUsIHB1cmdlYWJsZV9zaXplLCBkcHlfc2l6ZTsKKwl1MzIgY291bnQs IG1hcHBlZF9jb3VudCwgcHVyZ2VhYmxlX2NvdW50LCBkcHlfY291bnQsIGh1Z2VfY291bnQ7CisJ dTY0IHNpemUsIG1hcHBlZF9zaXplLCBwdXJnZWFibGVfc2l6ZSwgZHB5X3NpemUsIGh1Z2Vfc2l6 ZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOworCXVuc2lnbmVkIGludCBwYWdl X3NpemVzID0gMDsKIAlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGU7CisJY2hhciBidWZbODBdOwogCWlu dCByZXQ7CiAKIAlyZXQgPSBtdXRleF9sb2NrX2ludGVycnVwdGlibGUoJmRldi0+c3RydWN0X211 dGV4KTsKQEAgLTQxOSw2ICs0NTIsNyBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX29iamVjdF9pbmZv KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAlzaXplID0gY291bnQgPSAwOwogCW1h cHBlZF9zaXplID0gbWFwcGVkX2NvdW50ID0gMDsKIAlwdXJnZWFibGVfc2l6ZSA9IHB1cmdlYWJs ZV9jb3VudCA9IDA7CisJaHVnZV9zaXplID0gaHVnZV9jb3VudCA9IDA7CiAJbGlzdF9mb3JfZWFj aF9lbnRyeShvYmosICZkZXZfcHJpdi0+bW0udW5ib3VuZF9saXN0LCBnbG9iYWxfbGluaykgewog CQlzaXplICs9IG9iai0+YmFzZS5zaXplOwogCQkrK2NvdW50OwpAQCAtNDMyLDYgKzQ2NiwxMiBA QCBzdGF0aWMgaW50IGk5MTVfZ2VtX29iamVjdF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9p ZCAqZGF0YSkKIAkJCW1hcHBlZF9jb3VudCsrOwogCQkJbWFwcGVkX3NpemUgKz0gb2JqLT5iYXNl LnNpemU7CiAJCX0KKworCQlpZiAob2JqLT5tbS5wYWdlX3NpemVzLnNnID4gSTkxNV9HVFRfUEFH RV9TSVpFKSB7CisJCQlodWdlX2NvdW50Kys7CisJCQlodWdlX3NpemUgKz0gb2JqLT5iYXNlLnNp emU7CisJCQlwYWdlX3NpemVzIHw9IG9iai0+bW0ucGFnZV9zaXplcy5zZzsKKwkJfQogCX0KIAlz ZXFfcHJpbnRmKG0sICIldSB1bmJvdW5kIG9iamVjdHMsICVsbHUgYnl0ZXNcbiIsIGNvdW50LCBz aXplKTsKIApAQCAtNDU0LDYgKzQ5NCwxMiBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX29iamVjdF9p bmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAkJCW1hcHBlZF9jb3VudCsrOwog CQkJbWFwcGVkX3NpemUgKz0gb2JqLT5iYXNlLnNpemU7CiAJCX0KKworCQlpZiAob2JqLT5tbS5w YWdlX3NpemVzLnNnID4gSTkxNV9HVFRfUEFHRV9TSVpFKSB7CisJCQlodWdlX2NvdW50Kys7CisJ CQlodWdlX3NpemUgKz0gb2JqLT5iYXNlLnNpemU7CisJCQlwYWdlX3NpemVzIHw9IG9iai0+bW0u cGFnZV9zaXplcy5zZzsKKwkJfQogCX0KIAlzZXFfcHJpbnRmKG0sICIldSBib3VuZCBvYmplY3Rz LCAlbGx1IGJ5dGVzXG4iLAogCQkgICBjb3VudCwgc2l6ZSk7CkBAIC00NjEsMTEgKzUwNywxOCBA QCBzdGF0aWMgaW50IGk5MTVfZ2VtX29iamVjdF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9p ZCAqZGF0YSkKIAkJICAgcHVyZ2VhYmxlX2NvdW50LCBwdXJnZWFibGVfc2l6ZSk7CiAJc2VxX3By aW50ZihtLCAiJXUgbWFwcGVkIG9iamVjdHMsICVsbHUgYnl0ZXNcbiIsCiAJCSAgIG1hcHBlZF9j b3VudCwgbWFwcGVkX3NpemUpOworCXNlcV9wcmludGYobSwgIiV1IGh1Z2UtcGFnZWQgb2JqZWN0 cyAoJXMpICVsbHUgYnl0ZXNcbiIsCisJCSAgIGh1Z2VfY291bnQsCisJCSAgIHN0cmluZ2lmeV9w YWdlX3NpemVzKHBhZ2Vfc2l6ZXMsIGJ1Ziwgc2l6ZW9mKGJ1ZikpLAorCQkgICBodWdlX3NpemUp OwogCXNlcV9wcmludGYobSwgIiV1IGRpc3BsYXkgb2JqZWN0cyAocGlubmVkKSwgJWxsdSBieXRl c1xuIiwKIAkJICAgZHB5X2NvdW50LCBkcHlfc2l6ZSk7CiAKIAlzZXFfcHJpbnRmKG0sICIlbGx1 IFslbGx1XSBndHQgdG90YWxcbiIsCiAJCSAgIGdndHQtPmJhc2UudG90YWwsIGdndHQtPm1hcHBh YmxlX2VuZCk7CisJc2VxX3ByaW50ZihtLCAiU3VwcG9ydGVkIHBhZ2Ugc2l6ZXM6ICVzXG4iLAor CQkgICBzdHJpbmdpZnlfcGFnZV9zaXplcyhJTlRFTF9JTkZPKGRldl9wcml2KS0+cGFnZV9zaXpl cywKKwkJCQkJYnVmLCBzaXplb2YoYnVmKSkpOwogCiAJc2VxX3B1dGMobSwgJ1xuJyk7CiAJcHJp bnRfYmF0Y2hfcG9vbF9zdGF0cyhtLCBkZXZfcHJpdik7Ci0tIAoyLjEzLjUKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=