From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 10/13] drm/i915: Wait upon userptr get-user-pages within execbuffer Date: Wed, 29 Mar 2017 16:56:32 +0100 Message-ID: <20170329155635.19060-11-chris@chris-wilson.co.uk> References: <20170329155635.19060-1-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-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 45B506E766 for ; Wed, 29 Mar 2017 15:56:49 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id p52so4199349wrc.2 for ; Wed, 29 Mar 2017 08:56:49 -0700 (PDT) In-Reply-To: <20170329155635.19060-1-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 VGhpcyBzaW1wbHkgaGlkZXMgdGhlIEVBR0FJTiBjYXVzZWQgYnkgdXNlcnB0ciB3aGVuIHVzZXJz cGFjZSBjYXVzZXMKcmVzb3VyY2UgY29udGVudGlvbi4gSG93ZXZlciwgaXQgaXMgcXVpdGUgYmVu ZWZpY2lhbCB3aXRoIGhpZ2hseQpjb250ZW5kZWQgdXNlcnB0ciB1c2VycyBhcyB3ZSBhdm9pZCBy ZXBlYXRpbmcgdGhlIHNldHVwIGNvc3RzIGFuZAprZXJuZWwtdXNlciBjb250ZXh0IHN3aXRjaGVz LgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ ClJldmlld2VkLWJ5OiBNaWNoYcWCIFdpbmlhcnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgICAgIHwgIDEg KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgMTAgKysrKysr KysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgIHwgIDQgKysr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgIDMgKysrCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMgICAgfCAxOCArKysrKysrKysr KysrKystLS0KIDUgZmlsZXMgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCBkOGEyZjNiYWM1YmUuLmZhMWRkMDU5MGUw YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC01NTQsNiArNTU0LDcgQEAgc3RhdGljIHZv aWQgaTkxNV9nZW1fZmluaShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWlu dGVsX3VjX2ZpbmlfaHcoZGV2X3ByaXYpOwogCWk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcyhkZXZf cHJpdik7CiAJaTkxNV9nZW1fY29udGV4dF9maW5pKGRldl9wcml2KTsKKwlpOTE1X2dlbV9jbGVh bnVwX3VzZXJwdHIoZGV2X3ByaXYpOwogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1 Y3RfbXV0ZXgpOwogCiAJaTkxNV9nZW1fZHJhaW5fZnJlZWRfb2JqZWN0cyhkZXZfcHJpdik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA1ZTQzNGZhZDJkNzguLmYyNjM3MTVmNjVjOSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0xNTE1LDYgKzE1MTUsMTMgQEAgc3RydWN0IGk5MTVf Z2VtX21tIHsKIAlzdHJ1Y3QgbGlzdF9oZWFkIGZlbmNlX2xpc3Q7CiAKIAkvKioKKwkgKiBXb3Jr cXVldWUgdG8gZmF1bHQgaW4gdXNlcnB0ciBwYWdlcywgZmx1c2hlZCBieSB0aGUgZXhlY2J1Zgor CSAqIHdoZW4gcmVxdWlyZWQgYnV0IG90aGVyd2lzZSBsZWZ0IHRvIHVzZXJzcGFjZSB0byB0cnkg YWdhaW4KKwkgKiBvbiBFQUdBSU4uCisJICovCisJc3RydWN0IHdvcmtxdWV1ZV9zdHJ1Y3QgKnVz ZXJwdHJfd3E7CisKKwkvKioKIAkgKiBBcmUgd2UgaW4gYSBub24taW50ZXJydXB0aWJsZSBzZWN0 aW9uIG9mIGNvZGUgbGlrZQogCSAqIG1vZGVzZXR0aW5nPwogCSAqLwpAQCAtMzIwMCw3ICszMjA3 LDggQEAgaW50IGk5MTVfZ2VtX3NldF90aWxpbmdfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAkJCSAgICAgIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2KTsKIGlu dCBpOTE1X2dlbV9nZXRfdGlsaW5nX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQg KmRhdGEsCiAJCQkgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdik7Ci12b2lkIGk5MTVf Z2VtX2luaXRfdXNlcnB0cihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworaW50 IGk5MTVfZ2VtX2luaXRfdXNlcnB0cihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp Owordm9pZCBpOTE1X2dlbV9jbGVhbnVwX3VzZXJwdHIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKIGludCBpOTE1X2dlbV91c2VycHRyX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHZvaWQgKmRhdGEsCiAJCQkgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpOwogaW50IGk5 MTVfZ2VtX2dldF9hcGVydHVyZV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpk YXRhLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggYjkzZDhmMmFiMDM3Li5mODAwMTE0Mjc5 ZDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDY3MSw3ICs0NjcxLDkgQEAgaW50IGk5 MTVfZ2VtX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCSAqLwogCWlu dGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIAotCWk5 MTVfZ2VtX2luaXRfdXNlcnB0cihkZXZfcHJpdik7CisJcmV0ID0gaTkxNV9nZW1faW5pdF91c2Vy cHRyKGRldl9wcml2KTsKKwlpZiAocmV0KQorCQlnb3RvIG91dF91bmxvY2s7CiAKIAlyZXQgPSBp OTE1X2dlbV9pbml0X2dndHQoZGV2X3ByaXYpOwogCWlmIChyZXQpCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggMGY3MjM2Y2U2NWJiLi4xZWY5ZmE5ZmVk ZGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTE0 MTUsNiArMTQxNSw5IEBAIHN0YXRpYyBpbnQgZWJfcmVsb2NhdGVfc2xvdyhzdHJ1Y3QgaTkxNV9l eGVjYnVmZmVyICplYikKIAkJZ290byBvdXQ7CiAJfQogCisJLyogQSBmcmVxdWVudCBjYXVzZSBm b3IgRUFHQUlOIGFyZSBjdXJyZW50bHkgdW5hdmFpbGFibGUgY2xpZW50IHBhZ2VzICovCisJZmx1 c2hfd29ya3F1ZXVlKGViLT5pOTE1LT5tbS51c2VycHRyX3dxKTsKKwogCXJldCA9IGk5MTVfbXV0 ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKGRldik7CiAJaWYgKHJldCkgewogCQltdXRleF9sb2NrKCZk ZXYtPnN0cnVjdF9tdXRleCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV91c2VycHRyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV91c2VycHRyLmMK aW5kZXggNThjY2Y4YjhjYTFjLi42NmIwOTE2M2JmYmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX3VzZXJwdHIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV91c2VycHRyLmMKQEAgLTM3OCw3ICszNzgsNyBAQCBfX2k5MTVfbW1fc3RydWN0X2Zy ZWUoc3RydWN0IGtyZWYgKmtyZWYpCiAJbXV0ZXhfdW5sb2NrKCZtbS0+aTkxNS0+bW1fbG9jayk7 CiAKIAlJTklUX1dPUksoJm1tLT53b3JrLCBfX2k5MTVfbW1fc3RydWN0X2ZyZWVfX3dvcmtlcik7 Ci0Jc2NoZWR1bGVfd29yaygmbW0tPndvcmspOworCXF1ZXVlX3dvcmsobW0tPmk5MTUtPm1tLnVz ZXJwdHJfd3EsICZtbS0+d29yayk7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC01OTgsNyArNTk4LDcg QEAgX19pOTE1X2dlbV91c2VycHRyX2dldF9wYWdlc19zY2hlZHVsZShzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqKQogCWdldF90YXNrX3N0cnVjdCh3b3JrLT50YXNrKTsKIAogCUlOSVRf V09SSygmd29yay0+d29yaywgX19pOTE1X2dlbV91c2VycHRyX2dldF9wYWdlc193b3JrZXIpOwot CXNjaGVkdWxlX3dvcmsoJndvcmstPndvcmspOworCXF1ZXVlX3dvcmsodG9faTkxNShvYmotPmJh c2UuZGV2KS0+bW0udXNlcnB0cl93cSwgJndvcmstPndvcmspOwogCiAJcmV0dXJuIEVSUl9QVFIo LUVBR0FJTik7CiB9CkBAIC04MjgsOCArODI4LDIwIEBAIGk5MTVfZ2VtX3VzZXJwdHJfaW9jdGwo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxl CiAJcmV0dXJuIDA7CiB9CiAKLXZvaWQgaTkxNV9nZW1faW5pdF91c2VycHRyKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKK2ludCBpOTE1X2dlbV9pbml0X3VzZXJwdHIoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCW11dGV4X2luaXQoJmRldl9wcml2LT5t bV9sb2NrKTsKIAloYXNoX2luaXQoZGV2X3ByaXYtPm1tX3N0cnVjdHMpOworCisJZGV2X3ByaXYt Pm1tLnVzZXJwdHJfd3EgPQorCQlhbGxvY193b3JrcXVldWUoImk5MTUtdXNlcnB0ci1hY3F1aXJl IiwgV1FfSElHSFBSSSwgMCk7CisJaWYgKCFkZXZfcHJpdi0+bW0udXNlcnB0cl93cSkKKwkJcmV0 dXJuIC1FTk9NRU07CisKKwlyZXR1cm4gMDsKK30KKwordm9pZCBpOTE1X2dlbV9jbGVhbnVwX3Vz ZXJwdHIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoreworCWRlc3Ryb3lfd29y a3F1ZXVlKGRldl9wcml2LT5tbS51c2VycHRyX3dxKTsKIH0KLS0gCjIuMTEuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==