From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 2/2] drm/i915: Fix timeout handling in i915_gem_shrinker_vmap Date: Fri, 4 Jan 2019 14:02:17 +0000 Message-ID: <20190104140217.17822-2-tvrtko.ursulin@linux.intel.com> References: <20190104140217.17822-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 68DF36EC70 for ; Fri, 4 Jan 2019 14:02:21 +0000 (UTC) In-Reply-To: <20190104140217.17822-1-tvrtko.ursulin@linux.intel.com> 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoZSBjb2Rl IHRyaWVzIHRvIGdyYWIgc3RydWN0IG11dGV4IGZvciA1bXMgZXZlcnkgdGltZSB0aGUgdW5sb2Nr ZWQgR1BVCmlkbGUgd2FpdCBzdWNjZWVkcy4gQnV0IHRoZSBHUFUgaWRsZSB3YWl0IGl0c2VsZiBp cyBwcmFjdGljYWxseSB1bmJvdW5kCndoaWNoIG1lYW5zIHRoZSA1bXMgdGltZW91dCBtaWdodCBu b3QgYmUgaG9ub3VyZWQuCgpDYXAgdGhlIEdQVSBpZGxlIHdhaXQgdG8gNW1zIGFzIHdlbGwgdG8g Zml4IHRoaXMuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5A aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMg fCAxMiArKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc2hy aW5rZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMKaW5kZXgg MWVlNWIwOGRhYjFiLi5lODQ4ZjM4MjIzZDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fc2hyaW5rZXIuYwpAQCAtNDA0LDEzICs0MDQsMTIgQEAgaTkxNV9nZW1fc2hyaW5rZXJfc2Nh bihzdHJ1Y3Qgc2hyaW5rZXIgKnNocmlua2VyLCBzdHJ1Y3Qgc2hyaW5rX2NvbnRyb2wgKnNjKQog CiBzdGF0aWMgYm9vbAogc2hyaW5rZXJfbG9ja191bmludGVycnVwdGlibGUoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmk5MTUsIGJvb2wgKnVubG9jaywKLQkJCSAgICAgIGludCB0aW1lb3V0X21z KQorCQkJICAgICAgdW5zaWduZWQgbG9uZyB0aW1lb3V0KQogewotCXVuc2lnbmVkIGxvbmcgdGlt ZW91dCA9IGppZmZpZXMgKyBtc2Vjc190b19qaWZmaWVzX3RpbWVvdXQodGltZW91dF9tcyk7CisJ Y29uc3QgdW5zaWduZWQgbG9uZyB0aW1lb3V0X2VuZCA9IGppZmZpZXMgKyB0aW1lb3V0OwogCiAJ ZG8gewotCQlpZiAoaTkxNV9nZW1fd2FpdF9mb3JfaWRsZShpOTE1LAotCQkJCQkgICAwLCBNQVhf U0NIRURVTEVfVElNRU9VVCkgPT0gMCAmJgorCQlpZiAoaTkxNV9nZW1fd2FpdF9mb3JfaWRsZShp OTE1LCAwLCB0aW1lb3V0KSA9PSAwICYmCiAJCSAgICBzaHJpbmtlcl9sb2NrKGk5MTUsIHVubG9j aykpCiAJCQlicmVhazsKIApAQCAtNDE4LDcgKzQxNyw3IEBAIHNocmlua2VyX2xvY2tfdW5pbnRl cnJ1cHRpYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBib29sICp1bmxvY2ssCiAJ CWlmIChmYXRhbF9zaWduYWxfcGVuZGluZyhjdXJyZW50KSkKIAkJCXJldHVybiBmYWxzZTsKIAot CQlpZiAodGltZV9hZnRlcihqaWZmaWVzLCB0aW1lb3V0KSkgeworCQlpZiAodGltZV9hZnRlcihq aWZmaWVzLCB0aW1lb3V0X2VuZCkpIHsKIAkJCXByX2VycigiVW5hYmxlIHRvIGxvY2sgR1BVIHRv IHB1cmdlIG1lbW9yeS5cbiIpOwogCQkJcmV0dXJuIGZhbHNlOwogCQl9CkBAIC00NzYsMTEgKzQ3 NSwxMiBAQCBpOTE1X2dlbV9zaHJpbmtlcl92bWFwKHN0cnVjdCBub3RpZmllcl9ibG9jayAqbmIs IHVuc2lnbmVkIGxvbmcgZXZlbnQsIHZvaWQgKnB0cgogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICppOTE1ID0KIAkJY29udGFpbmVyX29mKG5iLCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSwgbW0u dm1hcF9ub3RpZmllcik7CiAJc3RydWN0IGk5MTVfdm1hICp2bWEsICpuZXh0OworCWNvbnN0IHVu c2lnbmVkIGxvbmcgdGltZW91dCA9IG1zZWNzX3RvX2ppZmZpZXNfdGltZW91dCg1MDAwKTsKIAl1 bnNpZ25lZCBsb25nIGZyZWVkX3BhZ2VzID0gMDsKIAlib29sIHVubG9jazsKIAlpbnQgcmV0Owog Ci0JaWYgKCFzaHJpbmtlcl9sb2NrX3VuaW50ZXJydXB0aWJsZShpOTE1LCAmdW5sb2NrLCA1MDAw KSkKKwlpZiAoIXNocmlua2VyX2xvY2tfdW5pbnRlcnJ1cHRpYmxlKGk5MTUsICZ1bmxvY2ssIHRp bWVvdXQpKQogCQlyZXR1cm4gTk9USUZZX0RPTkU7CiAKIAkvKiBGb3JjZSBldmVyeXRoaW5nIG9u dG8gdGhlIGluYWN0aXZlIGxpc3RzICovCi0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=