From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH v4] drm/i915: Report correct GGTT space usage
Date: Tue, 30 Jun 2015 15:32:47 +0100
Message-ID: <1435674767-6576-1-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <20150630133000.GS1381@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 mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id C37386E47C
 for <Intel-gfx@lists.freedesktop.org>; Tue, 30 Jun 2015 07:32:51 -0700 (PDT)
In-Reply-To: <20150630133000.GS1381@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
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkN1cnJlbnRs
eSBvbmx5IG5vcm1hbCB2aWV3cyB3ZXJlIGFjY291bnRlZCB3aGljaCB1bmRlci1hY2NvdW50cwp0
aGUgdXNhZ2UgYXMgcmVwb3J0ZWQgaW4gZGVidWdmcy4KCkludHJvZHVjZSBuZXcgaGVscGVyLCBp
OTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplLCBhbmQgdXNlIGl0CmZyb20gY2FsbCBzaXRlcyB3
aGljaCB3YW50IHRvIGtub3cgaG93IG11Y2ggR0dUVCBzcGFjZSBhcmUKb2JqZWN0cyB1c2luZy4K
CnYyOiBTaW5nbGUgbG9vcCBpbiBpOTE1X2dlbV9nZXRfYXBlcnR1cmVfaW9jdGwuIChDaHJpcyBX
aWxzb24pCgp2MzogV2FsayBHR1RUIGFjdGl2ZS9pbmFjdGl2ZSBsaXN0cyBpbiBpOTE1X2dlbV9n
ZXRfYXBlcnR1cmVfaW9jdGwKICAgIGZvciBiZXR0ZXIgZWZmaWNpZW5jeS4gKENocmlzIFdpbHNv
biwgRGFuaWVsIFZldHRlcikKCnY0OiBNYWtlIGk5MTVfZ2VtX29ial90b3RhbF9nZ3R0X3NpemUg
cHJpdmF0ZSB0byBkZWJ1Z2ZzLiAoQ2hyaXMgV2lsc29uKQoKU2lnbmVkLW9mZi1ieTogVHZydGtv
IFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8
am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNA
Y2hyaXMtd2lsc29uLmNvLnVrPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZnds
bC5jaD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDIzICsrKysr
KysrKysrKysrKysrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICB8
IDEzICsrKysrKysrLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgOSBk
ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn
ZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDMxZDg3Njg1
ZjNiOS4uMTZkOTIxMTVjM2U2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAt
MTE3LDYgKzExNywyMSBAQCBzdGF0aWMgaW5saW5lIGNvbnN0IGNoYXIgKmdldF9nbG9iYWxfZmxh
ZyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCXJldHVybiBpOTE1X2dlbV9vYmpf
dG9fZ2d0dChvYmopID8gImciIDogIiAiOwogfQogCitzdGF0aWMgdW5zaWduZWQgbG9uZworaTkx
NV9nZW1fb2JqX3RvdGFsX2dndHRfc2l6ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq
KQoreworCXVuc2lnbmVkIGxvbmcgc2l6ZSA9IDA7CisJc3RydWN0IGk5MTVfdm1hICp2bWE7CisK
KwlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgJm9iai0+dm1hX2xpc3QsIHZtYV9saW5rKSB7CisJ
CWlmIChpOTE1X2lzX2dndHQodm1hLT52bSkgJiYKKwkJICAgIGRybV9tbV9ub2RlX2FsbG9jYXRl
ZCgmdm1hLT5ub2RlKSkKKwkJCXNpemUgKz0gdm1hLT5ub2RlLnNpemU7CisJfQorCisJcmV0dXJu
IHNpemU7Cit9CisKIHN0YXRpYyB2b2lkCiBkZXNjcmliZV9vYmooc3RydWN0IHNlcV9maWxlICpt
LCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogewpAQCAtMjY5LDcgKzI4NCw3IEBA
IHN0YXRpYyBpbnQgaTkxNV9nZW1fc3RvbGVuX2xpc3RfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0s
IHZvaWQgKmRhdGEpCiAJCWxpc3RfYWRkKCZvYmotPm9ial9leGVjX2xpbmssICZzdG9sZW4pOwog
CiAJCXRvdGFsX29ial9zaXplICs9IG9iai0+YmFzZS5zaXplOwotCQl0b3RhbF9ndHRfc2l6ZSAr
PSBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKG9iaik7CisJCXRvdGFsX2d0dF9zaXplICs9IGk5MTVf
Z2VtX29ial90b3RhbF9nZ3R0X3NpemUob2JqKTsKIAkJY291bnQrKzsKIAl9CiAJbGlzdF9mb3Jf
ZWFjaF9lbnRyeShvYmosICZkZXZfcHJpdi0+bW0udW5ib3VuZF9saXN0LCBnbG9iYWxfbGlzdCkg
ewpAQCAtMjk5LDcgKzMxNCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1fc3RvbGVuX2xpc3RfaW5m
byhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAKICNkZWZpbmUgY291bnRfb2JqZWN0
cyhsaXN0LCBtZW1iZXIpIGRvIHsgXAogCWxpc3RfZm9yX2VhY2hfZW50cnkob2JqLCBsaXN0LCBt
ZW1iZXIpIHsgXAotCQlzaXplICs9IGk5MTVfZ2VtX29ial9nZ3R0X3NpemUob2JqKTsgXAorCQlz
aXplICs9IGk5MTVfZ2VtX29ial90b3RhbF9nZ3R0X3NpemUob2JqKTsgXAogCQkrK2NvdW50OyBc
CiAJCWlmIChvYmotPm1hcF9hbmRfZmVuY2VhYmxlKSB7IFwKIAkJCW1hcHBhYmxlX3NpemUgKz0g
aTkxNV9nZW1fb2JqX2dndHRfc2l6ZShvYmopOyBcCkBAIC00MDUsNyArNDIwLDcgQEAgc3RhdGlj
IHZvaWQgcHJpbnRfYmF0Y2hfcG9vbF9zdGF0cyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sCiAKICNkZWZp
bmUgY291bnRfdm1hcyhsaXN0LCBtZW1iZXIpIGRvIHsgXAogCWxpc3RfZm9yX2VhY2hfZW50cnko
dm1hLCBsaXN0LCBtZW1iZXIpIHsgXAotCQlzaXplICs9IGk5MTVfZ2VtX29ial9nZ3R0X3NpemUo
dm1hLT5vYmopOyBcCisJCXNpemUgKz0gaTkxNV9nZW1fb2JqX3RvdGFsX2dndHRfc2l6ZSh2bWEt
Pm9iaik7IFwKIAkJKytjb3VudDsgXAogCQlpZiAodm1hLT5vYmotPm1hcF9hbmRfZmVuY2VhYmxl
KSB7IFwKIAkJCW1hcHBhYmxlX3NpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZSh2bWEtPm9i
aik7IFwKQEAgLTUzNSw3ICs1NTAsNyBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX2d0dF9pbmZvKHN0
cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAkJZGVzY3JpYmVfb2JqKG0sIG9iaik7CiAJ
CXNlcV9wdXRjKG0sICdcbicpOwogCQl0b3RhbF9vYmpfc2l6ZSArPSBvYmotPmJhc2Uuc2l6ZTsK
LQkJdG90YWxfZ3R0X3NpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZShvYmopOworCQl0b3Rh
bF9ndHRfc2l6ZSArPSBpOTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9zaXplKG9iaik7CiAJCWNvdW50
Kys7CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBhMmE0YTI3MTU1NWMuLjQ5MDE2
ZTAxZGE2YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0xNDksMTQgKzE0OSwxOCBAQCBp
OTE1X2dlbV9nZXRfYXBlcnR1cmVfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAq
ZGF0YSwKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w
cml2YXRlOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fZ2V0X2FwZXJ0dXJlICphcmdzID0gZGF0YTsK
LQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOworCXN0cnVjdCBpOTE1X2d0dCAqZ2d0
dCA9ICZkZXZfcHJpdi0+Z3R0OworCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwogCXNpemVfdCBwaW5u
ZWQ7CiAKIAlwaW5uZWQgPSAwOwogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQls
aXN0X2Zvcl9lYWNoX2VudHJ5KG9iaiwgJmRldl9wcml2LT5tbS5ib3VuZF9saXN0LCBnbG9iYWxf
bGlzdCkKLQkJaWYgKGk5MTVfZ2VtX29ial9pc19waW5uZWQob2JqKSkKLQkJCXBpbm5lZCArPSBp
OTE1X2dlbV9vYmpfZ2d0dF9zaXplKG9iaik7CisJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsICZn
Z3R0LT5iYXNlLmFjdGl2ZV9saXN0LCBtbV9saXN0KQorCQlpZiAodm1hLT5waW5fY291bnQpCisJ
CQlwaW5uZWQgKz0gdm1hLT5ub2RlLnNpemU7CisJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsICZn
Z3R0LT5iYXNlLmluYWN0aXZlX2xpc3QsIG1tX2xpc3QpCisJCWlmICh2bWEtPnBpbl9jb3VudCkK
KwkJCXBpbm5lZCArPSB2bWEtPm5vZGUuc2l6ZTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0
X211dGV4KTsKIAogCWFyZ3MtPmFwZXJfc2l6ZSA9IGRldl9wcml2LT5ndHQuYmFzZS50b3RhbDsK
QEAgLTU0NjgsNCArNTQ3MiwzIEBAIGJvb2wgaTkxNV9nZW1fb2JqX2lzX3Bpbm5lZChzdHJ1Y3Qg
ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCiAJcmV0dXJuIGZhbHNlOwogfQotCi0tIAoyLjQu
MgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt
Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK