From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 07/37] drm/i915: Reduce i915_gem_objects to only show object information Date: Fri, 12 Aug 2016 07:53:57 +0100 Message-ID: <1470984867-7132-7-git-send-email-chris@chris-wilson.co.uk> References: <1470984867-7132-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 355796E0F3 for ; Fri, 12 Aug 2016 06:54:41 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id i138so1157374wmf.3 for ; Thu, 11 Aug 2016 23:54:41 -0700 (PDT) In-Reply-To: <1470984867-7132-1-git-send-email-chris@chris-wilson.co.uk> 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 Tm8gbG9uZ2VyIGlzIGtub3dpbmcgaG93IG11Y2ggb2YgdGhlIEdUVCAoYm90aCBtYXBwYWJsZSBh cGVydHVyZSBhbmQKYmV5b25kKSByZWxldmFudCwgYW5kIHRoZSBvdXRwdXQgY2x1dHRlcnMgdGhl IHJlYWwgaW5mb3JtYXRpb24gLSB0aGF0IGlzCmhvdyBtYW55IG9iamVjdHMgYXJlIGFsbG9jYXRl ZCBhbmQgYm91bmQgKGFuZCBieSB3aG8pIHNvIHRoYXQgd2UgY2FuCnF1aWNrbHkgZ3Jhc3AgaWYg dGhlcmUgaXMgYSBsZWFrLgoKdjI6IFJlbGVudCwgYW5kIHJlbmFtZSBwaW5uZWQgdG8gaW5kaWNh dGUgZGlzcGxheSBvbmx5LiBTaW5jZSB0aGUKZGlzcGxheSBvYmplY3RzIGFyZSBzZW1pLXN0YXRp YyBhbmQgYXJlIG9mIHZhcmlhYmxlIHNpemUsIHRoZXkgYXJlIHRoZQppbnRlcmVzdGluZyBvYmpl Y3RzIHRvIHdhdGNoIG92ZXIgdGltZSBmb3IgYXBlcnR1cmUgbGVha2luZy4gVGhlIG90aGVyCnBp bnMgYXJlIGVpdGhlciBzdGF0aWMgKHN1Y2ggYXMgdGhlIHNjcmF0Y2ggcGFnZSkgb3IgdmVyeSBz aG9ydCBsaXZlZAooc3VjaCBhcyBleGVjYnVmKSBhbmQgbm90IHBhcnQgb2YgdGhlIHByZWNpb3Vz IEdHVFQuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5j by51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDEwMCArKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOCBpbnNl cnRpb25zKCspLCA3MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j CmluZGV4IGM1MzVjNGMyZjdhZi4uZmQwMjg5NTM0NTNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYwpAQCAtMjY5LDE3ICsyNjksNiBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX3N0b2xl bl9saXN0X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCXJldHVybiAwOwog fQogCi0jZGVmaW5lIGNvdW50X29iamVjdHMobGlzdCwgbWVtYmVyKSBkbyB7IFwKLQlsaXN0X2Zv cl9lYWNoX2VudHJ5KG9iaiwgbGlzdCwgbWVtYmVyKSB7IFwKLQkJc2l6ZSArPSBpOTE1X2dlbV9v YmpfdG90YWxfZ2d0dF9zaXplKG9iaik7IFwKLQkJKytjb3VudDsgXAotCQlpZiAob2JqLT5tYXBf YW5kX2ZlbmNlYWJsZSkgeyBcCi0JCQltYXBwYWJsZV9zaXplICs9IGk5MTVfZ2VtX29ial9nZ3R0 X3NpemUob2JqKTsgXAotCQkJKyttYXBwYWJsZV9jb3VudDsgXAotCQl9IFwKLQl9IFwKLX0gd2hp bGUgKDApCi0KIHN0cnVjdCBmaWxlX3N0YXRzIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2 YXRlICpmaWxlX3ByaXY7CiAJdW5zaWduZWQgbG9uZyBjb3VudDsKQEAgLTM5NCwzMCArMzgzLDE2 IEBAIHN0YXRpYyB2b2lkIHByaW50X2NvbnRleHRfc3RhdHMoc3RydWN0IHNlcV9maWxlICptLAog CXByaW50X2ZpbGVfc3RhdHMobSwgIltrXWNvbnRleHRzIiwgc3RhdHMpOwogfQogCi0jZGVmaW5l IGNvdW50X3ZtYXMobGlzdCwgbWVtYmVyKSBkbyB7IFwKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZt YSwgbGlzdCwgbWVtYmVyKSB7IFwKLQkJc2l6ZSArPSBpOTE1X2dlbV9vYmpfdG90YWxfZ2d0dF9z aXplKHZtYS0+b2JqKTsgXAotCQkrK2NvdW50OyBcCi0JCWlmICh2bWEtPm9iai0+bWFwX2FuZF9m ZW5jZWFibGUpIHsgXAotCQkJbWFwcGFibGVfc2l6ZSArPSBpOTE1X2dlbV9vYmpfZ2d0dF9zaXpl KHZtYS0+b2JqKTsgXAotCQkJKyttYXBwYWJsZV9jb3VudDsgXAotCQl9IFwKLQl9IFwKLX0gd2hp bGUgKDApCi0KIHN0YXRpYyBpbnQgaTkxNV9nZW1fb2JqZWN0X2luZm8oc3RydWN0IHNlcV9maWxl ICptLCB2b2lkKiBkYXRhKQogewogCXN0cnVjdCBkcm1faW5mb19ub2RlICpub2RlID0gbS0+cHJp dmF0ZTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbm9kZS0+bWlub3ItPmRldjsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGk5 MTVfZ2d0dCAqZ2d0dCA9ICZkZXZfcHJpdi0+Z2d0dDsKLQl1MzIgY291bnQsIG1hcHBhYmxlX2Nv dW50LCBwdXJnZWFibGVfY291bnQ7Ci0JdTY0IHNpemUsIG1hcHBhYmxlX3NpemUsIHB1cmdlYWJs ZV9zaXplOwotCXVuc2lnbmVkIGxvbmcgcGluX21hcHBlZF9jb3VudCA9IDAsIHBpbl9tYXBwZWRf cHVyZ2VhYmxlX2NvdW50ID0gMDsKLQl1NjQgcGluX21hcHBlZF9zaXplID0gMCwgcGluX21hcHBl ZF9wdXJnZWFibGVfc2l6ZSA9IDA7CisJdTMyIGNvdW50LCBtYXBwZWRfY291bnQsIHB1cmdlYWJs ZV9jb3VudCwgZHB5X2NvdW50OworCXU2NCBzaXplLCBtYXBwZWRfc2l6ZSwgcHVyZ2VhYmxlX3Np emUsIGRweV9zaXplOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJc3RydWN0 IGRybV9maWxlICpmaWxlOwotCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwogCWludCByZXQ7CiAKIAly ZXQgPSBtdXRleF9sb2NrX2ludGVycnVwdGlibGUoJmRldi0+c3RydWN0X211dGV4KTsKQEAgLTQy OCw3MCArNDAzLDUxIEBAIHN0YXRpYyBpbnQgaTkxNV9nZW1fb2JqZWN0X2luZm8oc3RydWN0IHNl cV9maWxlICptLCB2b2lkKiBkYXRhKQogCQkgICBkZXZfcHJpdi0+bW0ub2JqZWN0X2NvdW50LAog CQkgICBkZXZfcHJpdi0+bW0ub2JqZWN0X21lbW9yeSk7CiAKLQlzaXplID0gY291bnQgPSBtYXBw YWJsZV9zaXplID0gbWFwcGFibGVfY291bnQgPSAwOwotCWNvdW50X29iamVjdHMoJmRldl9wcml2 LT5tbS5ib3VuZF9saXN0LCBnbG9iYWxfbGlzdCk7Ci0Jc2VxX3ByaW50ZihtLCAiJXUgWyV1XSBv YmplY3RzLCAlbGx1IFslbGx1XSBieXRlcyBpbiBndHRcbiIsCi0JCSAgIGNvdW50LCBtYXBwYWJs ZV9jb3VudCwgc2l6ZSwgbWFwcGFibGVfc2l6ZSk7Ci0KLQlzaXplID0gY291bnQgPSBtYXBwYWJs ZV9zaXplID0gbWFwcGFibGVfY291bnQgPSAwOwotCWNvdW50X3ZtYXMoJmdndHQtPmJhc2UuYWN0 aXZlX2xpc3QsIHZtX2xpbmspOwotCXNlcV9wcmludGYobSwgIiAgJXUgWyV1XSBhY3RpdmUgb2Jq ZWN0cywgJWxsdSBbJWxsdV0gYnl0ZXNcbiIsCi0JCSAgIGNvdW50LCBtYXBwYWJsZV9jb3VudCwg c2l6ZSwgbWFwcGFibGVfc2l6ZSk7Ci0KLQlzaXplID0gY291bnQgPSBtYXBwYWJsZV9zaXplID0g bWFwcGFibGVfY291bnQgPSAwOwotCWNvdW50X3ZtYXMoJmdndHQtPmJhc2UuaW5hY3RpdmVfbGlz dCwgdm1fbGluayk7Ci0Jc2VxX3ByaW50ZihtLCAiICAldSBbJXVdIGluYWN0aXZlIG9iamVjdHMs ICVsbHUgWyVsbHVdIGJ5dGVzXG4iLAotCQkgICBjb3VudCwgbWFwcGFibGVfY291bnQsIHNpemUs IG1hcHBhYmxlX3NpemUpOwotCiAJc2l6ZSA9IGNvdW50ID0gcHVyZ2VhYmxlX3NpemUgPSBwdXJn ZWFibGVfY291bnQgPSAwOwogCWxpc3RfZm9yX2VhY2hfZW50cnkob2JqLCAmZGV2X3ByaXYtPm1t LnVuYm91bmRfbGlzdCwgZ2xvYmFsX2xpc3QpIHsKLQkJc2l6ZSArPSBvYmotPmJhc2Uuc2l6ZSwg Kytjb3VudDsKLQkJaWYgKG9iai0+bWFkdiA9PSBJOTE1X01BRFZfRE9OVE5FRUQpCi0JCQlwdXJn ZWFibGVfc2l6ZSArPSBvYmotPmJhc2Uuc2l6ZSwgKytwdXJnZWFibGVfY291bnQ7CisJCXNpemUg Kz0gb2JqLT5iYXNlLnNpemU7CisJCSsrY291bnQ7CisKKwkJaWYgKG9iai0+bWFkdiA9PSBJOTE1 X01BRFZfRE9OVE5FRUQpIHsKKwkJCXB1cmdlYWJsZV9zaXplICs9IG9iai0+YmFzZS5zaXplOwor CQkJKytwdXJnZWFibGVfY291bnQ7CisJCX0KKwogCQlpZiAob2JqLT5tYXBwaW5nKSB7Ci0JCQlw aW5fbWFwcGVkX2NvdW50Kys7Ci0JCQlwaW5fbWFwcGVkX3NpemUgKz0gb2JqLT5iYXNlLnNpemU7 Ci0JCQlpZiAob2JqLT5wYWdlc19waW5fY291bnQgPT0gMCkgewotCQkJCXBpbl9tYXBwZWRfcHVy Z2VhYmxlX2NvdW50Kys7Ci0JCQkJcGluX21hcHBlZF9wdXJnZWFibGVfc2l6ZSArPSBvYmotPmJh c2Uuc2l6ZTsKLQkJCX0KKwkJCW1hcHBlZF9jb3VudCsrOworCQkJbWFwcGVkX3NpemUgKz0gb2Jq LT5iYXNlLnNpemU7CiAJCX0KIAl9CiAJc2VxX3ByaW50ZihtLCAiJXUgdW5ib3VuZCBvYmplY3Rz LCAlbGx1IGJ5dGVzXG4iLCBjb3VudCwgc2l6ZSk7CiAKLQlzaXplID0gY291bnQgPSBtYXBwYWJs ZV9zaXplID0gbWFwcGFibGVfY291bnQgPSAwOworCXNpemUgPSBjb3VudCA9IGRweV9zaXplID0g ZHB5X2NvdW50ID0gMDsKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KG9iaiwgJmRldl9wcml2LT5tbS5i b3VuZF9saXN0LCBnbG9iYWxfbGlzdCkgewotCQlpZiAob2JqLT5mYXVsdF9tYXBwYWJsZSkgewot CQkJc2l6ZSArPSBpOTE1X2dlbV9vYmpfZ2d0dF9zaXplKG9iaik7Ci0JCQkrK2NvdW50OwotCQl9 CisJCXNpemUgKz0gb2JqLT5iYXNlLnNpemU7CisJCSsrY291bnQ7CisKIAkJaWYgKG9iai0+cGlu X2Rpc3BsYXkpIHsKLQkJCW1hcHBhYmxlX3NpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZShv YmopOwotCQkJKyttYXBwYWJsZV9jb3VudDsKKwkJCWRweV9zaXplICs9IG9iai0+YmFzZS5zaXpl OworCQkJKytkcHlfY291bnQ7CiAJCX0KKwogCQlpZiAob2JqLT5tYWR2ID09IEk5MTVfTUFEVl9E T05UTkVFRCkgewogCQkJcHVyZ2VhYmxlX3NpemUgKz0gb2JqLT5iYXNlLnNpemU7CiAJCQkrK3B1 cmdlYWJsZV9jb3VudDsKIAkJfQorCiAJCWlmIChvYmotPm1hcHBpbmcpIHsKLQkJCXBpbl9tYXBw ZWRfY291bnQrKzsKLQkJCXBpbl9tYXBwZWRfc2l6ZSArPSBvYmotPmJhc2Uuc2l6ZTsKLQkJCWlm IChvYmotPnBhZ2VzX3Bpbl9jb3VudCA9PSAwKSB7Ci0JCQkJcGluX21hcHBlZF9wdXJnZWFibGVf Y291bnQrKzsKLQkJCQlwaW5fbWFwcGVkX3B1cmdlYWJsZV9zaXplICs9IG9iai0+YmFzZS5zaXpl OwotCQkJfQorCQkJbWFwcGVkX2NvdW50Kys7CisJCQltYXBwZWRfc2l6ZSArPSBvYmotPmJhc2Uu c2l6ZTsKIAkJfQogCX0KKwlzZXFfcHJpbnRmKG0sICIldSBib3VuZCBvYmplY3RzLCAlbGx1IGJ5 dGVzXG4iLAorCQkgICBjb3VudCwgc2l6ZSk7CiAJc2VxX3ByaW50ZihtLCAiJXUgcHVyZ2VhYmxl IG9iamVjdHMsICVsbHUgYnl0ZXNcbiIsCiAJCSAgIHB1cmdlYWJsZV9jb3VudCwgcHVyZ2VhYmxl X3NpemUpOwotCXNlcV9wcmludGYobSwgIiV1IHBpbm5lZCBtYXBwYWJsZSBvYmplY3RzLCAlbGx1 IGJ5dGVzXG4iLAotCQkgICBtYXBwYWJsZV9jb3VudCwgbWFwcGFibGVfc2l6ZSk7Ci0Jc2VxX3By aW50ZihtLCAiJXUgZmF1bHQgbWFwcGFibGUgb2JqZWN0cywgJWxsdSBieXRlc1xuIiwKLQkJICAg Y291bnQsIHNpemUpOwotCXNlcV9wcmludGYobSwKLQkJICAgIiVsdSBbJWx1XSBwaW4gbWFwcGVk IG9iamVjdHMsICVsbHUgWyVsbHVdIGJ5dGVzIFtwdXJnZWFibGVdXG4iLAotCQkgICBwaW5fbWFw cGVkX2NvdW50LCBwaW5fbWFwcGVkX3B1cmdlYWJsZV9jb3VudCwKLQkJICAgcGluX21hcHBlZF9z aXplLCBwaW5fbWFwcGVkX3B1cmdlYWJsZV9zaXplKTsKKwlzZXFfcHJpbnRmKG0sICIldSBtYXBw ZWQgb2JqZWN0cywgJWxsdSBieXRlc1xuIiwKKwkJICAgbWFwcGVkX2NvdW50LCBtYXBwZWRfc2l6 ZSk7CisJc2VxX3ByaW50ZihtLCAiJXUgZGlzcGxheSBvYmplY3RzIChwaW5uZWQpLCAlbGx1IGJ5 dGVzXG4iLAorCQkgICBkcHlfY291bnQsIGRweV9zaXplKTsKIAogCXNlcV9wcmludGYobSwgIiVs bHUgWyVsbHVdIGd0dCB0b3RhbFxuIiwKIAkJICAgZ2d0dC0+YmFzZS50b3RhbCwgZ2d0dC0+bWFw cGFibGVfZW5kIC0gZ2d0dC0+YmFzZS5zdGFydCk7Ci0tIAoyLjguMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==