From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 2/3] drm/i915: Encourage our shrinker more when
	our shmemfs allocations fails
Date: Thu,  1 Jun 2017 14:33:30 +0100
Message-ID: <20170601133331.5973-2-chris@chris-wilson.co.uk>
References: <20170601133331.5973-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 622976E36D
 for <intel-gfx@lists.freedesktop.org>; Thu,  1 Jun 2017 13:33:47 +0000 (UTC)
In-Reply-To: <20170601133331.5973-1-chris@chris-wilson.co.uk>
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
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

Q29tbWl0IDI0ZjhlMDBhOGEyZSAoImRybS9pOTE1OiBQcmVmZXIgdG8gcmVwb3J0IEVOT01FTSBy
YXRoZXIgdGhhbgppbmN1ciB0aGUgb29tIGZvciBnZnggYWxsb2NhdGlvbnMiKSBtYWRlIHRoZSBi
b2xkIGRlY2lzaW9uIHRvIHRyeSBhbmQKYXZvaWQgdGhlIG9vbWtpbGxlciBieSByZXBvcnRpbmcg
LUVOT01FTSB0byB1c2Vyc3BhY2UgaWYgb3VyIGFsbG9jYXRpb24KZmFpbGVkIGFmdGVyIGF0dGVt
cHRpbmcgdG8gZnJlZSBlbm91Z2ggYnVmZmVyIG9iamVjdHMuIEluIHNob3J0LCBpdAphcHBlYXJz
IHdlIHdlcmUgZ2l2aW5nIHVwIHRvbyBlYXNpbHkgKGV2ZW4gYmVmb3JlIHdlIHN0YXJ0IHdvbmRl
cmluZyBpZgpvbmUgcGFzcyBvZiByZWNsYWltIGlzIGFzIHN0cm9uZyBhcyB3ZSB3b3VsZCBsaWtl
KS4gUGFydCBvZiB0aGUgcHJvYmxlbQppcyB0aGF0IGlmIHdlIG9ubHkgc2hyaW5rIGp1c3QgZW5v
dWdoIHBhZ2VzIGZvciBvdXIgZXhwZWN0ZWQgYWxsb2NhdGlvbiwKdGhlIGxpa2VsaWhvb2Qgb2Yg
dGhvc2UgcGFnZXMgYmVjb21pbmcgYXZhaWxhYmxlIHRvIHVzIGlzIGxlc3MgdGhhbiAxMDAlClRv
IGNvdW50ZXItYWN0IHRoYXQgd2UgYXNrIGZvciB0d2ljZSB0aGUgbnVtYmVyIG9mIHBhZ2VzIHRv
IGJlIG1hZGUKYXZhaWxhYmxlLiBGdXJ0aGVybW9yZSwgd2UgYWxsb3cgdGhlIHNocmlua2VyIHRv
IHB1bGwgcGFnZXMgZnJvbSB0aGUKYWN0aXZlIGxpc3QgaW4gbGF0ZXIgcGFzc2VzLgoKRml4ZXM6
IDI0ZjhlMDBhOGEyZSAoImRybS9pOTE1OiBQcmVmZXIgdG8gcmVwb3J0IEVOT01FTSByYXRoZXIg
dGhhbiBpbmN1ciB0aGUgb29tIGZvciBnZnggYWxsb2NhdGlvbnMiKQpTaWduZWQtb2ZmLWJ5OiBD
aHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IEpvb25hcyBMYWh0aW5l
biA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRh
bmllbC52ZXR0ZXJAZmZ3bGwuY2g+ClJldmlld2VkLWJ5OiBKb29uYXMgTGFodGluZW4gPGpvb25h
cy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9nZW0uYyB8IDUyICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAx
IGZpbGUgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZ2VtLmMKaW5kZXggN2I2NzZmZDFmMDc1Li4xMjk1MTVkODQ4MmEgMTAwNjQ0Ci0t
LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW0uYwpAQCAtMjMzNyw4ICsyMzM3LDggQEAgaTkxNV9nZW1fb2JqZWN0X2dl
dF9wYWdlc19ndHQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAlzdHJ1Y3QgcGFn
ZSAqcGFnZTsKIAl1bnNpZ25lZCBsb25nIGxhc3RfcGZuID0gMDsJLyogc3VwcHJlc3MgZ2NjIHdh
cm5pbmcgKi8KIAl1bnNpZ25lZCBpbnQgbWF4X3NlZ21lbnQ7CisJZ2ZwX3Qgbm9yZWNsYWltOwog
CWludCByZXQ7Ci0JZ2ZwX3QgZ2ZwOwogCiAJLyogQXNzZXJ0IHRoYXQgdGhlIG9iamVjdCBpcyBu
b3QgY3VycmVudGx5IGluIGFueSBHUFUgZG9tYWluLiBBcyBpdAogCSAqIHdhc24ndCBpbiB0aGUg
R1RULCB0aGVyZSBzaG91bGRuJ3QgYmUgYW55IHdheSBpdCBjb3VsZCBoYXZlIGJlZW4gaW4KQEAg
LTIzNjcsMjIgKzIzNjcsMzMgQEAgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlc19ndHQoc3RydWN0
IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAkgKiBGYWlsIHNpbGVudGx5IHdpdGhvdXQgc3Rh
cnRpbmcgdGhlIHNocmlua2VyCiAJICovCiAJbWFwcGluZyA9IG9iai0+YmFzZS5maWxwLT5mX21h
cHBpbmc7Ci0JZ2ZwID0gbWFwcGluZ19nZnBfY29uc3RyYWludChtYXBwaW5nLCB+KF9fR0ZQX0lP
IHwgX19HRlBfUkVDTEFJTSkpOwotCWdmcCB8PSBfX0dGUF9OT1JFVFJZIHwgX19HRlBfTk9XQVJO
OworCW5vcmVjbGFpbSA9IG1hcHBpbmdfZ2ZwX2NvbnN0cmFpbnQobWFwcGluZywKKwkJCQkJICAg
fihfX0dGUF9JTyB8IF9fR0ZQX1JFQ0xBSU0pKTsKKwlub3JlY2xhaW0gfD0gX19HRlBfTk9SRVRS
WSB8IF9fR0ZQX05PV0FSTjsKKwogCXNnID0gc3QtPnNnbDsKIAlzdC0+bmVudHMgPSAwOwogCWZv
ciAoaSA9IDA7IGkgPCBwYWdlX2NvdW50OyBpKyspIHsKLQkJcGFnZSA9IHNobWVtX3JlYWRfbWFw
cGluZ19wYWdlX2dmcChtYXBwaW5nLCBpLCBnZnApOwotCQlpZiAodW5saWtlbHkoSVNfRVJSKHBh
Z2UpKSkgewotCQkJaTkxNV9nZW1fc2hyaW5rKGRldl9wcml2LAotCQkJCQlwYWdlX2NvdW50LAot
CQkJCQlJOTE1X1NIUklOS19CT1VORCB8Ci0JCQkJCUk5MTVfU0hSSU5LX1VOQk9VTkQgfAotCQkJ
CQlJOTE1X1NIUklOS19QVVJHRUFCTEUpOworCQljb25zdCB1bnNpZ25lZCBpbnQgc2hyaW5rW10g
PSB7CisJCQlJOTE1X1NIUklOS19CT1VORCB8IEk5MTVfU0hSSU5LX1VOQk9VTkQgfCBJOTE1X1NI
UklOS19QVVJHRUFCTEUsCisJCQlJOTE1X1NIUklOS19CT1VORCB8IEk5MTVfU0hSSU5LX1VOQk9V
TkQgfCBJOTE1X1NIUklOS19QVVJHRUFCTEUgfCBJOTE1X1NIUklOS19BQ1RJVkUsCisJCQlJOTE1
X1NIUklOS19CT1VORCB8IEk5MTVfU0hSSU5LX1VOQk9VTkQgfCBJOTE1X1NIUklOS19BQ1RJVkUs
CisJCQkwLAorCQl9LCAqcyA9IHNocmluazsKKwkJZ2ZwX3QgZ2ZwID0gbm9yZWNsYWltOworCisJ
CWRvIHsKIAkJCXBhZ2UgPSBzaG1lbV9yZWFkX21hcHBpbmdfcGFnZV9nZnAobWFwcGluZywgaSwg
Z2ZwKTsKLQkJfQotCQlpZiAodW5saWtlbHkoSVNfRVJSKHBhZ2UpKSkgewotCQkJZ2ZwX3QgcmVj
bGFpbTsKKwkJCWlmIChsaWtlbHkoIUlTX0VSUihwYWdlKSkpCisJCQkJYnJlYWs7CisKKwkJCWlm
ICghKnMpIHsKKwkJCQlyZXQgPSBQVFJfRVJSKHBhZ2UpOworCQkJCWdvdG8gZXJyX3NnOworCQkJ
fQorCisJCQlpOTE1X2dlbV9zaHJpbmsoZGV2X3ByaXYsIDIgKiBwYWdlX2NvdW50LCAqcysrKTsK
KwkJCWNvbmRfcmVzY2hlZCgpOwogCiAJCQkvKiBXZSd2ZSB0cmllZCBoYXJkIHRvIGFsbG9jYXRl
IHRoZSBtZW1vcnkgYnkgcmVhcGluZwogCQkJICogb3VyIG93biBidWZmZXIsIG5vdyBsZXQgdGhl
IHJlYWwgVk0gZG8gaXRzIGpvYiBhbmQKQEAgLTIzOTIsMTUgKzI0MDMsMTMgQEAgaTkxNV9nZW1f
b2JqZWN0X2dldF9wYWdlc19ndHQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAkJ
CSAqIGRlZmVyIHRoZSBvb20gaGVyZSBieSByZXBvcnRpbmcgdGhlIEVOT01FTSBiYWNrCiAJCQkg
KiB0byB1c2Vyc3BhY2UuCiAJCQkgKi8KLQkJCXJlY2xhaW0gPSBtYXBwaW5nX2dmcF9tYXNrKG1h
cHBpbmcpOwotCQkJcmVjbGFpbSB8PSBfX0dGUF9OT1JFVFJZOyAvKiByZWNsYWltLCBidXQgbm8g
b29tICovCi0KLQkJCXBhZ2UgPSBzaG1lbV9yZWFkX21hcHBpbmdfcGFnZV9nZnAobWFwcGluZywg
aSwgcmVjbGFpbSk7Ci0JCQlpZiAoSVNfRVJSKHBhZ2UpKSB7Ci0JCQkJcmV0ID0gUFRSX0VSUihw
YWdlKTsKLQkJCQlnb3RvIGVycl9zZzsKKwkJCWlmICghKnMpIHsKKwkJCQkvKiByZWNsYWltIGFu
ZCB3YXJuLCBidXQgbm8gb29tICovCisJCQkJZ2ZwID0gbWFwcGluZ19nZnBfbWFzayhtYXBwaW5n
KTsKKwkJCQlnZnAgfD0gX19HRlBfTk9SRVRSWTsKIAkJCX0KLQkJfQorCQl9IHdoaWxlICgxKTsK
KwogCQlpZiAoIWkgfHwKIAkJICAgIHNnLT5sZW5ndGggPj0gbWF4X3NlZ21lbnQgfHwKIAkJICAg
IHBhZ2VfdG9fcGZuKHBhZ2UpICE9IGxhc3RfcGZuICsgMSkgewpAQCAtNDI4NSw2ICs0Mjk0LDcg
QEAgaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By
aXYsIHU2NCBzaXplKQogCiAJbWFwcGluZyA9IG9iai0+YmFzZS5maWxwLT5mX21hcHBpbmc7CiAJ
bWFwcGluZ19zZXRfZ2ZwX21hc2sobWFwcGluZywgbWFzayk7CisJR0VNX0JVR19PTighKG1hcHBp
bmdfZ2ZwX21hc2sobWFwcGluZykgJiBfX0dGUF9SRUNMQUlNKSk7CiAKIAlpOTE1X2dlbV9vYmpl
Y3RfaW5pdChvYmosICZpOTE1X2dlbV9vYmplY3Rfb3BzKTsKIAotLSAKMi4xMS4wCgpfX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu
ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl
ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK