From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 5/7] drm/i915: Return immediately if trylock fails for direct-reclaim Date: Tue, 4 Dec 2018 14:15:20 +0000 Message-ID: <20181204141522.13640-5-chris@chris-wilson.co.uk> References: <20181204141522.13640-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 fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0B3B96E266 for ; Tue, 4 Dec 2018 14:15:42 +0000 (UTC) In-Reply-To: <20181204141522.13640-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 SWdub3JlIHRyeWluZyB0byBzaHJpbmsgZnJvbSBpOTE1IGlmIHdlIGZhaWwgdG8gYWNxdWlyZSB0 aGUgc3RydWN0X211dGV4CmluIHRoZSBzaHJpbmtlciB3aGlsZSBwZXJmb3JtaW5nIGRpcmVjdC1y ZWNsYWltLiBUaGUgdHJhZGUtb2ZmIGJlaW5nCihtdWNoKSBsb3dlciBsYXRlbmN5IGZvciBub24t aTkxNSBjbGllbnRzIGF0IGFuIGluY3JlYXNlZCByaXNrIG9mIGJlaW5nCnVuYWJsZSB0byBvYnRh aW4gYSBwYWdlIGZyb20gZGlyZWN0LXJlY2xhaW0gd2l0aG91dCBoaXR0aW5nIHRoZQpvb20tbm90 aWZpZXIuIFRoZSBwcm92aXNvIGJlaW5nIHRoYXQgd2Ugc3RpbGwga2VlcCB0cnlpbmcgdG8gaGFy ZApvYnRhaW4gdGhlIGxvY2sgZm9yIG9vbSBzbyB0aGF0IHdlIGNhbiByZWFwIHVuZGVyIGhlYXZ5 IG1lbW9yeSBwcmVzc3VyZS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgIHwgIDQg KystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc2hyaW5rZXIuYyB8IDI0ICsrKysr KysrKysrLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAx NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBjNWYwMTk2NGYwZmIu LjFjYWQyMThiNzFkMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yOTE2LDkgKzI5MTYs OSBAQCBpOTE1X2dlbV9vYmplY3RfdW5waW5fcGFnZXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaikKIAlfX2k5MTVfZ2VtX29iamVjdF91bnBpbl9wYWdlcyhvYmopOwogfQogCi1lbnVt IGk5MTVfbW1fc3ViY2xhc3MgeyAvKiBsb2NrZGVwIHN1YmNsYXNzIGZvciBvYmotPm1tLmxvY2sg Ki8KK2VudW0gaTkxNV9tbV9zdWJjbGFzcyB7IC8qIGxvY2tkZXAgc3ViY2xhc3MgZm9yIG9iai0+ bW0ubG9jay9zdHJ1Y3RfbXV0ZXggKi8KIAlJOTE1X01NX05PUk1BTCA9IDAsCi0JSTkxNV9NTV9T SFJJTktFUgorCUk5MTVfTU1fU0hSSU5LRVIgLyogY2FsbGVkICJyZWN1cnNpdmVseSIgZnJvbSBk aXJlY3QtcmVjbGFpbS1lc3F1ZSAqLwogfTsKIAogdm9pZCBfX2k5MTVfZ2VtX29iamVjdF9wdXRf cGFnZXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9zaHJpbmtlci5jCmluZGV4IGVhOTBkM2EwZDUxMS4uZDQ2MWY0NThmNGFmIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zaHJpbmtlci5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMKQEAgLTM2LDcgKzM2LDkg QEAKICNpbmNsdWRlICJpOTE1X2Rydi5oIgogI2luY2x1ZGUgImk5MTVfdHJhY2UuaCIKIAotc3Rh dGljIGJvb2wgc2hyaW5rZXJfbG9jayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgYm9v bCAqdW5sb2NrKQorc3RhdGljIGJvb2wgc2hyaW5rZXJfbG9jayhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqaTkxNSwKKwkJCSAgdW5zaWduZWQgaW50IGZsYWdzLAorCQkJICBib29sICp1bmxvY2sp CiB7CiAJc3dpdGNoIChtdXRleF90cnlsb2NrX3JlY3Vyc2l2ZSgmaTkxNS0+ZHJtLnN0cnVjdF9t dXRleCkpIHsKIAljYXNlIE1VVEVYX1RSWUxPQ0tfUkVDVVJTSVZFOgpAQCAtNDUsMTUgKzQ3LDEx IEBAIHN0YXRpYyBib29sIHNocmlua2VyX2xvY2soc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUsIGJvb2wgKnVubG9jaykKIAogCWNhc2UgTVVURVhfVFJZTE9DS19GQUlMRUQ6CiAJCSp1bmxv Y2sgPSBmYWxzZTsKLQkJcHJlZW1wdF9kaXNhYmxlKCk7Ci0JCWRvIHsKLQkJCWNwdV9yZWxheCgp OwotCQkJaWYgKG11dGV4X3RyeWxvY2soJmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpKSB7Ci0JCQkJ KnVubG9jayA9IHRydWU7Ci0JCQkJYnJlYWs7Ci0JCQl9Ci0JCX0gd2hpbGUgKCFuZWVkX3Jlc2No ZWQoKSk7Ci0JCXByZWVtcHRfZW5hYmxlKCk7CisJCWlmIChmbGFncyAmIEk5MTVfU0hSSU5LX0FD VElWRSkgeworCQkJbXV0ZXhfbG9ja19uZXN0ZWQoJmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgsCisJ CQkJCSAgSTkxNV9NTV9TSFJJTktFUik7CisJCQkqdW5sb2NrID0gdHJ1ZTsKKwkJfQogCQlyZXR1 cm4gKnVubG9jazsKIAogCWNhc2UgTVVURVhfVFJZTE9DS19TVUNDRVNTOgpAQCAtMTYwLDcgKzE1 OCw3IEBAIGk5MTVfZ2VtX3NocmluayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKIAl1 bnNpZ25lZCBsb25nIHNjYW5uZWQgPSAwOwogCWJvb2wgdW5sb2NrOwogCi0JaWYgKCFzaHJpbmtl cl9sb2NrKGk5MTUsICZ1bmxvY2spKQorCWlmICghc2hyaW5rZXJfbG9jayhpOTE1LCBmbGFncywg JnVubG9jaykpCiAJCXJldHVybiAwOwogCiAJLyoKQEAgLTM1Nyw3ICszNTUsNyBAQCBpOTE1X2dl bV9zaHJpbmtlcl9zY2FuKHN0cnVjdCBzaHJpbmtlciAqc2hyaW5rZXIsIHN0cnVjdCBzaHJpbmtf Y29udHJvbCAqc2MpCiAKIAlzYy0+bnJfc2Nhbm5lZCA9IDA7CiAKLQlpZiAoIXNocmlua2VyX2xv Y2soaTkxNSwgJnVubG9jaykpCisJaWYgKCFzaHJpbmtlcl9sb2NrKGk5MTUsIDAsICZ1bmxvY2sp KQogCQlyZXR1cm4gU0hSSU5LX1NUT1A7CiAKIAlmcmVlZCA9IGk5MTVfZ2VtX3NocmluayhpOTE1 LApAQCAtMzk3LDcgKzM5NSw3IEBAIHNocmlua2VyX2xvY2tfdW5pbnRlcnJ1cHRpYmxlKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBib29sICp1bmxvY2ssCiAJZG8gewogCQlpZiAoaTkx NV9nZW1fd2FpdF9mb3JfaWRsZShpOTE1LAogCQkJCQkgICAwLCBNQVhfU0NIRURVTEVfVElNRU9V VCkgPT0gMCAmJgotCQkgICAgc2hyaW5rZXJfbG9jayhpOTE1LCB1bmxvY2spKQorCQkgICAgc2hy aW5rZXJfbG9jayhpOTE1LCAwLCB1bmxvY2spKQogCQkJYnJlYWs7CiAKIAkJc2NoZWR1bGVfdGlt ZW91dF9raWxsYWJsZSgxKTsKLS0gCjIuMjAuMC5yYzIKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=