From: David Weinehall Subject: [PATCH 1/3] drm/i915: Cleanup i915_gem_restore_gtt_mappings() Date: Fri, 18 Nov 2016 12:06:01 +0200 Message-ID: <20161118100603.14284-2-david.weinehall@linux.intel.com> References: <20161118100603.14284-1-david.weinehall@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id F2B0F6E128 for ; Fri, 18 Nov 2016 10:10:00 +0000 (UTC) In-Reply-To: <20161118100603.14284-1-david.weinehall@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 T24gcmVzdW1lIHdlIHVuYmluZCtiaW5kIG91ciBWTUEtbWFwcGluZ3MuIFRoaXMgcGF0Y2ggc2lt cGxpZmllcwp0aGlzIGEgYml0IGJ5IGludHJvZHVjaW5nIGEgcmViaW5kKCkgaGVscGVyLiAgQXMg YSBuaWNlIHNpZGUtZWZmZWN0CnRoaXMgYWxzbyBtYWtlcyB0aGUgcmVzdW1lIGNhbGxncmFwaCBz ZWxmLWRvY3VtZW50aW5nLgoKUGF0Y2ggYnkgQ2hyaXMuCgpTaWduZWQtb2ZmLWJ5OiBEYXZpZCBX ZWluZWhhbGwgPGRhdmlkLndlaW5laGFsbEBsaW51eC5pbnRlbC5jb20+CkNDOiBDaHJpcyBXaWxz b24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYyB8ICA3ICstLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdm1h LmMgICAgIHwgMTAgKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuaCAg ICAgfCAgNiArKysrLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgOCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGI0YmRlMTQ1MmYy YS4uNzZhZjMzNDQzZmNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMzI5 OSwxMiArMzI5OSw3IEBAIHZvaWQgaTkxNV9nZW1fcmVzdG9yZV9ndHRfbWFwcGluZ3Moc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkJaWYgKHZtYS0+dm0gIT0gJmdndHQtPmJh c2UpCiAJCQkJY29udGludWU7CiAKLQkJCWlmICghaTkxNV92bWFfdW5iaW5kKHZtYSkpCi0JCQkJ Y29udGludWU7Ci0KLQkJCVdBUk5fT04oaTkxNV92bWFfYmluZCh2bWEsIG9iai0+Y2FjaGVfbGV2 ZWwsCi0JCQkJCSAgICAgIFBJTl9VUERBVEUpKTsKLQkJCWdndHRfYm91bmQgPSB0cnVlOworCQkJ Z2d0dF9ib3VuZCB8PSBpOTE1X3ZtYV9yZWJpbmQodm1hKTsKIAkJfQogCiAJCWlmIChnZ3R0X2Jv dW5kKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfdm1hLmMKaW5kZXggNzM4ZmYzYTVjZDZlLi4xZmM1NDY4NmMy YzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdm1hLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuYwpAQCAtNjQ4LDMgKzY0OCwxMyBAQCBpbnQgaTkx NV92bWFfdW5iaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogCXJldHVybiAwOwogfQogCitib29s IGk5MTVfdm1hX3JlYmluZChzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKK3sKKwlpZiAoaTkxNV92bWFf aXNfcGlubmVkKHZtYSkpIHsKKwkJV0FSTl9PTihpOTE1X3ZtYV9iaW5kKHZtYSwgdm1hLT5vYmot PmNhY2hlX2xldmVsLCBQSU5fVVBEQVRFKSk7CisJCXJldHVybiB0cnVlOworCX0gZWxzZSB7CisJ CVdBUk5fT04oaTkxNV92bWFfdW5iaW5kKHZtYSkpOworCQlyZXR1cm4gZmFsc2U7CisJfQorfQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfdm1hLmgKaW5kZXggMmU0OWY1ZGQ2MTA3Li4xNmZhOWNkYzBkZDIgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdm1hLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV92bWEuaApAQCAtMjAwLDggKzIwMCwxMSBAQCBpOTE1X3ZtYV9jb21w YXJlKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQkgICAgICBzaXplb2Yodmlldy0+cGFyYW1zKSk7 CiB9CiAKLWludCBpOTE1X3ZtYV9iaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLCBlbnVtIGk5MTVf Y2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCitpbnQgaTkxNV92bWFfYmluZChzdHJ1Y3QgaTkxNV92 bWEgKnZtYSwKKwkJICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCiAJCSAgdTMy IGZsYWdzKTsKK2Jvb2wgaTkxNV92bWFfcmViaW5kKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKTsKKwog Ym9vbCBpOTE1X2dlbV92YWxpZF9ndHRfc3BhY2Uoc3RydWN0IGk5MTVfdm1hICp2bWEsIHVuc2ln bmVkIGxvbmcgY2FjaGVfbGV2ZWwpOwogYm9vbAogaTkxNV92bWFfbWlzcGxhY2VkKHN0cnVjdCBp OTE1X3ZtYSAqdm1hLCB1NjQgc2l6ZSwgdTY0IGFsaWdubWVudCwgdTY0IGZsYWdzKTsKQEAgLTMz OSw0ICszNDIsMyBAQCBpOTE1X3ZtYV91bnBpbl9mZW5jZShzdHJ1Y3QgaTkxNV92bWEgKnZtYSkK IH0KIAogI2VuZGlmCi0KLS0gCjIuMTAuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==