From: Daniel Vetter Subject: [PATCH 1/2] drm/i915: Clean up pinned bo capture Date: Tue, 2 Dec 2014 16:19:43 +0100 Message-ID: <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-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 9721E6F10C for ; Tue, 2 Dec 2014 07:49:18 -0800 (PST) Received: by mail-vc0-f176.google.com with SMTP id hq12so5738552vcb.7 for ; Tue, 02 Dec 2014 07:49:18 -0800 (PST) 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 U29tZXdoZXJlIGJldHdlZW4gcmVtb3ZpbmcgdGhlIHBpbm5lZCBibyBsaXN0IGFuZCBhZGRpbmcg ZnVsbCBwcGd0dApzdXBwb3J0IHdlJ3ZlIHN0YXJ0ZWQgdG8gbm8gbG9uZ2VyIGZpbHRlciB0aGUg YWN0aXZlIGJ1ZmZlcnMgb3V0IG9mCnRoZSBjYXB0dXJlZCBwaW5uZWQgYnVmZmVycy4gSSd2ZSB0 cmllZCB0byBkaWcgb3V0IGV4YWN0bHkgd2hlcmUgYnV0CmRpZG4ndCBzcG90IGl0LgoKQXQgZmly c3QgSSd2ZSB0aG91Z2h0IChjaGVja2VkLCBidXQgd2l0aG91dCB3YXJuaW5nIGFib3V0IGl0KSBh cnJheQpvdmVycnVuLiBCdXQgd2UgaGF2ZSB0aGUgc2FtZSBpc3N1ZSB3aGVuIGNvdW50aW5nIHRo ZSBwaW5uZWQgYm8uCgpTdGlsbCBub3QgcHJldHR5LCBzbyBzd2l0Y2ggb3ZlciB0byB3YWxraW5n IHRoZSBpbmFjdGl2ZSBwZXItdm0gbGlzdCwKd2hpY2ggd2lsbCBuYXR1cmFsbHkgZmlsdGVyIG91 dCBhbGwgYWN0aXZlIGJ1ZmZlcnMuCgp2MjogV2hpbGUgYXQgaXQgb25seSBjYXB0dXJlIHBpbm5l ZCBibyBmb3IgdGhlIGdsb2JhbCBndHQsIHdlIGRvbid0CmNhcmUgYWJvdXQgdGhlbSBmb3IgcmVh bCBwcGd0dCAoc2luY2Ugb25seSBleGVjYnVmIHBpbnMgdGhvc2UsIGFuZApvbmx5IHRlbXBvcmFy aWx5KS4KCnYzOiBEb24ndCBXQVJOX09OIGFib3V0IG92ZXJydW5zLCB0aGlzIGNvZGUgaXMgc3Rp bGwgcmFjeS4gU28ganVzdApkZWJ1ZyBvdXRwdXQgaW5zdGVhZC4KCkNjOiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n cHVfZXJyb3IuYyB8IDQzICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggYzQ1MzZlMTg1Yjc1Li5iNzY0NDM3NzhlOGUg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtNjk2LDM1ICs2OTYsMzMg QEAgc3RhdGljIHUzMiBjYXB0dXJlX2FjdGl2ZV9ibyhzdHJ1Y3QgZHJtX2k5MTVfZXJyb3JfYnVm ZmVyICplcnIsCiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgaGVhZCwgbW1fbGlzdCkgewog CQljYXB0dXJlX2JvKGVycisrLCB2bWEpOwotCQlpZiAoKytpID09IGNvdW50KQorCQlpZiAoKytp ID09IGNvdW50KSB7CisJCQlEUk1fREVCVUcoIkNhcHR1cmUgYXJyYXkgb3ZlcnJ1blxuIik7CiAJ CQlicmVhazsKKwkJfQogCX0KIAogCXJldHVybiBpOwogfQogCiBzdGF0aWMgdTMyIGNhcHR1cmVf cGlubmVkX2JvKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9idWZmZXIgKmVyciwKLQkJCSAgICAgaW50 IGNvdW50LCBzdHJ1Y3QgbGlzdF9oZWFkICpoZWFkLAotCQkJICAgICBzdHJ1Y3QgaTkxNV9hZGRy ZXNzX3NwYWNlICp2bSkKKwkJCSAgICAgaW50IGNvdW50LCBzdHJ1Y3QgbGlzdF9oZWFkICpoZWFk KQogewotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7Ci0Jc3RydWN0IGRybV9pOTE1 X2Vycm9yX2J1ZmZlciAqIGNvbnN0IGZpcnN0ID0gZXJyOwotCXN0cnVjdCBkcm1faTkxNV9lcnJv cl9idWZmZXIgKiBjb25zdCBsYXN0ID0gZXJyICsgY291bnQ7Ci0KLQlsaXN0X2Zvcl9lYWNoX2Vu dHJ5KG9iaiwgaGVhZCwgZ2xvYmFsX2xpc3QpIHsKLQkJc3RydWN0IGk5MTVfdm1hICp2bWE7CisJ c3RydWN0IGk5MTVfdm1hICp2bWE7CisJaW50IGkgPSAwOwogCi0JCWlmIChlcnIgPT0gbGFzdCkK KwlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgaGVhZCwgbW1fbGlzdCkgeworCQlpZiAodm1hLT5w aW5fY291bnQgPT0gMCkKIAkJCWJyZWFrOwogCi0JCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAm b2JqLT52bWFfbGlzdCwgdm1hX2xpbmspCi0JCQlpZiAodm1hLT52bSA9PSB2bSAmJiB2bWEtPnBp bl9jb3VudCA+IDApIHsKLQkJCQljYXB0dXJlX2JvKGVycisrLCB2bWEpOwotCQkJCWJyZWFrOwot CQkJfQorCQljYXB0dXJlX2JvKGVycisrLCB2bWEpOworCQlpZiAoKytpID09IGNvdW50KSB7CisJ CQlEUk1fREVCVUcoIkNhcHR1cmUgYXJyYXkgb3ZlcnJ1blxuIik7CisJCQlicmVhazsKKwkJfQog CX0KIAotCXJldHVybiBlcnIgLSBmaXJzdDsKKwlyZXR1cm4gaTsKIH0KIAogLyogR2VuZXJhdGUg YSBzZW1pLXVuaXF1ZSBlcnJvciBjb2RlLiBUaGUgY29kZSBpcyBub3QgbWVhbnQgdG8gaGF2ZSBt ZWFuaW5nLCBUaGUKQEAgLTEwODUsNyArMTA4Myw2IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX2Nh cHR1cmVfdm0oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCWNvbnN0IGlu dCBuZHgpCiB7CiAJc3RydWN0IGRybV9pOTE1X2Vycm9yX2J1ZmZlciAqYWN0aXZlX2JvID0gTlVM TCwgKnBpbm5lZF9ibyA9IE5VTEw7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsK IAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAlpbnQgaTsKIApAQCAtMTA5NCwxMiArMTA5MSwxMiBA QCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9jYXB0dXJlX3ZtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJaSsrOwogCWVycm9yLT5hY3RpdmVfYm9fY291bnRbbmR4XSA9IGk7CiAK LQlsaXN0X2Zvcl9lYWNoX2VudHJ5KG9iaiwgJmRldl9wcml2LT5tbS5ib3VuZF9saXN0LCBnbG9i YWxfbGlzdCkgewotCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHZtYSwgJm9iai0+dm1hX2xpc3QsIHZt YV9saW5rKQotCQkJaWYgKHZtYS0+dm0gPT0gdm0gJiYgdm1hLT5waW5fY291bnQgPiAwKSB7Ci0J CQkJaSsrOworCWlmIChpOTE1X2lzX2dndHQodm0pKSB7CisJCWxpc3RfZm9yX2VhY2hfZW50cnko dm1hLCAmdm0tPmluYWN0aXZlX2xpc3QsIG1tX2xpc3QpIHsKKwkJCWlmICh2bWEtPnBpbl9jb3Vu dCA9PSAwKQogCQkJCWJyZWFrOwotCQkJfQorCQkJaSsrOworCQl9CiAJfQogCWVycm9yLT5waW5u ZWRfYm9fY291bnRbbmR4XSA9IGkgLSBlcnJvci0+YWN0aXZlX2JvX2NvdW50W25keF07CiAKQEAg LTExMTksNyArMTExNiw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX2NhcHR1cmVfdm0oc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQllcnJvci0+cGlubmVkX2JvX2NvdW50W25k eF0gPQogCQkJY2FwdHVyZV9waW5uZWRfYm8ocGlubmVkX2JvLAogCQkJCQkgIGVycm9yLT5waW5u ZWRfYm9fY291bnRbbmR4XSwKLQkJCQkJICAmZGV2X3ByaXYtPm1tLmJvdW5kX2xpc3QsIHZtKTsK KwkJCQkJICAmdm0tPmluYWN0aXZlX2xpc3QpOwogCWVycm9yLT5hY3RpdmVfYm9bbmR4XSA9IGFj dGl2ZV9ibzsKIAllcnJvci0+cGlubmVkX2JvW25keF0gPSBwaW5uZWRfYm87CiB9Ci0tIAoxLjku MwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK