From: Matthew Auld Subject: [PATCH] drm/i915: prefer vma->size for vma iomap Date: Sat, 17 Mar 2018 17:42:07 +0000 Message-ID: <20180317174207.16487-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 04B3989711 for ; Sat, 17 Mar 2018 17:42:10 +0000 (UTC) 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 SXQgbWFrZXMgbW9yZSBzZW5zZSB0byB1c2Ugdm1hLT5zaXplLCBzaW5jZSB0aGlzIGRldGVybWlu ZXMgdGhlIG51bWJlcgpvZiBlbnRyaWVzIHdlIGluc2VydGVkIGludG8gdGhlIHZtLCB3aGlsZSB0 aGUgdm1hLT5ub2RlLnNpemUgaXMgdGhlIHNpemUKb2YgdGhlIHZtIHdpbmRvdyB3ZSByZXNlcnZl ZCwgd2hpY2ggbWF5IGFsc28gaW5jbHVkZSBwYWRkaW5nLiBBdCB0aGUKdmVyeSBsZWFzdCB0aGlz IGtlZXBzIHRoaW5ncyBjb25zaXN0ZW50IHdpdGggdGhlIEdUVCByb3V0aW5lcy4KClNpZ25lZC1v ZmYtYnk6IE1hdHRoZXcgQXVsZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4KQ2M6IENocmlzIFdp bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3Nocmlua2VyLmMgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Zt YS5jICAgICAgICAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYyAg ICAgICB8IDQgKystLQogMyBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDQgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc2hyaW5r ZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Nocmlua2VyLmMKaW5kZXggNTc1 N2ZiN2M0YjVhLi5lNzFlOTk5MTY5Y2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3Nocmlua2VyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f c2hyaW5rZXIuYwpAQCAtNDgxLDcgKzQ4MSw3IEBAIGk5MTVfZ2VtX3Nocmlua2VyX3ZtYXAoc3Ry dWN0IG5vdGlmaWVyX2Jsb2NrICpuYiwgdW5zaWduZWQgbG9uZyBldmVudCwgdm9pZCAqcHRyCiAJ LyogV2UgYWxzbyB3YW50IHRvIGNsZWFyIGFueSBjYWNoZWQgaW9tYXBzIGFzIHRoZXkgd3JhcCB2 bWFwICovCiAJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHZtYSwgbmV4dCwKIAkJCQkgJmk5MTUt PmdndHQuYmFzZS5pbmFjdGl2ZV9saXN0LCB2bV9saW5rKSB7Ci0JCXVuc2lnbmVkIGxvbmcgY291 bnQgPSB2bWEtPm5vZGUuc2l6ZSA+PiBQQUdFX1NISUZUOworCQl1bnNpZ25lZCBsb25nIGNvdW50 ID0gdm1hLT5zaXplID4+IFBBR0VfU0hJRlQ7CiAJCWlmICh2bWEtPmlvbWFwICYmIGk5MTVfdm1h X3VuYmluZCh2bWEpID09IDApCiAJCQlmcmVlZF9wYWdlcyArPSBjb3VudDsKIAl9CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3ZtYS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV92bWEuYwppbmRleCA0YmRhM2JkMjliZjUuLjAwZmIxZTVlYTQ5NSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3ZtYS5jCkBAIC0zMTIsNyArMzEyLDcgQEAgdm9pZCBfX2lvbWVtICppOTE1X3Zt YV9waW5faW9tYXAoc3RydWN0IGk5MTVfdm1hICp2bWEpCiAJaWYgKHB0ciA9PSBOVUxMKSB7CiAJ CXB0ciA9IGlvX21hcHBpbmdfbWFwX3djKCZpOTE1X3ZtX3RvX2dndHQodm1hLT52bSktPmlvbWFw LAogCQkJCQl2bWEtPm5vZGUuc3RhcnQsCi0JCQkJCXZtYS0+bm9kZS5zaXplKTsKKwkJCQkJdm1h LT5zaXplKTsKIAkJaWYgKHB0ciA9PSBOVUxMKSB7CiAJCQllcnIgPSAtRU5PTUVNOwogCQkJZ290 byBlcnI7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwppbmRleCA2NWEzMzEzNzIzYzkuLjQy NDgwMGMxNmRlYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCkBAIC0yNDQsNyArMjQ0 LDcgQEAgc3RhdGljIGludCBpbnRlbGZiX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVs cGVyLAogCWluZm8tPmFwZXJ0dXJlcy0+cmFuZ2VzWzBdLnNpemUgPSBnZ3R0LT5tYXBwYWJsZV9l bmQ7CiAKIAlpbmZvLT5maXguc21lbV9zdGFydCA9IGRldi0+bW9kZV9jb25maWcuZmJfYmFzZSAr IGk5MTVfZ2d0dF9vZmZzZXQodm1hKTsKLQlpbmZvLT5maXguc21lbV9sZW4gPSB2bWEtPm5vZGUu c2l6ZTsKKwlpbmZvLT5maXguc21lbV9sZW4gPSB2bWEtPnNpemU7CiAKIAl2YWRkciA9IGk5MTVf dm1hX3Bpbl9pb21hcCh2bWEpOwogCWlmIChJU19FUlIodmFkZHIpKSB7CkBAIC0yNTMsNyArMjUz LDcgQEAgc3RhdGljIGludCBpbnRlbGZiX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVs cGVyLAogCQlnb3RvIG91dF91bnBpbjsKIAl9CiAJaW5mby0+c2NyZWVuX2Jhc2UgPSB2YWRkcjsK LQlpbmZvLT5zY3JlZW5fc2l6ZSA9IHZtYS0+bm9kZS5zaXplOworCWluZm8tPnNjcmVlbl9zaXpl ID0gdm1hLT5zaXplOwogCiAJLyogVGhpcyBkcml2ZXIgZG9lc24ndCBuZWVkIGEgVlQgc3dpdGNo IHRvIHJlc3RvcmUgdGhlIG1vZGUgb24gcmVzdW1lICovCiAJaW5mby0+c2tpcF92dF9zd2l0Y2gg PSB0cnVlOwotLSAKMi4xNC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK