From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Report correct GGTT space usage Date: Tue, 30 Jun 2015 10:28:02 +0100 Message-ID: <1435656482-12672-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id E00F36E311 for ; Tue, 30 Jun 2015 02:28:08 -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 ClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgfCAgOCArKysrLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgfCAgMyArKysKIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMgICAgIHwgMTYgKysrKysrKysrKysrKysrLQogMyBmaWxlcyBjaGFu Z2VkLCAyMiBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kZWJ1Z2ZzLmMKaW5kZXggMzFkODc2OC4uM2JiNmM5OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kZWJ1Z2ZzLmMKQEAgLTI2OSw3ICsyNjksNyBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX3N0b2xl bl9saXN0X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCQlsaXN0X2FkZCgm b2JqLT5vYmpfZXhlY19saW5rLCAmc3RvbGVuKTsKIAogCQl0b3RhbF9vYmpfc2l6ZSArPSBvYmot PmJhc2Uuc2l6ZTsKLQkJdG90YWxfZ3R0X3NpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZShv YmopOworCQl0b3RhbF9ndHRfc2l6ZSArPSBpOTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplKG9i aik7CiAJCWNvdW50Kys7CiAJfQogCWxpc3RfZm9yX2VhY2hfZW50cnkob2JqLCAmZGV2X3ByaXYt Pm1tLnVuYm91bmRfbGlzdCwgZ2xvYmFsX2xpc3QpIHsKQEAgLTI5OSw3ICsyOTksNyBAQCBzdGF0 aWMgaW50IGk5MTVfZ2VtX3N0b2xlbl9saXN0X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lk ICpkYXRhKQogCiAjZGVmaW5lIGNvdW50X29iamVjdHMobGlzdCwgbWVtYmVyKSBkbyB7IFwKIAls aXN0X2Zvcl9lYWNoX2VudHJ5KG9iaiwgbGlzdCwgbWVtYmVyKSB7IFwKLQkJc2l6ZSArPSBpOTE1 X2dlbV9vYmpfZ2d0dF9zaXplKG9iaik7IFwKKwkJc2l6ZSArPSBpOTE1X2dlbV9vYmpfdG90YWxf Z2d0dF9zaXplKG9iaik7IFwKIAkJKytjb3VudDsgXAogCQlpZiAob2JqLT5tYXBfYW5kX2ZlbmNl YWJsZSkgeyBcCiAJCQltYXBwYWJsZV9zaXplICs9IGk5MTVfZ2VtX29ial9nZ3R0X3NpemUob2Jq KTsgXApAQCAtNDA1LDcgKzQwNSw3IEBAIHN0YXRpYyB2b2lkIHByaW50X2JhdGNoX3Bvb2xfc3Rh dHMoc3RydWN0IHNlcV9maWxlICptLAogCiAjZGVmaW5lIGNvdW50X3ZtYXMobGlzdCwgbWVtYmVy KSBkbyB7IFwKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgbGlzdCwgbWVtYmVyKSB7IFwKLQkJ c2l6ZSArPSBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKHZtYS0+b2JqKTsgXAorCQlzaXplICs9IGk5 MTVfZ2VtX29ial90b3RhbF9nZ3R0X3NpemUodm1hLT5vYmopOyBcCiAJCSsrY291bnQ7IFwKIAkJ aWYgKHZtYS0+b2JqLT5tYXBfYW5kX2ZlbmNlYWJsZSkgeyBcCiAJCQltYXBwYWJsZV9zaXplICs9 IGk5MTVfZ2VtX29ial9nZ3R0X3NpemUodm1hLT5vYmopOyBcCkBAIC01MzUsNyArNTM1LDcgQEAg c3RhdGljIGludCBpOTE1X2dlbV9ndHRfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRh dGEpCiAJCWRlc2NyaWJlX29iaihtLCBvYmopOwogCQlzZXFfcHV0YyhtLCAnXG4nKTsKIAkJdG90 YWxfb2JqX3NpemUgKz0gb2JqLT5iYXNlLnNpemU7Ci0JCXRvdGFsX2d0dF9zaXplICs9IGk5MTVf Z2VtX29ial9nZ3R0X3NpemUob2JqKTsKKwkJdG90YWxfZ3R0X3NpemUgKz0gaTkxNV9nZW1fb2Jq X3RvdGFsX2dndHRfc2l6ZShvYmopOwogCQljb3VudCsrOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKaW5kZXggZWE5Y2FmMi4uNjkwYjU0MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBA IC0zMDEwLDYgKzMwMTAsOSBAQCBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKHN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpvYmopCiAJcmV0dXJuIGk5MTVfZ2VtX29ial9zaXplKG9iaiwgaTkxNV9v YmpfdG9fZ2d0dChvYmopKTsKIH0KIAordW5zaWduZWQgbG9uZworaTkxNV9nZW1fb2JqX3RvdGFs X2dndHRfc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKKwogc3RhdGljIGlu bGluZSBpbnQgX19tdXN0X2NoZWNrCiBpOTE1X2dlbV9vYmpfZ2d0dF9waW4oc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJICAgICAgdWludDMyX3QgYWxpZ25tZW50LApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKaW5kZXggYTJhNGEyNy4uN2Q2OTI5NCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCkBAIC0xNTYsNyArMTU2LDcgQEAgaTkxNV9nZW1fZ2V0X2FwZXJ0dXJlX2lvY3RsKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwogCWxpc3RfZm9yX2VhY2hfZW50cnkob2JqLCAmZGV2X3ByaXYtPm1tLmJvdW5k X2xpc3QsIGdsb2JhbF9saXN0KQogCQlpZiAoaTkxNV9nZW1fb2JqX2lzX3Bpbm5lZChvYmopKQot CQkJcGlubmVkICs9IGk5MTVfZ2VtX29ial9nZ3R0X3NpemUob2JqKTsKKwkJCXBpbm5lZCArPSBp OTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplKG9iaik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0 cnVjdF9tdXRleCk7CiAKIAlhcmdzLT5hcGVyX3NpemUgPSBkZXZfcHJpdi0+Z3R0LmJhc2UudG90 YWw7CkBAIC01NDY5LDMgKzU0NjksMTcgQEAgYm9vbCBpOTE1X2dlbV9vYmpfaXNfcGlubmVkKHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJcmV0dXJuIGZhbHNlOwogfQogCit1bnNp Z25lZCBsb25nCitpOTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplKHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmopCit7CisJdW5zaWduZWQgbG9uZyBzaXplID0gMDsKKwlzdHJ1Y3QgaTkx NV92bWEgKnZtYTsKKworCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAmb2JqLT52bWFfbGlzdCwg dm1hX2xpbmspIHsKKwkJaWYgKGk5MTVfaXNfZ2d0dCh2bWEtPnZtKSAmJgorCQkgICAgZHJtX21t X25vZGVfYWxsb2NhdGVkKCZ2bWEtPm5vZGUpKQorCQkJc2l6ZSArPSB2bWEtPm5vZGUuc2l6ZTsK Kwl9CisKKwlyZXR1cm4gc2l6ZTsKK30KLS0gCjIuNC4yCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=