From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 12/33] drm/i915: Reduce i915_gem_objects to only show object information Date: Sun, 7 Aug 2016 15:45:20 +0100 Message-ID: <1470581141-14432-13-git-send-email-chris@chris-wilson.co.uk> References: <1470581141-14432-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-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 484876E2F5 for ; Sun, 7 Aug 2016 14:46:04 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id i5so11072815wmg.2 for ; Sun, 07 Aug 2016 07:46:04 -0700 (PDT) In-Reply-To: <1470581141-14432-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 dGhlcmUgaXMgYSBsZWFrLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJp cy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMg fCAxMDAgKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMjggaW5zZXJ0aW9ucygrKSwgNzIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYwppbmRleCA5OTExNTk0YWNiYzkuLmI0MWMwNTc2N2RlZiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTI2OSwxNyArMjY5LDYgQEAgc3RhdGljIGludCBpOTE1 X2dlbV9zdG9sZW5fbGlzdF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAly ZXR1cm4gMDsKIH0KIAotI2RlZmluZSBjb3VudF9vYmplY3RzKGxpc3QsIG1lbWJlcikgZG8geyBc Ci0JbGlzdF9mb3JfZWFjaF9lbnRyeShvYmosIGxpc3QsIG1lbWJlcikgeyBcCi0JCXNpemUgKz0g aTkxNV9nZW1fb2JqX3RvdGFsX2dndHRfc2l6ZShvYmopOyBcCi0JCSsrY291bnQ7IFwKLQkJaWYg KG9iai0+bWFwX2FuZF9mZW5jZWFibGUpIHsgXAotCQkJbWFwcGFibGVfc2l6ZSArPSBpOTE1X2dl bV9vYmpfZ2d0dF9zaXplKG9iaik7IFwKLQkJCSsrbWFwcGFibGVfY291bnQ7IFwKLQkJfSBcCi0J fSBcCi19IHdoaWxlICgwKQotCiBzdHJ1Y3QgZmlsZV9zdGF0cyB7CiAJc3RydWN0IGRybV9pOTE1 X2ZpbGVfcHJpdmF0ZSAqZmlsZV9wcml2OwogCXVuc2lnbmVkIGxvbmcgY291bnQ7CkBAIC0zOTQs MzAgKzM4MywxNiBAQCBzdGF0aWMgdm9pZCBwcmludF9jb250ZXh0X3N0YXRzKHN0cnVjdCBzZXFf ZmlsZSAqbSwKIAlwcmludF9maWxlX3N0YXRzKG0sICJba11jb250ZXh0cyIsIHN0YXRzKTsKIH0K IAotI2RlZmluZSBjb3VudF92bWFzKGxpc3QsIG1lbWJlcikgZG8geyBcCi0JbGlzdF9mb3JfZWFj aF9lbnRyeSh2bWEsIGxpc3QsIG1lbWJlcikgeyBcCi0JCXNpemUgKz0gaTkxNV9nZW1fb2JqX3Rv dGFsX2dndHRfc2l6ZSh2bWEtPm9iaik7IFwKLQkJKytjb3VudDsgXAotCQlpZiAodm1hLT5vYmot Pm1hcF9hbmRfZmVuY2VhYmxlKSB7IFwKLQkJCW1hcHBhYmxlX3NpemUgKz0gaTkxNV9nZW1fb2Jq X2dndHRfc2l6ZSh2bWEtPm9iaik7IFwKLQkJCSsrbWFwcGFibGVfY291bnQ7IFwKLQkJfSBcCi0J fSBcCi19IHdoaWxlICgwKQotCiBzdGF0aWMgaW50IGk5MTVfZ2VtX29iamVjdF9pbmZvKHN0cnVj dCBzZXFfZmlsZSAqbSwgdm9pZCogZGF0YSkKIHsKIAlzdHJ1Y3QgZHJtX2luZm9fbm9kZSAqbm9k ZSA9IG0tPnByaXZhdGU7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG5vZGUtPm1pbm9yLT5k ZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwog CXN0cnVjdCBpOTE1X2dndHQgKmdndHQgPSAmZGV2X3ByaXYtPmdndHQ7Ci0JdTMyIGNvdW50LCBt YXBwYWJsZV9jb3VudCwgcHVyZ2VhYmxlX2NvdW50OwotCXU2NCBzaXplLCBtYXBwYWJsZV9zaXpl LCBwdXJnZWFibGVfc2l6ZTsKLQl1bnNpZ25lZCBsb25nIHBpbl9tYXBwZWRfY291bnQgPSAwLCBw aW5fbWFwcGVkX3B1cmdlYWJsZV9jb3VudCA9IDA7Ci0JdTY0IHBpbl9tYXBwZWRfc2l6ZSA9IDAs IHBpbl9tYXBwZWRfcHVyZ2VhYmxlX3NpemUgPSAwOworCXUzMiBjb3VudCwgbWFwcGVkX2NvdW50 LCBwdXJnZWFibGVfY291bnQsIHBpbl9jb3VudDsKKwl1NjQgc2l6ZSwgbWFwcGVkX3NpemUsIHB1 cmdlYWJsZV9zaXplLCBwaW5fc2l6ZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq OwogCXN0cnVjdCBkcm1fZmlsZSAqZmlsZTsKLQlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAlpbnQg cmV0OwogCiAJcmV0ID0gbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZkZXYtPnN0cnVjdF9tdXRl eCk7CkBAIC00MjgsNzAgKzQwMyw1MSBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX29iamVjdF9pbmZv KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCogZGF0YSkKIAkJICAgZGV2X3ByaXYtPm1tLm9iamVj dF9jb3VudCwKIAkJICAgZGV2X3ByaXYtPm1tLm9iamVjdF9tZW1vcnkpOwogCi0Jc2l6ZSA9IGNv dW50ID0gbWFwcGFibGVfc2l6ZSA9IG1hcHBhYmxlX2NvdW50ID0gMDsKLQljb3VudF9vYmplY3Rz KCZkZXZfcHJpdi0+bW0uYm91bmRfbGlzdCwgZ2xvYmFsX2xpc3QpOwotCXNlcV9wcmludGYobSwg IiV1IFsldV0gb2JqZWN0cywgJWxsdSBbJWxsdV0gYnl0ZXMgaW4gZ3R0XG4iLAotCQkgICBjb3Vu dCwgbWFwcGFibGVfY291bnQsIHNpemUsIG1hcHBhYmxlX3NpemUpOwotCi0Jc2l6ZSA9IGNvdW50 ID0gbWFwcGFibGVfc2l6ZSA9IG1hcHBhYmxlX2NvdW50ID0gMDsKLQljb3VudF92bWFzKCZnZ3R0 LT5iYXNlLmFjdGl2ZV9saXN0LCB2bV9saW5rKTsKLQlzZXFfcHJpbnRmKG0sICIgICV1IFsldV0g YWN0aXZlIG9iamVjdHMsICVsbHUgWyVsbHVdIGJ5dGVzXG4iLAotCQkgICBjb3VudCwgbWFwcGFi bGVfY291bnQsIHNpemUsIG1hcHBhYmxlX3NpemUpOwotCi0Jc2l6ZSA9IGNvdW50ID0gbWFwcGFi bGVfc2l6ZSA9IG1hcHBhYmxlX2NvdW50ID0gMDsKLQljb3VudF92bWFzKCZnZ3R0LT5iYXNlLmlu YWN0aXZlX2xpc3QsIHZtX2xpbmspOwotCXNlcV9wcmludGYobSwgIiAgJXUgWyV1XSBpbmFjdGl2 ZSBvYmplY3RzLCAlbGx1IFslbGx1XSBieXRlc1xuIiwKLQkJICAgY291bnQsIG1hcHBhYmxlX2Nv dW50LCBzaXplLCBtYXBwYWJsZV9zaXplKTsKLQogCXNpemUgPSBjb3VudCA9IHB1cmdlYWJsZV9z aXplID0gcHVyZ2VhYmxlX2NvdW50ID0gMDsKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KG9iaiwgJmRl dl9wcml2LT5tbS51bmJvdW5kX2xpc3QsIGdsb2JhbF9saXN0KSB7Ci0JCXNpemUgKz0gb2JqLT5i YXNlLnNpemUsICsrY291bnQ7Ci0JCWlmIChvYmotPm1hZHYgPT0gSTkxNV9NQURWX0RPTlRORUVE KQotCQkJcHVyZ2VhYmxlX3NpemUgKz0gb2JqLT5iYXNlLnNpemUsICsrcHVyZ2VhYmxlX2NvdW50 OworCQlzaXplICs9IG9iai0+YmFzZS5zaXplOworCQkrK2NvdW50OworCisJCWlmIChvYmotPm1h ZHYgPT0gSTkxNV9NQURWX0RPTlRORUVEKSB7CisJCQlwdXJnZWFibGVfc2l6ZSArPSBvYmotPmJh c2Uuc2l6ZTsKKwkJCSsrcHVyZ2VhYmxlX2NvdW50OworCQl9CisKIAkJaWYgKG9iai0+bWFwcGlu ZykgewotCQkJcGluX21hcHBlZF9jb3VudCsrOwotCQkJcGluX21hcHBlZF9zaXplICs9IG9iai0+ YmFzZS5zaXplOwotCQkJaWYgKG9iai0+cGFnZXNfcGluX2NvdW50ID09IDApIHsKLQkJCQlwaW5f bWFwcGVkX3B1cmdlYWJsZV9jb3VudCsrOwotCQkJCXBpbl9tYXBwZWRfcHVyZ2VhYmxlX3NpemUg Kz0gb2JqLT5iYXNlLnNpemU7Ci0JCQl9CisJCQltYXBwZWRfY291bnQrKzsKKwkJCW1hcHBlZF9z aXplICs9IG9iai0+YmFzZS5zaXplOwogCQl9CiAJfQogCXNlcV9wcmludGYobSwgIiV1IHVuYm91 bmQgb2JqZWN0cywgJWxsdSBieXRlc1xuIiwgY291bnQsIHNpemUpOwogCi0Jc2l6ZSA9IGNvdW50 ID0gbWFwcGFibGVfc2l6ZSA9IG1hcHBhYmxlX2NvdW50ID0gMDsKKwlzaXplID0gY291bnQgPSBw aW5fc2l6ZSA9IHBpbl9jb3VudCA9IDA7CiAJbGlzdF9mb3JfZWFjaF9lbnRyeShvYmosICZkZXZf cHJpdi0+bW0uYm91bmRfbGlzdCwgZ2xvYmFsX2xpc3QpIHsKLQkJaWYgKG9iai0+ZmF1bHRfbWFw cGFibGUpIHsKLQkJCXNpemUgKz0gaTkxNV9nZW1fb2JqX2dndHRfc2l6ZShvYmopOwotCQkJKytj b3VudDsKLQkJfQorCQlzaXplICs9IG9iai0+YmFzZS5zaXplOworCQkrK2NvdW50OworCiAJCWlm IChvYmotPnBpbl9kaXNwbGF5KSB7Ci0JCQltYXBwYWJsZV9zaXplICs9IGk5MTVfZ2VtX29ial9n Z3R0X3NpemUob2JqKTsKLQkJCSsrbWFwcGFibGVfY291bnQ7CisJCQlwaW5fc2l6ZSArPSBvYmot PmJhc2Uuc2l6ZTsKKwkJCSsrcGluX2NvdW50OwogCQl9CisKIAkJaWYgKG9iai0+bWFkdiA9PSBJ OTE1X01BRFZfRE9OVE5FRUQpIHsKIAkJCXB1cmdlYWJsZV9zaXplICs9IG9iai0+YmFzZS5zaXpl OwogCQkJKytwdXJnZWFibGVfY291bnQ7CiAJCX0KKwogCQlpZiAob2JqLT5tYXBwaW5nKSB7Ci0J CQlwaW5fbWFwcGVkX2NvdW50Kys7Ci0JCQlwaW5fbWFwcGVkX3NpemUgKz0gb2JqLT5iYXNlLnNp emU7Ci0JCQlpZiAob2JqLT5wYWdlc19waW5fY291bnQgPT0gMCkgewotCQkJCXBpbl9tYXBwZWRf cHVyZ2VhYmxlX2NvdW50Kys7Ci0JCQkJcGluX21hcHBlZF9wdXJnZWFibGVfc2l6ZSArPSBvYmot PmJhc2Uuc2l6ZTsKLQkJCX0KKwkJCW1hcHBlZF9jb3VudCsrOworCQkJbWFwcGVkX3NpemUgKz0g b2JqLT5iYXNlLnNpemU7CiAJCX0KIAl9CisJc2VxX3ByaW50ZihtLCAiJXUgYm91bmQgb2JqZWN0 cywgJWxsdSBieXRlc1xuIiwKKwkJICAgY291bnQsIHNpemUpOwogCXNlcV9wcmludGYobSwgIiV1 IHB1cmdlYWJsZSBvYmplY3RzLCAlbGx1IGJ5dGVzXG4iLAogCQkgICBwdXJnZWFibGVfY291bnQs IHB1cmdlYWJsZV9zaXplKTsKLQlzZXFfcHJpbnRmKG0sICIldSBwaW5uZWQgbWFwcGFibGUgb2Jq ZWN0cywgJWxsdSBieXRlc1xuIiwKLQkJICAgbWFwcGFibGVfY291bnQsIG1hcHBhYmxlX3NpemUp OwotCXNlcV9wcmludGYobSwgIiV1IGZhdWx0IG1hcHBhYmxlIG9iamVjdHMsICVsbHUgYnl0ZXNc biIsCi0JCSAgIGNvdW50LCBzaXplKTsKLQlzZXFfcHJpbnRmKG0sCi0JCSAgICIlbHUgWyVsdV0g cGluIG1hcHBlZCBvYmplY3RzLCAlbGx1IFslbGx1XSBieXRlcyBbcHVyZ2VhYmxlXVxuIiwKLQkJ ICAgcGluX21hcHBlZF9jb3VudCwgcGluX21hcHBlZF9wdXJnZWFibGVfY291bnQsCi0JCSAgIHBp bl9tYXBwZWRfc2l6ZSwgcGluX21hcHBlZF9wdXJnZWFibGVfc2l6ZSk7CisJc2VxX3ByaW50Ziht LCAiJXUgbWFwcGVkIG9iamVjdHMsICVsbHUgYnl0ZXNcbiIsCisJCSAgIG1hcHBlZF9jb3VudCwg bWFwcGVkX3NpemUpOworCXNlcV9wcmludGYobSwgIiV1IHBpbm5lZCBvYmplY3RzLCAlbGx1IGJ5 dGVzXG4iLAorCQkgICBwaW5fY291bnQsIHBpbl9zaXplKTsKIAogCXNlcV9wcmludGYobSwgIiVs bHUgWyVsbHVdIGd0dCB0b3RhbFxuIiwKIAkJICAgZ2d0dC0+YmFzZS50b3RhbCwgZ2d0dC0+bWFw cGFibGVfZW5kIC0gZ2d0dC0+YmFzZS5zdGFydCk7Ci0tIAoyLjguMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==