From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH 2/2] drm/i915: Fix timeout handling in
 i915_gem_shrinker_vmap
Date: Wed,  9 Jan 2019 14:12:47 +0000
Message-ID: <20190109141247.32166-2-tvrtko.ursulin@linux.intel.com>
References: <20190109141247.32166-1-tvrtko.ursulin@linux.intel.com>
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 mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 0214A89503
 for <Intel-gfx@lists.freedesktop.org>; Wed,  9 Jan 2019 14:12:53 +0000 (UTC)
In-Reply-To: <20190109141247.32166-1-tvrtko.ursulin@linux.intel.com>
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

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoZSBjb2Rl
IHRyaWVzIHRvIGdyYWIgc3RydWN0IG11dGV4IGZvciA1bXMgZXZlcnkgdGltZSB0aGUgdW5sb2Nr
ZWQgR1BVCmlkbGUgd2FpdCBzdWNjZWVkcy4gQnV0IHRoZSBHUFUgaWRsZSB3YWl0IGl0c2VsZiBp
cyBwcmFjdGljYWxseSB1bmJvdW5kCndoaWNoIG1lYW5zIHRoZSA1bXMgdGltZW91dCBtaWdodCBu
b3QgYmUgaG9ub3VyZWQuCgpDYXAgdGhlIEdQVSBpZGxlIHdhaXQgdG8gNW1zIGFzIHdlbGwgdG8g
Zml4IHRoaXMuCgp2MjoKICogUmViYXNlLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4g
PHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1
X2dlbV9zaHJpbmtlci5jIHwgMTIgKysrKysrLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNiBpbnNl
cnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9z
aHJpbmtlci5jCmluZGV4IGNlNTM5ZDM4NDYxYy4uNGVlMzkzMDI4YTkzIDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zaHJpbmtlci5jCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMKQEAgLTQwMiwxMyArNDAyLDEyIEBAIGk5MTVf
Z2VtX3Nocmlua2VyX3NjYW4oc3RydWN0IHNocmlua2VyICpzaHJpbmtlciwgc3RydWN0IHNocmlu
a19jb250cm9sICpzYykKIAogc3RhdGljIGJvb2wKIHNocmlua2VyX2xvY2tfdW5pbnRlcnJ1cHRp
YmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBib29sICp1bmxvY2ssCi0JCQkgICAg
ICBpbnQgdGltZW91dF9tcykKKwkJCSAgICAgIHVuc2lnbmVkIGxvbmcgdGltZW91dCkKIHsKLQl1
bnNpZ25lZCBsb25nIHRpbWVvdXQgPSBqaWZmaWVzICsgbXNlY3NfdG9famlmZmllc190aW1lb3V0
KHRpbWVvdXRfbXMpOworCWNvbnN0IHVuc2lnbmVkIGxvbmcgdGltZW91dF9lbmQgPSBqaWZmaWVz
ICsgdGltZW91dDsKIAogCWRvIHsKLQkJaWYgKGk5MTVfZ2VtX3dhaXRfZm9yX2lkbGUoaTkxNSwK
LQkJCQkJICAgMCwgTUFYX1NDSEVEVUxFX1RJTUVPVVQpID09IDAgJiYKKwkJaWYgKGk5MTVfZ2Vt
X3dhaXRfZm9yX2lkbGUoaTkxNSwgMCwgdGltZW91dCkgPT0gMCAmJgogCQkgICAgc2hyaW5rZXJf
bG9jayhpOTE1LCAwLCB1bmxvY2spKQogCQkJYnJlYWs7CiAKQEAgLTQxNiw3ICs0MTUsNyBAQCBz
aHJpbmtlcl9sb2NrX3VuaW50ZXJydXB0aWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx
NSwgYm9vbCAqdW5sb2NrLAogCQlpZiAoZmF0YWxfc2lnbmFsX3BlbmRpbmcoY3VycmVudCkpCiAJ
CQlyZXR1cm4gZmFsc2U7CiAKLQkJaWYgKHRpbWVfYWZ0ZXIoamlmZmllcywgdGltZW91dCkpIHsK
KwkJaWYgKHRpbWVfYWZ0ZXIoamlmZmllcywgdGltZW91dF9lbmQpKSB7CiAJCQlwcl9lcnIoIlVu
YWJsZSB0byBsb2NrIEdQVSB0byBwdXJnZSBtZW1vcnkuXG4iKTsKIAkJCXJldHVybiBmYWxzZTsK
IAkJfQpAQCAtNDc0LDExICs0NzMsMTIgQEAgaTkxNV9nZW1fc2hyaW5rZXJfdm1hcChzdHJ1Y3Qg
bm90aWZpZXJfYmxvY2sgKm5iLCB1bnNpZ25lZCBsb25nIGV2ZW50LCB2b2lkICpwdHIKIAlzdHJ1
Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9CiAJCWNvbnRhaW5lcl9vZihuYiwgc3RydWN0IGRy
bV9pOTE1X3ByaXZhdGUsIG1tLnZtYXBfbm90aWZpZXIpOwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1h
LCAqbmV4dDsKKwljb25zdCB1bnNpZ25lZCBsb25nIHRpbWVvdXQgPSBtc2Vjc190b19qaWZmaWVz
X3RpbWVvdXQoNTAwMCk7CiAJdW5zaWduZWQgbG9uZyBmcmVlZF9wYWdlcyA9IDA7CiAJYm9vbCB1
bmxvY2s7CiAJaW50IHJldDsKIAotCWlmICghc2hyaW5rZXJfbG9ja191bmludGVycnVwdGlibGUo
aTkxNSwgJnVubG9jaywgNTAwMCkpCisJaWYgKCFzaHJpbmtlcl9sb2NrX3VuaW50ZXJydXB0aWJs
ZShpOTE1LCAmdW5sb2NrLCB0aW1lb3V0KSkKIAkJcmV0dXJuIE5PVElGWV9ET05FOwogCiAJLyog
Rm9yY2UgZXZlcnl0aGluZyBvbnRvIHRoZSBpbmFjdGl2ZSBsaXN0cyAqLwotLSAKMi4xOS4xCgpf
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg
bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0
cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK