From: Daniel Vetter Subject: [PATCH 2/2] drm/i915: Don't capture pinned bo separately Date: Tue, 2 Dec 2014 16:19:44 +0100 Message-ID: <1417533584-2011-2-git-send-email-daniel.vetter@ffwll.ch> References: <1417533584-2011-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 621806F11B for ; Tue, 2 Dec 2014 07:49:20 -0800 (PST) Received: by mail-ee0-f49.google.com with SMTP id e53so23843eek.22 for ; Tue, 02 Dec 2014 07:49:19 -0800 (PST) In-Reply-To: <1417533584-2011-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel Graphics Development Cc: Daniel Vetter , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org V2Ugb25seSBjYXJlIGFib3V0IHBpbm5lZCBibyBpbiB0aGUgZ2xvYmFsIGdndHQsIHNvIHNpbXBs aWZ5IHRoZSBsb2dpYwphIGJpdC4gU2luY2Ugd2UgZG9uJ3QgeWV0IGNhcHR1cmUgYW55IHBlci12 bSBzdGF0ZSB0aGUgcHJldHR5LXByaW50aW5nCmlzbid0IHRvbyBwcmV0dHkuCgp2MjogZ2l0IGFk ZCB0byBtYWtlIGl0IGJ1aWxkIC4uLgoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2ls c29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgIHwgIDQg KystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyB8IDIzICsrKystLS0t LS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMjEgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZWYxZjAwZTBhN2IzLi5mOWZl OTI5MzI5MGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtNDUwLDkgKzQ1MCw5IEBAIHN0 cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0ZSB7CiAJCXUzMiB1c2VycHRyOjE7CiAJCXMzMiByaW5n OjQ7CiAJCXUzMiBjYWNoZV9sZXZlbDozOwotCX0gKiphY3RpdmVfYm8sICoqcGlubmVkX2JvOwor CX0gKiphY3RpdmVfYm87CiAKLQl1MzIgKmFjdGl2ZV9ib19jb3VudCwgKnBpbm5lZF9ib19jb3Vu dDsKKwl1MzIgKmFjdGl2ZV9ib19jb3VudDsKIAl1MzIgdm1fY291bnQ7CiB9OwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCBiNzY0NDM3NzhlOGUuLmIxMzg3MzQzODEy ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC0zOTgsMTMgKzM5OCw5 IEBAIGludCBpOTE1X2Vycm9yX3N0YXRlX3RvX3N0cihzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3Rh dGVfYnVmICptLAogCWZvciAoaSA9IDA7IGkgPCBlcnJvci0+dm1fY291bnQ7IGkrKykgewogCQll cnJfcHJpbnRmKG0sICJ2bVslZF1cbiIsIGkpOwogCi0JCXByaW50X2Vycm9yX2J1ZmZlcnMobSwg IkFjdGl2ZSIsCisJCXByaW50X2Vycm9yX2J1ZmZlcnMobSwgIkFjdGl2ZSAoKyBwaW5uZWQgZm9y IGdndHQpIiwKIAkJCQkgICAgZXJyb3ItPmFjdGl2ZV9ib1tpXSwKIAkJCQkgICAgZXJyb3ItPmFj dGl2ZV9ib19jb3VudFtpXSk7Ci0KLQkJcHJpbnRfZXJyb3JfYnVmZmVycyhtLCAiUGlubmVkIiwK LQkJCQkgICAgZXJyb3ItPnBpbm5lZF9ib1tpXSwKLQkJCQkgICAgZXJyb3ItPnBpbm5lZF9ib19j b3VudFtpXSk7CiAJfQogCiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZXJyb3ItPnJpbmcp OyBpKyspIHsKQEAgLTEwOTgsNyArMTA5NCw2IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX2NhcHR1 cmVfdm0oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJaSsrOwogCQl9CiAJ fQotCWVycm9yLT5waW5uZWRfYm9fY291bnRbbmR4XSA9IGkgLSBlcnJvci0+YWN0aXZlX2JvX2Nv dW50W25keF07CiAKIAlpZiAoaSkgewogCQlhY3RpdmVfYm8gPSBrY2FsbG9jKGksIHNpemVvZigq YWN0aXZlX2JvKSwgR0ZQX0FUT01JQyk7CkBAIC0xMTEzLDEyICsxMTA4LDExIEBAIHN0YXRpYyB2 b2lkIGk5MTVfZ2VtX2NhcHR1cmVfdm0oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAogCQkJCQkgICZ2bS0+YWN0aXZlX2xpc3QpOwogCiAJaWYgKHBpbm5lZF9ibykKLQkJZXJyb3It PnBpbm5lZF9ib19jb3VudFtuZHhdID0KKwkJZXJyb3ItPmFjdGl2ZV9ib19jb3VudFtuZHhdICs9 CiAJCQljYXB0dXJlX3Bpbm5lZF9ibyhwaW5uZWRfYm8sCi0JCQkJCSAgZXJyb3ItPnBpbm5lZF9i b19jb3VudFtuZHhdLAorCQkJCQkgIGkgLSBlcnJvci0+YWN0aXZlX2JvX2NvdW50W25keF0sCiAJ CQkJCSAgJnZtLT5pbmFjdGl2ZV9saXN0KTsKIAllcnJvci0+YWN0aXZlX2JvW25keF0gPSBhY3Rp dmVfYm87Ci0JZXJyb3ItPnBpbm5lZF9ib1tuZHhdID0gcGlubmVkX2JvOwogfQogCiBzdGF0aWMg dm9pZCBpOTE1X2dlbV9jYXB0dXJlX2J1ZmZlcnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LApAQCAtMTEzMSwyNSArMTEyNSwxNiBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9jYXB0 dXJlX2J1ZmZlcnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQljbnQrKzsK IAogCWVycm9yLT5hY3RpdmVfYm8gPSBrY2FsbG9jKGNudCwgc2l6ZW9mKCplcnJvci0+YWN0aXZl X2JvKSwgR0ZQX0FUT01JQyk7Ci0JZXJyb3ItPnBpbm5lZF9ibyA9IGtjYWxsb2MoY250LCBzaXpl b2YoKmVycm9yLT5waW5uZWRfYm8pLCBHRlBfQVRPTUlDKTsKIAllcnJvci0+YWN0aXZlX2JvX2Nv dW50ID0ga2NhbGxvYyhjbnQsIHNpemVvZigqZXJyb3ItPmFjdGl2ZV9ib19jb3VudCksCiAJCQkJ CSBHRlBfQVRPTUlDKTsKLQllcnJvci0+cGlubmVkX2JvX2NvdW50ID0ga2NhbGxvYyhjbnQsIHNp emVvZigqZXJyb3ItPnBpbm5lZF9ib19jb3VudCksCi0JCQkJCSBHRlBfQVRPTUlDKTsKIAogCWlm IChlcnJvci0+YWN0aXZlX2JvID09IE5VTEwgfHwKLQkgICAgZXJyb3ItPnBpbm5lZF9ibyA9PSBO VUxMIHx8Ci0JICAgIGVycm9yLT5hY3RpdmVfYm9fY291bnQgPT0gTlVMTCB8fAotCSAgICBlcnJv ci0+cGlubmVkX2JvX2NvdW50ID09IE5VTEwpIHsKKwkgICAgZXJyb3ItPmFjdGl2ZV9ib19jb3Vu dCA9PSBOVUxMKSB7CiAJCWtmcmVlKGVycm9yLT5hY3RpdmVfYm8pOwogCQlrZnJlZShlcnJvci0+ YWN0aXZlX2JvX2NvdW50KTsKLQkJa2ZyZWUoZXJyb3ItPnBpbm5lZF9ibyk7Ci0JCWtmcmVlKGVy cm9yLT5waW5uZWRfYm9fY291bnQpOwogCiAJCWVycm9yLT5hY3RpdmVfYm8gPSBOVUxMOwogCQll cnJvci0+YWN0aXZlX2JvX2NvdW50ID0gTlVMTDsKLQkJZXJyb3ItPnBpbm5lZF9ibyA9IE5VTEw7 Ci0JCWVycm9yLT5waW5uZWRfYm9fY291bnQgPSBOVUxMOwogCX0gZWxzZSB7CiAJCWxpc3RfZm9y X2VhY2hfZW50cnkodm0sICZkZXZfcHJpdi0+dm1fbGlzdCwgZ2xvYmFsX2xpbmspCiAJCQlpOTE1 X2dlbV9jYXB0dXJlX3ZtKGRldl9wcml2LCBlcnJvciwgdm0sIGkrKyk7Ci0tIAoxLjkuMwoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK