From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH v2] drm/i915: Report correct GGTT space usage
Date: Tue, 30 Jun 2015 11:27:20 +0100
Message-ID: <1435660040-17089-1-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <20150630100144.GB1381@nuc-i3427.alporthouse.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id CEFE06E475
 for <Intel-gfx@lists.freedesktop.org>; Tue, 30 Jun 2015 03:27:25 -0700 (PDT)
In-Reply-To: <20150630100144.GB1381@nuc-i3427.alporthouse.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkN1cnJlbnRs
eSBvbmx5IG5vcm1hbCB2aWV3cyB3ZXJlIGFjY291bnRlZCB3aGljaCB1bmRlci1hY2NvdW50cwp0
aGUgdXNhZ2UgYXMgcmVwb3J0ZWQgaW4gZGVidWdmcy4KCkludHJvZHVjZSBuZXcgaGVscGVyLCBp
OTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplLCBhbmQgdXNlIGl0CmZyb20gY2FsbCBzaXRlcyB3
aGljaCB3YW50IHRvIGtub3cgaG93IG11Y2ggR0dUVCBzcGFjZSBhcmUKb2JqZWN0cyB1c2luZy4K
CnYyOiBTaW5nbGUgbG9vcCBpbiBpOTE1X2dlbV9nZXRfYXBlcnR1cmVfaW9jdGwuIChDaHJpcyBX
aWxzb24pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50
ZWwuY29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwu
Y29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgfCAgOCArKysrLS0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgfCAgMyArKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZ2VtLmMgICAgIHwgMjMgKysrKysrKysrKysrKysrKysrKystLS0KIDMgZmlsZXMgY2hh
bmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZGVidWdmcy5jCmluZGV4IDMxZDg3NjguLjNiYjZjOTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZGVidWdmcy5jCkBAIC0yNjksNyArMjY5LDcgQEAgc3RhdGljIGludCBpOTE1X2dlbV9zdG9s
ZW5fbGlzdF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAkJbGlzdF9hZGQo
Jm9iai0+b2JqX2V4ZWNfbGluaywgJnN0b2xlbik7CiAKIAkJdG90YWxfb2JqX3NpemUgKz0gb2Jq
LT5iYXNlLnNpemU7Ci0JCXRvdGFsX2d0dF9zaXplICs9IGk5MTVfZ2VtX29ial9nZ3R0X3NpemUo
b2JqKTsKKwkJdG90YWxfZ3R0X3NpemUgKz0gaTkxNV9nZW1fb2JqX3RvdGFsX2dndHRfc2l6ZShv
YmopOwogCQljb3VudCsrOwogCX0KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KG9iaiwgJmRldl9wcml2
LT5tbS51bmJvdW5kX2xpc3QsIGdsb2JhbF9saXN0KSB7CkBAIC0yOTksNyArMjk5LDcgQEAgc3Rh
dGljIGludCBpOTE1X2dlbV9zdG9sZW5fbGlzdF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9p
ZCAqZGF0YSkKIAogI2RlZmluZSBjb3VudF9vYmplY3RzKGxpc3QsIG1lbWJlcikgZG8geyBcCiAJ
bGlzdF9mb3JfZWFjaF9lbnRyeShvYmosIGxpc3QsIG1lbWJlcikgeyBcCi0JCXNpemUgKz0gaTkx
NV9nZW1fb2JqX2dndHRfc2l6ZShvYmopOyBcCisJCXNpemUgKz0gaTkxNV9nZW1fb2JqX3RvdGFs
X2dndHRfc2l6ZShvYmopOyBcCiAJCSsrY291bnQ7IFwKIAkJaWYgKG9iai0+bWFwX2FuZF9mZW5j
ZWFibGUpIHsgXAogCQkJbWFwcGFibGVfc2l6ZSArPSBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKG9i
aik7IFwKQEAgLTQwNSw3ICs0MDUsNyBAQCBzdGF0aWMgdm9pZCBwcmludF9iYXRjaF9wb29sX3N0
YXRzKHN0cnVjdCBzZXFfZmlsZSAqbSwKIAogI2RlZmluZSBjb3VudF92bWFzKGxpc3QsIG1lbWJl
cikgZG8geyBcCiAJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsIGxpc3QsIG1lbWJlcikgeyBcCi0J
CXNpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZSh2bWEtPm9iaik7IFwKKwkJc2l6ZSArPSBp
OTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplKHZtYS0+b2JqKTsgXAogCQkrK2NvdW50OyBcCiAJ
CWlmICh2bWEtPm9iai0+bWFwX2FuZF9mZW5jZWFibGUpIHsgXAogCQkJbWFwcGFibGVfc2l6ZSAr
PSBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKHZtYS0+b2JqKTsgXApAQCAtNTM1LDcgKzUzNSw3IEBA
IHN0YXRpYyBpbnQgaTkxNV9nZW1fZ3R0X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpk
YXRhKQogCQlkZXNjcmliZV9vYmoobSwgb2JqKTsKIAkJc2VxX3B1dGMobSwgJ1xuJyk7CiAJCXRv
dGFsX29ial9zaXplICs9IG9iai0+YmFzZS5zaXplOwotCQl0b3RhbF9ndHRfc2l6ZSArPSBpOTE1
X2dlbV9vYmpfZ2d0dF9zaXplKG9iaik7CisJCXRvdGFsX2d0dF9zaXplICs9IGk5MTVfZ2VtX29i
al90b3RhbF9nZ3R0X3NpemUob2JqKTsKIAkJY291bnQrKzsKIAl9CiAKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2Rydi5oCmluZGV4IGVhOWNhZjIuLjY5MGI1NDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApA
QCAtMzAxMCw2ICszMDEwLDkgQEAgaTkxNV9nZW1fb2JqX2dndHRfc2l6ZShzdHJ1Y3QgZHJtX2k5
MTVfZ2VtX29iamVjdCAqb2JqKQogCXJldHVybiBpOTE1X2dlbV9vYmpfc2l6ZShvYmosIGk5MTVf
b2JqX3RvX2dndHQob2JqKSk7CiB9CiAKK3Vuc2lnbmVkIGxvbmcKK2k5MTVfZ2VtX29ial90b3Rh
bF9nZ3R0X3NpemUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaik7CisKIHN0YXRpYyBp
bmxpbmUgaW50IF9fbXVzdF9jaGVjawogaTkxNV9nZW1fb2JqX2dndHRfcGluKHN0cnVjdCBkcm1f
aTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCSAgICAgIHVpbnQzMl90IGFsaWdubWVudCwKZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pOTE1X2dlbS5jCmluZGV4IGEyYTRhMjcuLjMyZjYzMjMgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9nZW0uYwpAQCAtMTUwLDEzICsxNTAsMTYgQEAgaTkxNV9nZW1fZ2V0X2FwZXJ0dXJlX2lvY3Rs
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJc3RydWN0IGRybV9pOTE1X3By
aXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt
X2dldF9hcGVydHVyZSAqYXJncyA9IGRhdGE7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg
Km9iajsKKwlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAlzaXplX3QgcGlubmVkOwogCiAJcGlubmVk
ID0gMDsKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JbGlzdF9mb3JfZWFjaF9l
bnRyeShvYmosICZkZXZfcHJpdi0+bW0uYm91bmRfbGlzdCwgZ2xvYmFsX2xpc3QpCi0JCWlmIChp
OTE1X2dlbV9vYmpfaXNfcGlubmVkKG9iaikpCi0JCQlwaW5uZWQgKz0gaTkxNV9nZW1fb2JqX2dn
dHRfc2l6ZShvYmopOworCWxpc3RfZm9yX2VhY2hfZW50cnkob2JqLCAmZGV2X3ByaXYtPm1tLmJv
dW5kX2xpc3QsIGdsb2JhbF9saXN0KSB7CisJCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAmb2Jq
LT52bWFfbGlzdCwgdm1hX2xpbmspCisJCQlpZiAoaTkxNV9pc19nZ3R0KHZtYS0+dm0pICYmIHZt
YS0+cGluX2NvdW50KQorCQkJCXBpbm5lZCArPSB2bWEtPm5vZGUuc2l6ZTsKKwl9CiAJbXV0ZXhf
dW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAKIAlhcmdzLT5hcGVyX3NpemUgPSBkZXZfcHJp
di0+Z3R0LmJhc2UudG90YWw7CkBAIC01NDY5LDMgKzU0NzIsMTcgQEAgYm9vbCBpOTE1X2dlbV9v
YmpfaXNfcGlubmVkKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJcmV0dXJuIGZh
bHNlOwogfQogCit1bnNpZ25lZCBsb25nCitpOTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplKHN0
cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCit7CisJdW5zaWduZWQgbG9uZyBzaXplID0g
MDsKKwlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKKworCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAm
b2JqLT52bWFfbGlzdCwgdm1hX2xpbmspIHsKKwkJaWYgKGk5MTVfaXNfZ2d0dCh2bWEtPnZtKSAm
JgorCQkgICAgZHJtX21tX25vZGVfYWxsb2NhdGVkKCZ2bWEtPm5vZGUpKQorCQkJc2l6ZSArPSB2
bWEtPm5vZGUuc2l6ZTsKKwl9CisKKwlyZXR1cm4gc2l6ZTsKK30KLS0gCjIuNC4yCgpfX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu
ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk
ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=