From: Tvrtko Ursulin Subject: [PATCH v5] drm/i915: Report correct GGTT space usage Date: Wed, 1 Jul 2015 11:51:10 +0100 Message-ID: <1435747870-14606-1-git-send-email-tvrtko.ursulin@linux.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 ESMTP id 1D1366EACC for ; Wed, 1 Jul 2015 03:51:14 -0700 (PDT) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkN1cnJlbnRs eSBvbmx5IG5vcm1hbCB2aWV3cyB3ZXJlIGFjY291bnRlZCB3aGljaCB1bmRlci1hY2NvdW50cwp0 aGUgdXNhZ2UgYXMgcmVwb3J0ZWQgaW4gZGVidWdmcy4KCkludHJvZHVjZSBuZXcgaGVscGVyLCBp OTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplLCBhbmQgdXNlIGl0CmZyb20gY2FsbCBzaXRlcyB3 aGljaCB3YW50IHRvIGtub3cgaG93IG11Y2ggR0dUVCBzcGFjZSBhcmUKb2JqZWN0cyB1c2luZy4K CnYyOiBTaW5nbGUgbG9vcCBpbiBpOTE1X2dlbV9nZXRfYXBlcnR1cmVfaW9jdGwuIChDaHJpcyBX aWxzb24pCgp2MzogV2FsayBHR1RUIGFjdGl2ZS9pbmFjdGl2ZSBsaXN0cyBpbiBpOTE1X2dlbV9n ZXRfYXBlcnR1cmVfaW9jdGwKICAgIGZvciBiZXR0ZXIgZWZmaWNpZW5jeS4gKENocmlzIFdpbHNv biwgRGFuaWVsIFZldHRlcikKCnY0OiBNYWtlIGk5MTVfZ2VtX29ial90b3RhbF9nZ3R0X3NpemUg cHJpdmF0ZSB0byBkZWJ1Z2ZzLiAoQ2hyaXMgV2lsc29uKQoKdjU6IENoYW5nZSB1bnNpZ25lZCBs b25nIHRvIHU2NC4gKENocmlzIFdpbHNvbikKClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGlu IDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNo cmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYyB8IDIyICsrKysrKysrKysrKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgICAgIHwgMTMgKysrKysrKystLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyNiBp bnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMKaW5kZXggMzFkODc2ODVmM2I5Li4wNGRlNmU3M2E1N2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZGVidWdmcy5jCkBAIC0xMTcsNiArMTE3LDIwIEBAIHN0YXRpYyBpbmxpbmUgY29uc3QgY2hh ciAqZ2V0X2dsb2JhbF9mbGFnKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJcmV0 dXJuIGk5MTVfZ2VtX29ial90b19nZ3R0KG9iaikgPyAiZyIgOiAiICI7CiB9CiAKK3N0YXRpYyB1 NjQgaTkxNV9nZW1fb2JqX3RvdGFsX2dndHRfc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqKQoreworCXU2NCBzaXplID0gMDsKKwlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKKworCWxp c3RfZm9yX2VhY2hfZW50cnkodm1hLCAmb2JqLT52bWFfbGlzdCwgdm1hX2xpbmspIHsKKwkJaWYg KGk5MTVfaXNfZ2d0dCh2bWEtPnZtKSAmJgorCQkgICAgZHJtX21tX25vZGVfYWxsb2NhdGVkKCZ2 bWEtPm5vZGUpKQorCQkJc2l6ZSArPSB2bWEtPm5vZGUuc2l6ZTsKKwl9CisKKwlyZXR1cm4gc2l6 ZTsKK30KKwogc3RhdGljIHZvaWQKIGRlc2NyaWJlX29iaihzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiB7CkBAIC0yNjksNyArMjgzLDcgQEAgc3Rh dGljIGludCBpOTE1X2dlbV9zdG9sZW5fbGlzdF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9p ZCAqZGF0YSkKIAkJbGlzdF9hZGQoJm9iai0+b2JqX2V4ZWNfbGluaywgJnN0b2xlbik7CiAKIAkJ dG90YWxfb2JqX3NpemUgKz0gb2JqLT5iYXNlLnNpemU7Ci0JCXRvdGFsX2d0dF9zaXplICs9IGk5 MTVfZ2VtX29ial9nZ3R0X3NpemUob2JqKTsKKwkJdG90YWxfZ3R0X3NpemUgKz0gaTkxNV9nZW1f b2JqX3RvdGFsX2dndHRfc2l6ZShvYmopOwogCQljb3VudCsrOwogCX0KIAlsaXN0X2Zvcl9lYWNo X2VudHJ5KG9iaiwgJmRldl9wcml2LT5tbS51bmJvdW5kX2xpc3QsIGdsb2JhbF9saXN0KSB7CkBA IC0yOTksNyArMzEzLDcgQEAgc3RhdGljIGludCBpOTE1X2dlbV9zdG9sZW5fbGlzdF9pbmZvKHN0 cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAogI2RlZmluZSBjb3VudF9vYmplY3RzKGxp c3QsIG1lbWJlcikgZG8geyBcCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShvYmosIGxpc3QsIG1lbWJl cikgeyBcCi0JCXNpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZShvYmopOyBcCisJCXNpemUg Kz0gaTkxNV9nZW1fb2JqX3RvdGFsX2dndHRfc2l6ZShvYmopOyBcCiAJCSsrY291bnQ7IFwKIAkJ aWYgKG9iai0+bWFwX2FuZF9mZW5jZWFibGUpIHsgXAogCQkJbWFwcGFibGVfc2l6ZSArPSBpOTE1 X2dlbV9vYmpfZ2d0dF9zaXplKG9iaik7IFwKQEAgLTQwNSw3ICs0MTksNyBAQCBzdGF0aWMgdm9p ZCBwcmludF9iYXRjaF9wb29sX3N0YXRzKHN0cnVjdCBzZXFfZmlsZSAqbSwKIAogI2RlZmluZSBj b3VudF92bWFzKGxpc3QsIG1lbWJlcikgZG8geyBcCiAJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEs IGxpc3QsIG1lbWJlcikgeyBcCi0JCXNpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZSh2bWEt Pm9iaik7IFwKKwkJc2l6ZSArPSBpOTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplKHZtYS0+b2Jq KTsgXAogCQkrK2NvdW50OyBcCiAJCWlmICh2bWEtPm9iai0+bWFwX2FuZF9mZW5jZWFibGUpIHsg XAogCQkJbWFwcGFibGVfc2l6ZSArPSBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKHZtYS0+b2JqKTsg XApAQCAtNTM1LDcgKzU0OSw3IEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1fZ3R0X2luZm8oc3RydWN0 IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCQlkZXNjcmliZV9vYmoobSwgb2JqKTsKIAkJc2Vx X3B1dGMobSwgJ1xuJyk7CiAJCXRvdGFsX29ial9zaXplICs9IG9iai0+YmFzZS5zaXplOwotCQl0 b3RhbF9ndHRfc2l6ZSArPSBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKG9iaik7CisJCXRvdGFsX2d0 dF9zaXplICs9IGk5MTVfZ2VtX29ial90b3RhbF9nZ3R0X3NpemUob2JqKTsKIAkJY291bnQrKzsK IAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGEyYTRhMjcxNTU1Yy4uNDkwMTZlMDFk YTZjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTE0OSwxNCArMTQ5LDE4IEBAIGk5MTVf Z2VtX2dldF9hcGVydHVyZV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRh LAogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh dGU7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9nZXRfYXBlcnR1cmUgKmFyZ3MgPSBkYXRhOwotCXN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CisJc3RydWN0IGk5MTVfZ3R0ICpnZ3R0ID0g JmRldl9wcml2LT5ndHQ7CisJc3RydWN0IGk5MTVfdm1hICp2bWE7CiAJc2l6ZV90IHBpbm5lZDsK IAogCXBpbm5lZCA9IDA7CiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWxpc3Rf Zm9yX2VhY2hfZW50cnkob2JqLCAmZGV2X3ByaXYtPm1tLmJvdW5kX2xpc3QsIGdsb2JhbF9saXN0 KQotCQlpZiAoaTkxNV9nZW1fb2JqX2lzX3Bpbm5lZChvYmopKQotCQkJcGlubmVkICs9IGk5MTVf Z2VtX29ial9nZ3R0X3NpemUob2JqKTsKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgJmdndHQt PmJhc2UuYWN0aXZlX2xpc3QsIG1tX2xpc3QpCisJCWlmICh2bWEtPnBpbl9jb3VudCkKKwkJCXBp bm5lZCArPSB2bWEtPm5vZGUuc2l6ZTsKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgJmdndHQt PmJhc2UuaW5hY3RpdmVfbGlzdCwgbW1fbGlzdCkKKwkJaWYgKHZtYS0+cGluX2NvdW50KQorCQkJ cGlubmVkICs9IHZtYS0+bm9kZS5zaXplOwogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0 ZXgpOwogCiAJYXJncy0+YXBlcl9zaXplID0gZGV2X3ByaXYtPmd0dC5iYXNlLnRvdGFsOwpAQCAt NTQ2OCw0ICs1NDcyLDMgQEAgYm9vbCBpOTE1X2dlbV9vYmpfaXNfcGlubmVkKHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmopCiAKIAlyZXR1cm4gZmFsc2U7CiB9Ci0KLS0gCjIuNC4yCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=