From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH v3] drm/i915: Report correct GGTT space usage Date: Tue, 30 Jun 2015 13:53:39 +0100 Message-ID: <1435668819-4126-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <20150630113527.GM1381@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 97B776E68D for ; Tue, 30 Jun 2015 05:53:43 -0700 (PDT) In-Reply-To: <20150630113527.GM1381@nuc-i3427.alporthouse.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: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkN1cnJlbnRs eSBvbmx5IG5vcm1hbCB2aWV3cyB3ZXJlIGFjY291bnRlZCB3aGljaCB1bmRlci1hY2NvdW50cwp0 aGUgdXNhZ2UgYXMgcmVwb3J0ZWQgaW4gZGVidWdmcyBhbmQgYnkgdGhlIEdFVF9BUEVSVFVSRSBp b2N0bC4KCkludHJvZHVjZSBuZXcgaGVscGVyLCBpOTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXpl LCBhbmQgdXNlIGl0CmZyb20gY2FsbCBzaXRlcyB3aGljaCB3YW50IHRvIGtub3cgaG93IG11Y2gg R0dUVCBzcGFjZSBhcmUKb2JqZWN0cyB1c2luZy4KCnYyOiBTaW5nbGUgbG9vcCBpbiBpOTE1X2dl bV9nZXRfYXBlcnR1cmVfaW9jdGwuIChDaHJpcyBXaWxzb24pCgp2MzogV2FsayBHR1RUIGFjdGl2 ZS9pbmFjdGl2ZSBsaXN0cyBpbiBpOTE1X2dlbV9nZXRfYXBlcnR1cmVfaW9jdGwKICAgIGZvciBi ZXR0ZXIgZWZmaWNpZW5jeS4gKENocmlzIFdpbHNvbiwgRGFuaWVsIFZldHRlcikKClNpZ25lZC1v ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBKb29u YXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBX aWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmll bC52ZXR0ZXJAZmZ3bGwuY2g+Ci0tLQpTb3JyeSBndXlzIGZvciBhIHBlcmlvZCBJIHdhcyBjb252 aW5jZWQgIm1tLmJvdW5kX2xpc3QiIGlzIGFjdHVhbGx5CiJ2bS5ib3VuZF9saXN0Ii4gOikKLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8ICA4ICsrKystLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICB8ICAzICsrKwogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyAgICAgfCAyNiArKysrKysrKysrKysrKysrKysrKysrLS0tLQogMyBm aWxlcyBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggMzFkODc2ODVmM2I5Li4zYmI2Yzk5ZDk4NjkgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC0yNjksNyArMjY5LDcgQEAgc3RhdGlj IGludCBpOTE1X2dlbV9zdG9sZW5fbGlzdF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAq ZGF0YSkKIAkJbGlzdF9hZGQoJm9iai0+b2JqX2V4ZWNfbGluaywgJnN0b2xlbik7CiAKIAkJdG90 YWxfb2JqX3NpemUgKz0gb2JqLT5iYXNlLnNpemU7Ci0JCXRvdGFsX2d0dF9zaXplICs9IGk5MTVf Z2VtX29ial9nZ3R0X3NpemUob2JqKTsKKwkJdG90YWxfZ3R0X3NpemUgKz0gaTkxNV9nZW1fb2Jq X3RvdGFsX2dndHRfc2l6ZShvYmopOwogCQljb3VudCsrOwogCX0KIAlsaXN0X2Zvcl9lYWNoX2Vu dHJ5KG9iaiwgJmRldl9wcml2LT5tbS51bmJvdW5kX2xpc3QsIGdsb2JhbF9saXN0KSB7CkBAIC0y OTksNyArMjk5LDcgQEAgc3RhdGljIGludCBpOTE1X2dlbV9zdG9sZW5fbGlzdF9pbmZvKHN0cnVj dCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAogI2RlZmluZSBjb3VudF9vYmplY3RzKGxpc3Qs IG1lbWJlcikgZG8geyBcCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShvYmosIGxpc3QsIG1lbWJlcikg eyBcCi0JCXNpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZShvYmopOyBcCisJCXNpemUgKz0g aTkxNV9nZW1fb2JqX3RvdGFsX2dndHRfc2l6ZShvYmopOyBcCiAJCSsrY291bnQ7IFwKIAkJaWYg KG9iai0+bWFwX2FuZF9mZW5jZWFibGUpIHsgXAogCQkJbWFwcGFibGVfc2l6ZSArPSBpOTE1X2dl bV9vYmpfZ2d0dF9zaXplKG9iaik7IFwKQEAgLTQwNSw3ICs0MDUsNyBAQCBzdGF0aWMgdm9pZCBw cmludF9iYXRjaF9wb29sX3N0YXRzKHN0cnVjdCBzZXFfZmlsZSAqbSwKIAogI2RlZmluZSBjb3Vu dF92bWFzKGxpc3QsIG1lbWJlcikgZG8geyBcCiAJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsIGxp c3QsIG1lbWJlcikgeyBcCi0JCXNpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZSh2bWEtPm9i aik7IFwKKwkJc2l6ZSArPSBpOTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplKHZtYS0+b2JqKTsg XAogCQkrK2NvdW50OyBcCiAJCWlmICh2bWEtPm9iai0+bWFwX2FuZF9mZW5jZWFibGUpIHsgXAog CQkJbWFwcGFibGVfc2l6ZSArPSBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKHZtYS0+b2JqKTsgXApA QCAtNTM1LDcgKzUzNSw3IEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1fZ3R0X2luZm8oc3RydWN0IHNl cV9maWxlICptLCB2b2lkICpkYXRhKQogCQlkZXNjcmliZV9vYmoobSwgb2JqKTsKIAkJc2VxX3B1 dGMobSwgJ1xuJyk7CiAJCXRvdGFsX29ial9zaXplICs9IG9iai0+YmFzZS5zaXplOwotCQl0b3Rh bF9ndHRfc2l6ZSArPSBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKG9iaik7CisJCXRvdGFsX2d0dF9z aXplICs9IGk5MTVfZ2VtX29ial90b3RhbF9nZ3R0X3NpemUob2JqKTsKIAkJY291bnQrKzsKIAl9 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGVhOWNhZjIyMjgzZi4uNjkwYjU0MWVkM2I4 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMwMTAsNiArMzAxMCw5IEBAIGk5MTVfZ2Vt X29ial9nZ3R0X3NpemUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAlyZXR1cm4g aTkxNV9nZW1fb2JqX3NpemUob2JqLCBpOTE1X29ial90b19nZ3R0KG9iaikpOwogfQogCit1bnNp Z25lZCBsb25nCitpOTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplKHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmopOworCiBzdGF0aWMgaW5saW5lIGludCBfX211c3RfY2hlY2sKIGk5MTVf Z2VtX29ial9nZ3R0X3BpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkgICAg ICB1aW50MzJfdCBhbGlnbm1lbnQsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBhMmE0YTI3 MTU1NWMuLjc2YzcyOTk2YmU2NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0xNDksMTQg KzE0OSwxOCBAQCBpOTE1X2dlbV9nZXRfYXBlcnR1cmVfaW9jdGwoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgdm9pZCAqZGF0YSwKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fZ2V0X2FwZXJ0dXJlICph cmdzID0gZGF0YTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOworCXN0cnVjdCBp OTE1X2d0dCAqZ2d0dCA9ICZkZXZfcHJpdi0+Z3R0OworCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwog CXNpemVfdCBwaW5uZWQ7CiAKIAlwaW5uZWQgPSAwOwogCW11dGV4X2xvY2soJmRldi0+c3RydWN0 X211dGV4KTsKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KG9iaiwgJmRldl9wcml2LT5tbS5ib3VuZF9s aXN0LCBnbG9iYWxfbGlzdCkKLQkJaWYgKGk5MTVfZ2VtX29ial9pc19waW5uZWQob2JqKSkKLQkJ CXBpbm5lZCArPSBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKG9iaik7CisJbGlzdF9mb3JfZWFjaF9l bnRyeSh2bWEsICZnZ3R0LT5iYXNlLmFjdGl2ZV9saXN0LCBtbV9saXN0KQorCQlpZiAodm1hLT5w aW5fY291bnQpCisJCQlwaW5uZWQgKz0gdm1hLT5ub2RlLnNpemU7CisJbGlzdF9mb3JfZWFjaF9l bnRyeSh2bWEsICZnZ3R0LT5iYXNlLmluYWN0aXZlX2xpc3QsIG1tX2xpc3QpCisJCWlmICh2bWEt PnBpbl9jb3VudCkKKwkJCXBpbm5lZCArPSB2bWEtPm5vZGUuc2l6ZTsKIAltdXRleF91bmxvY2so JmRldi0+c3RydWN0X211dGV4KTsKIAogCWFyZ3MtPmFwZXJfc2l6ZSA9IGRldl9wcml2LT5ndHQu YmFzZS50b3RhbDsKQEAgLTU0NjksMyArNTQ3MywxNyBAQCBib29sIGk5MTVfZ2VtX29ial9pc19w aW5uZWQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAlyZXR1cm4gZmFsc2U7CiB9 CiAKK3Vuc2lnbmVkIGxvbmcKK2k5MTVfZ2VtX29ial90b3RhbF9nZ3R0X3NpemUoc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaikKK3sKKwl1bnNpZ25lZCBsb25nIHNpemUgPSAwOworCXN0 cnVjdCBpOTE1X3ZtYSAqdm1hOworCisJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsICZvYmotPnZt YV9saXN0LCB2bWFfbGluaykgeworCQlpZiAoaTkxNV9pc19nZ3R0KHZtYS0+dm0pICYmCisJCSAg ICBkcm1fbW1fbm9kZV9hbGxvY2F0ZWQoJnZtYS0+bm9kZSkpCisJCQlzaXplICs9IHZtYS0+bm9k ZS5zaXplOworCX0KKworCXJldHVybiBzaXplOworfQotLSAKMi40LjIKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==