From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 07/41] drm/i915: Allow i915_sw_fence_await_sw_fence() to allocate Date: Thu, 20 Oct 2016 16:03:49 +0100 Message-ID: <20161020150423.4560-8-chris@chris-wilson.co.uk> References: <20161020150423.4560-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-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 67D986EB93 for ; Thu, 20 Oct 2016 15:04:39 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id b75so716314lfg.3 for ; Thu, 20 Oct 2016 08:04:39 -0700 (PDT) In-Reply-To: <20161020150423.4560-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 SW4gZm9ydGhjb21pbmcgcGF0Y2hlcywgd2Ugd2FudCB0byBiZSBhYmxlIHRvIGR5bmFtaWNhbGx5 IGFsbG9jYXRlIHRoZQp3YWl0X3F1ZXVlX3QgdXNlZCB3aGlsc3QgYXdhaXRpbmcuIFRoaXMgaXMg bW9yZSBjb252ZW5pZW50IGlmIHdlIGV4dGVuZAp0aGUgaTkxNV9zd19mZW5jZV9hd2FpdF9zd19m ZW5jZSgpIHRvIHBlcmZvcm0gdGhlIGFsbG9jYXRpb24gZm9yIHVzIGlmCndlIHBhc3MgaW4gYSBn ZnAgbWFzayBhcyBhbiBhbHRlcm5hdGl2ZSB0aGFuIGEgcHJlYWxsb2NhdGVkIHN0cnVjdC4KClNp Z25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZp ZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3dfZmVuY2UuYyB8IDQwICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9z d19mZW5jZS5oIHwgIDggKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygr KSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3N3X2ZlbmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N3X2ZlbmNlLmMKaW5kZXgg MWU1Y2JjNTg1Y2EyLi5kZTQxN2NkZjVlOTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfc3dfZmVuY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N3X2Zl bmNlLmMKQEAgLTEzLDYgKzEzLDggQEAKIAogI2luY2x1ZGUgImk5MTVfc3dfZmVuY2UuaCIKIAor I2RlZmluZSBJOTE1X1NXX0ZFTkNFX0ZMQUdfQUxMT0MgQklUKDMpIC8qIGFmdGVyIFdRX0ZMQUdf KiBmb3Igc2FmZXR5ICovCisKIHN0YXRpYyBERUZJTkVfU1BJTkxPQ0soaTkxNV9zd19mZW5jZV9s b2NrKTsKIAogc3RhdGljIGludCBfX2k5MTVfc3dfZmVuY2Vfbm90aWZ5KHN0cnVjdCBpOTE1X3N3 X2ZlbmNlICpmZW5jZSwKQEAgLTEzNSw2ICsxMzcsOCBAQCBzdGF0aWMgaW50IGk5MTVfc3dfZmVu Y2Vfd2FrZSh3YWl0X3F1ZXVlX3QgKndxLCB1bnNpZ25lZCBtb2RlLCBpbnQgZmxhZ3MsIHZvaWQg KgogCWxpc3RfZGVsKCZ3cS0+dGFza19saXN0KTsKIAlfX2k5MTVfc3dfZmVuY2VfY29tcGxldGUo d3EtPnByaXZhdGUsIGtleSk7CiAJaTkxNV9zd19mZW5jZV9wdXQod3EtPnByaXZhdGUpOworCWlm ICh3cS0+ZmxhZ3MgJiBJOTE1X1NXX0ZFTkNFX0ZMQUdfQUxMT0MpCisJCWtmcmVlKHdxKTsKIAly ZXR1cm4gMDsKIH0KIApAQCAtMTkyLDkgKzE5Niw5IEBAIHN0YXRpYyBib29sIGk5MTVfc3dfZmVu Y2VfY2hlY2tfaWZfYWZ0ZXIoc3RydWN0IGk5MTVfc3dfZmVuY2UgKmZlbmNlLAogCXJldHVybiBl cnI7CiB9CiAKLWludCBpOTE1X3N3X2ZlbmNlX2F3YWl0X3N3X2ZlbmNlKHN0cnVjdCBpOTE1X3N3 X2ZlbmNlICpmZW5jZSwKLQkJCQkgc3RydWN0IGk5MTVfc3dfZmVuY2UgKnNpZ25hbGVyLAotCQkJ CSB3YWl0X3F1ZXVlX3QgKndxKQorc3RhdGljIGludCBfX2k5MTVfc3dfZmVuY2VfYXdhaXRfc3df ZmVuY2Uoc3RydWN0IGk5MTVfc3dfZmVuY2UgKmZlbmNlLAorCQkJCQkgIHN0cnVjdCBpOTE1X3N3 X2ZlbmNlICpzaWduYWxlciwKKwkJCQkJICB3YWl0X3F1ZXVlX3QgKndxLCBnZnBfdCBnZnApCiB7 CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAlpbnQgcGVuZGluZzsKQEAgLTIwNiw4ICsyMTAsMjIg QEAgaW50IGk5MTVfc3dfZmVuY2VfYXdhaXRfc3dfZmVuY2Uoc3RydWN0IGk5MTVfc3dfZmVuY2Ug KmZlbmNlLAogCWlmICh1bmxpa2VseShpOTE1X3N3X2ZlbmNlX2NoZWNrX2lmX2FmdGVyKGZlbmNl LCBzaWduYWxlcikpKQogCQlyZXR1cm4gLUVJTlZBTDsKIAorCXBlbmRpbmcgPSAwOworCWlmICgh d3EpIHsKKwkJd3EgPSBrbWFsbG9jKHNpemVvZigqd3EpLCBnZnApOworCQlpZiAoIXdxKSB7CisJ CQlpZiAoIWdmcGZsYWdzX2FsbG93X2Jsb2NraW5nKGdmcCkpCisJCQkJcmV0dXJuIC1FTk9NRU07 CisKKwkJCWk5MTVfc3dfZmVuY2Vfd2FpdChzaWduYWxlcik7CisJCQlyZXR1cm4gMDsKKwkJfQor CisJCXBlbmRpbmcgfD0gSTkxNV9TV19GRU5DRV9GTEFHX0FMTE9DOworCX0KKwogCUlOSVRfTElT VF9IRUFEKCZ3cS0+dGFza19saXN0KTsKLQl3cS0+ZmxhZ3MgPSAwOworCXdxLT5mbGFncyA9IHBl bmRpbmc7CiAJd3EtPmZ1bmMgPSBpOTE1X3N3X2ZlbmNlX3dha2U7CiAJd3EtPnByaXZhdGUgPSBp OTE1X3N3X2ZlbmNlX2dldChmZW5jZSk7CiAKQEAgLTIyNiw2ICsyNDQsMjAgQEAgaW50IGk5MTVf c3dfZmVuY2VfYXdhaXRfc3dfZmVuY2Uoc3RydWN0IGk5MTVfc3dfZmVuY2UgKmZlbmNlLAogCXJl dHVybiBwZW5kaW5nOwogfQogCitpbnQgaTkxNV9zd19mZW5jZV9hd2FpdF9zd19mZW5jZShzdHJ1 Y3QgaTkxNV9zd19mZW5jZSAqZmVuY2UsCisJCQkJIHN0cnVjdCBpOTE1X3N3X2ZlbmNlICpzaWdu YWxlciwKKwkJCQkgd2FpdF9xdWV1ZV90ICp3cSkKK3sKKwlyZXR1cm4gX19pOTE1X3N3X2ZlbmNl X2F3YWl0X3N3X2ZlbmNlKGZlbmNlLCBzaWduYWxlciwgd3EsIDApOworfQorCitpbnQgaTkxNV9z d19mZW5jZV9hd2FpdF9zd19mZW5jZV9nZnAoc3RydWN0IGk5MTVfc3dfZmVuY2UgKmZlbmNlLAor CQkJCSAgICAgc3RydWN0IGk5MTVfc3dfZmVuY2UgKnNpZ25hbGVyLAorCQkJCSAgICAgZ2ZwX3Qg Z2ZwKQoreworCXJldHVybiBfX2k5MTVfc3dfZmVuY2VfYXdhaXRfc3dfZmVuY2UoZmVuY2UsIHNp Z25hbGVyLCBOVUxMLCBnZnApOworfQorCiBzdHJ1Y3QgZG1hX2ZlbmNlX2NiIHsKIAlzdHJ1Y3Qg ZmVuY2VfY2IgYmFzZTsKIAlzdHJ1Y3QgaTkxNV9zd19mZW5jZSAqZmVuY2U7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N3X2ZlbmNlLmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3N3X2ZlbmNlLmgKaW5kZXggMzczMTQxNjAyY2E0Li41ODYxYzY5ZjI0ZDQgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3dfZmVuY2UuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N3X2ZlbmNlLmgKQEAgLTQ2LDYgKzQ2LDkgQEAgdm9pZCBp OTE1X3N3X2ZlbmNlX2NvbW1pdChzdHJ1Y3QgaTkxNV9zd19mZW5jZSAqZmVuY2UpOwogaW50IGk5 MTVfc3dfZmVuY2VfYXdhaXRfc3dfZmVuY2Uoc3RydWN0IGk5MTVfc3dfZmVuY2UgKmZlbmNlLAog CQkJCSBzdHJ1Y3QgaTkxNV9zd19mZW5jZSAqYWZ0ZXIsCiAJCQkJIHdhaXRfcXVldWVfdCAqd3Ep OworaW50IGk5MTVfc3dfZmVuY2VfYXdhaXRfc3dfZmVuY2VfZ2ZwKHN0cnVjdCBpOTE1X3N3X2Zl bmNlICpmZW5jZSwKKwkJCQkgICAgIHN0cnVjdCBpOTE1X3N3X2ZlbmNlICphZnRlciwKKwkJCQkg ICAgIGdmcF90IGdmcCk7CiBpbnQgaTkxNV9zd19mZW5jZV9hd2FpdF9kbWFfZmVuY2Uoc3RydWN0 IGk5MTVfc3dfZmVuY2UgKmZlbmNlLAogCQkJCSAgc3RydWN0IGZlbmNlICpkbWEsCiAJCQkJICB1 bnNpZ25lZCBsb25nIHRpbWVvdXQsCkBAIC02Miw0ICs2NSw5IEBAIHN0YXRpYyBpbmxpbmUgYm9v bCBpOTE1X3N3X2ZlbmNlX2RvbmUoY29uc3Qgc3RydWN0IGk5MTVfc3dfZmVuY2UgKmZlbmNlKQog CXJldHVybiBhdG9taWNfcmVhZCgmZmVuY2UtPnBlbmRpbmcpIDwgMDsKIH0KIAorc3RhdGljIGlu bGluZSB2b2lkIGk5MTVfc3dfZmVuY2Vfd2FpdChzdHJ1Y3QgaTkxNV9zd19mZW5jZSAqZmVuY2Up Cit7CisJd2FpdF9ldmVudChmZW5jZS0+d2FpdCwgaTkxNV9zd19mZW5jZV9kb25lKGZlbmNlKSk7 Cit9CisKICNlbmRpZiAvKiBfSTkxNV9TV19GRU5DRV9IXyAqLwotLSAKMi45LjMKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=