From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 1/2] drm/i915: Make request's wait-for-space
	explicit
Date: Fri, 10 Nov 2017 22:09:52 +0000
Message-ID: <20171110220953.25223-1-chris@chris-wilson.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 5D79E6EB75
 for <intel-gfx@lists.freedesktop.org>; Fri, 10 Nov 2017 22:10:04 +0000 (UTC)
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

QXQgdGhlIHN0YXJ0IG9mIGJ1aWxkaW5nIGEgcmVxdWVzdCwgd2Ugd291bGQgd2FpdCBmb3Igcm91
Z2hseSBlbm91Z2gKc3BhY2UgdG8gZml0IHRoZSBhdmVyYWdlIHJlcXVlc3QgKHRvIHJlZHVjZSB0
aGUgbGlrZWxpaG9vZCBvZiBoYXZpbmcgdG8Kd2FpdCBhbmQgYWJvcnQgcGFydHdheSB0aHJvdWdo
IHJlcXVlc3QgY29uc3RydWN0aW9uKS4gVG8gYWNoaWV2ZSB3ZQp3b3VsZCB0cnkgdG8gYmVnaW4g
YSAwLWxlbmd0aCBjb21tYW5kIHBhY2tldCwgdGhpcyBqdXN0IGFkZHMgZXh0cmEKY29uZnVzaW9u
IHNvIG1ha2UgdGhlIHdhaXQtZm9yLXNwYWNlIGV4cGxpY2l0LCBhcyBpbiB0aGUgbmV4dCBwYXRj
aCB3ZQp3YW50IHRvIG1vdmUgaXQgZnJvbSB0aGUgYmFja2VuZCB0byB0aGUgaTkxNV9nZW1fcmVx
dWVzdF9hbGxvYygpIHNvIGl0CmNhbiBlbnN1cmUgdGhhdCB0aGUgd2FpdC1mb3Itc3BhY2UgaXMg
dGhlIGZpcnN0IG9wZXJhdGlvbiBpbiBidWlsZGluZyBhCm5ldyByZXF1ZXN0LgoKU2lnbmVkLW9m
Zi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgIDggKystLS0KIGRyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDU2ICsrKysrKysrKysrKysrKysrKysrKy0t
LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDEg
KwogMyBmaWxlcyBjaGFuZ2VkLCA0MSBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDU4ZDA1MGE5YTg2Ni4uZWJkOTU5NmZlODNiIDEw
MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTE4MCw3ICsxMTgwLDcgQEAgc3RhdGljIGlu
dCBleGVjbGlzdHNfcmVxdWVzdF9hbGxvYyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl
cXVlc3QpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVxdWVzdC0+ZW5n
aW5lOwogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSA9ICZyZXF1ZXN0LT5jdHgtPmVuZ2luZVtl
bmdpbmUtPmlkXTsKLQl1MzIgKmNzOworCWludCByZXQ7CiAKIAlHRU1fQlVHX09OKCFjZS0+cGlu
X2NvdW50KTsKIApAQCAtMTE5MCw5ICsxMTkwLDkgQEAgc3RhdGljIGludCBleGVjbGlzdHNfcmVx
dWVzdF9hbGxvYyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJICovCiAJ
cmVxdWVzdC0+cmVzZXJ2ZWRfc3BhY2UgKz0gRVhFQ0xJU1RTX1JFUVVFU1RfU0laRTsKIAotCWNz
ID0gaW50ZWxfcmluZ19iZWdpbihyZXF1ZXN0LCAwKTsKLQlpZiAoSVNfRVJSKGNzKSkKLQkJcmV0
dXJuIFBUUl9FUlIoY3MpOworCXJldCA9IGludGVsX3Jpbmdfd2FpdF9mb3Jfc3BhY2UocmVxdWVz
dC0+cmluZywgcmVxdWVzdC0+cmVzZXJ2ZWRfc3BhY2UpOworCWlmIChyZXQpCisJCXJldHVybiBy
ZXQ7CiAKIAkvKiBOb3RlIHRoYXQgYWZ0ZXIgdGhpcyBwb2ludCwgd2UgaGF2ZSBjb21taXR0ZWQg
dG8gdXNpbmcKIAkgKiB0aGlzIHJlcXVlc3QgYXMgaXQgaXMgYmVpbmcgdXNlZCB0byBib3RoIHRy
YWNrIHRoZQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl
ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDMzMjFi
ODAxZTc3ZC4uMTJlNzM0YjI5NDYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1
ZmZlci5jCkBAIC0xNTc4LDcgKzE1NzgsNyBAQCB2b2lkIGludGVsX2xlZ2FjeV9zdWJtaXNzaW9u
X3Jlc3VtZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHN0YXRpYyBpbnQg
cmluZ19yZXF1ZXN0X2FsbG9jKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkK
IHsKLQl1MzIgKmNzOworCWludCByZXQ7CiAKIAlHRU1fQlVHX09OKCFyZXF1ZXN0LT5jdHgtPmVu
Z2luZVtyZXF1ZXN0LT5lbmdpbmUtPmlkXS5waW5fY291bnQpOwogCkBAIC0xNTg4LDM3ICsxNTg4
LDI0IEBAIHN0YXRpYyBpbnQgcmluZ19yZXF1ZXN0X2FsbG9jKHN0cnVjdCBkcm1faTkxNV9nZW1f
cmVxdWVzdCAqcmVxdWVzdCkKIAkgKi8KIAlyZXF1ZXN0LT5yZXNlcnZlZF9zcGFjZSArPSBMRUdB
Q1lfUkVRVUVTVF9TSVpFOwogCi0JY3MgPSBpbnRlbF9yaW5nX2JlZ2luKHJlcXVlc3QsIDApOwot
CWlmIChJU19FUlIoY3MpKQotCQlyZXR1cm4gUFRSX0VSUihjcyk7CisJcmV0ID0gaW50ZWxfcmlu
Z193YWl0X2Zvcl9zcGFjZShyZXF1ZXN0LT5yaW5nLCByZXF1ZXN0LT5yZXNlcnZlZF9zcGFjZSk7
CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKIAogCXJlcXVlc3QtPnJlc2VydmVkX3NwYWNlIC09
IExFR0FDWV9SRVFVRVNUX1NJWkU7CiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBub2lubGluZSBp
bnQgd2FpdF9mb3Jfc3BhY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCi0JCQkJ
ICAgdW5zaWduZWQgaW50IGJ5dGVzKQorc3RhdGljIG5vaW5saW5lIGludCB3YWl0X2Zvcl9zcGFj
ZShzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZywgdW5zaWduZWQgaW50IGJ5dGVzKQogewotCXN0cnVj
dCBpbnRlbF9yaW5nICpyaW5nID0gcmVxLT5yaW5nOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVx
dWVzdCAqdGFyZ2V0OwogCWxvbmcgdGltZW91dDsKIAotCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJnJl
cS0+aTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CisJbG9ja2RlcF9hc3NlcnRfaGVsZCgmcmluZy0+
dm1hLT52bS0+aTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CiAKIAlpZiAoaW50ZWxfcmluZ191cGRh
dGVfc3BhY2UocmluZykgPj0gYnl0ZXMpCiAJCXJldHVybiAwOwogCi0JLyoKLQkgKiBTcGFjZSBp
cyByZXNlcnZlZCBpbiB0aGUgcmluZ2J1ZmZlciBmb3IgZmluYWxpc2luZyB0aGUgcmVxdWVzdCwK
LQkgKiBhcyB0aGF0IGNhbm5vdCBiZSBhbGxvd2VkIHRvIGZhaWwuIER1cmluZyByZXF1ZXN0IGZp
bmFsaXNhdGlvbiwKLQkgKiByZXNlcnZlZF9zcGFjZSBpcyBzZXQgdG8gMCB0byBzdG9wIHRoZSBv
dmVyYWxsb2NhdGlvbiBhbmQgdGhlCi0JICogYXNzdW1wdGlvbiBpcyB0aGF0IHRoZW4gd2UgbmV2
ZXIgbmVlZCB0byB3YWl0ICh3aGljaCBoYXMgdGhlCi0JICogcmlzayBvZiBmYWlsaW5nIHdpdGgg
RUlOVFIpLgotCSAqCi0JICogU2VlIGFsc28gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYygpIGFuZCBp
OTE1X2FkZF9yZXF1ZXN0KCkuCi0JICovCi0JR0VNX0JVR19PTighcmVxLT5yZXNlcnZlZF9zcGFj
ZSk7Ci0KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHRhcmdldCwgJnJpbmctPnJlcXVlc3RfbGlzdCwg
cmluZ19saW5rKSB7CiAJCS8qIFdvdWxkIGNvbXBsZXRpb24gb2YgdGhpcyByZXF1ZXN0IGZyZWUg
ZW5vdWdoIHNwYWNlPyAqLwogCQlpZiAoYnl0ZXMgPD0gX19pbnRlbF9yaW5nX3NwYWNlKHRhcmdl
dC0+cG9zdGZpeCwKQEAgLTE2NDIsNiArMTYyOSwyMiBAQCBzdGF0aWMgbm9pbmxpbmUgaW50IHdh
aXRfZm9yX3NwYWNlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCXJldHVybiAw
OwogfQogCitpbnQgaW50ZWxfcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZyAq
cmluZywgdW5zaWduZWQgaW50IGJ5dGVzKQoreworCUdFTV9CVUdfT04oYnl0ZXMgPiByaW5nLT5l
ZmZlY3RpdmVfc2l6ZSk7CisJaWYgKHVubGlrZWx5KGJ5dGVzID4gcmluZy0+ZWZmZWN0aXZlX3Np
emUgLSByaW5nLT5lbWl0KSkKKwkJYnl0ZXMgKz0gcmluZy0+c2l6ZSAtIHJpbmctPmVtaXQ7CisK
KwlpZiAodW5saWtlbHkoYnl0ZXMgPiByaW5nLT5zcGFjZSkpIHsKKwkJaW50IHJldCA9IHdhaXRf
Zm9yX3NwYWNlKHJpbmcsIGJ5dGVzKTsKKwkJaWYgKHVubGlrZWx5KHJldCkpCisJCQlyZXR1cm4g
cmV0OworCX0KKworCUdFTV9CVUdfT04ocmluZy0+c3BhY2UgPCBieXRlcyk7CisJcmV0dXJuIDA7
Cit9CisKIHUzMiAqaW50ZWxfcmluZ19iZWdpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg
KnJlcSwKIAkJICAgICAgdW5zaWduZWQgaW50IG51bV9kd29yZHMpCiB7CkBAIC0xNjgxLDcgKzE2
ODQsMjAgQEAgdTMyICppbnRlbF9yaW5nX2JlZ2luKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz
dCAqcmVxLAogCX0KIAogCWlmICh1bmxpa2VseSh0b3RhbF9ieXRlcyA+IHJpbmctPnNwYWNlKSkg
ewotCQlpbnQgcmV0ID0gd2FpdF9mb3Jfc3BhY2UocmVxLCB0b3RhbF9ieXRlcyk7CisJCWludCBy
ZXQ7CisKKwkJLyoKKwkJICogU3BhY2UgaXMgcmVzZXJ2ZWQgaW4gdGhlIHJpbmdidWZmZXIgZm9y
IGZpbmFsaXNpbmcgdGhlCisJCSAqIHJlcXVlc3QsIGFzIHRoYXQgY2Fubm90IGJlIGFsbG93ZWQg
dG8gZmFpbC4gRHVyaW5nIHJlcXVlc3QKKwkJICogZmluYWxpc2F0aW9uLCByZXNlcnZlZF9zcGFj
ZSBpcyBzZXQgdG8gMCB0byBzdG9wIHRoZQorCQkgKiBvdmVyYWxsb2NhdGlvbiBhbmQgdGhlIGFz
c3VtcHRpb24gaXMgdGhhdCB0aGVuIHdlIG5ldmVyIG5lZWQKKwkJICogdG8gd2FpdCAod2hpY2gg
aGFzIHRoZSByaXNrIG9mIGZhaWxpbmcgd2l0aCBFSU5UUikuCisJCSAqCisJCSAqIFNlZSBhbHNv
IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2MoKSBhbmQgaTkxNV9hZGRfcmVxdWVzdCgpLgorCQkgKi8K
KwkJR0VNX0JVR19PTighcmVxLT5yZXNlcnZlZF9zcGFjZSk7CisKKwkJcmV0ID0gd2FpdF9mb3Jf
c3BhY2UocmluZywgdG90YWxfYnl0ZXMpOwogCQlpZiAodW5saWtlbHkocmV0KSkKIAkJCXJldHVy
biBFUlJfUFRSKHJldCk7CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o
CmluZGV4IDJiMGFlNTQ2OGY0OC4uMDUzMWQ5MzlmZTFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfcmluZ2J1ZmZlci5oCkBAIC02NjEsNiArNjYxLDcgQEAgdm9pZCBpbnRlbF9sZWdhY3lf
c3VibWlzc2lvbl9yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIAog
aW50IF9fbXVzdF9jaGVjayBpbnRlbF9yaW5nX2NhY2hlbGluZV9hbGlnbihzdHJ1Y3QgZHJtX2k5
MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiAKK2ludCBpbnRlbF9yaW5nX3dhaXRfZm9yX3NwYWNlKHN0
cnVjdCBpbnRlbF9yaW5nICpyaW5nLCB1bnNpZ25lZCBpbnQgYnl0ZXMpOwogdTMyIF9fbXVzdF9j
aGVjayAqaW50ZWxfcmluZ19iZWdpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwK
IAkJCQkgICB1bnNpZ25lZCBpbnQgbik7CiAKLS0gCjIuMTUuMAoKX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl
bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn
L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==