From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Subject: [PATCH 06/18] drm/i915/gtt: Rename unmap_and_free_px to
	free_px
Date: Thu, 25 Jun 2015 18:35:08 +0300
Message-ID: <1435246520-14745-7-git-send-email-mika.kuoppala@intel.com>
References: <1435246520-14745-1-git-send-email-mika.kuoppala@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 mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTP id 0BBB37A112
 for <intel-gfx@lists.freedesktop.org>; Thu, 25 Jun 2015 08:35:42 -0700 (PDT)
In-Reply-To: <1435246520-14745-1-git-send-email-mika.kuoppala@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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: miku@iki.fi
List-Id: intel-gfx@lists.freedesktop.org

QWxsIHRoZSBwYWdpbmcgc3RydWN0dXJlcyBhcmUgbm93IHNpbWlsYXIgYW5kIG1hcHBlZCBmb3IK
ZG1hLiBUaGUgdW5tYXBwaW5nIGlzIHRha2VuIGNhcmUgb2YgYnkgY29tbW9uIGFjY2Vzc29ycywg
c28KZG9uJ3Qgb3ZlcmxvYWQgdGhlIHJlYWRlciB3aXRoIHN1Y2ggZGV0YWlscy4KCnYyOiBCZSBj
b25zaXN0ZW50IHdpdGggZ290byBsYWJlbHMgKE1pY2hlbCkKClNpZ25lZC1vZmYtYnk6IE1pa2Eg
S3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogTWljaGVsIFRo
aWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx
NS9pOTE1X2dlbV9ndHQuYyB8IDQwICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t
LS0KIDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGE3YmRiZWIuLjgyY2NjNjkgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0zMzAsOCArMzMwLDcgQEAgc3RhdGljIHZv
aWQgY2xlYW51cF9wYWdlX2RtYShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9w
YWdlX2RtYSAqcCkKIAltZW1zZXQocCwgMCwgc2l6ZW9mKCpwKSk7CiB9CiAKLXN0YXRpYyB2b2lk
IHVubWFwX2FuZF9mcmVlX3B0KHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0LAotCQkJICAgICAg
IHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBmcmVlX3B0KHN0cnVjdCBkcm1f
ZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0KQogewogCWNsZWFudXBfcGFn
ZV9kbWEoZGV2LCAmcHQtPmJhc2UpOwogCWtmcmVlKHB0LT51c2VkX3B0ZXMpOwpAQCAtMzg3LDgg
KzM4Niw3IEBAIGZhaWxfYml0bWFwOgogCXJldHVybiBFUlJfUFRSKHJldCk7CiB9CiAKLXN0YXRp
YyB2b2lkIHVubWFwX2FuZF9mcmVlX3BkKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZCwK
LQkJCSAgICAgIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgdm9pZCBmcmVlX3BkKHN0
cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZCkKIHsK
IAlpZiAocGQtPmJhc2UucGFnZSkgewogCQljbGVhbnVwX3BhZ2VfZG1hKGRldiwgJnBkLT5iYXNl
KTsKQEAgLTQwOSwxNyArNDA3LDE3IEBAIHN0YXRpYyBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9y
eSAqYWxsb2NfcGQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlwZC0+dXNlZF9wZGVzID0ga2Nh
bGxvYyhCSVRTX1RPX0xPTkdTKEk5MTVfUERFUyksCiAJCQkJc2l6ZW9mKCpwZC0+dXNlZF9wZGVz
KSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFwZC0+dXNlZF9wZGVzKQotCQlnb3RvIGZyZWVfcGQ7CisJ
CWdvdG8gZmFpbF9iaXRtYXA7CiAKIAlyZXQgPSBzZXR1cF9wYWdlX2RtYShkZXYsICZwZC0+YmFz
ZSk7CiAJaWYgKHJldCkKLQkJZ290byBmcmVlX2JpdG1hcDsKKwkJZ290byBmYWlsX3BhZ2VfbTsK
IAogCXJldHVybiBwZDsKIAotZnJlZV9iaXRtYXA6CitmYWlsX3BhZ2VfbToKIAlrZnJlZShwZC0+
dXNlZF9wZGVzKTsKLWZyZWVfcGQ6CitmYWlsX2JpdG1hcDoKIAlrZnJlZShwZCk7CiAKIAlyZXR1
cm4gRVJSX1BUUihyZXQpOwpAQCAtNjE1LDcgKzYxMyw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfZnJl
ZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQsIHN0cnVjdCBkcm1f
ZGV2CiAJCWlmIChXQVJOX09OKCFwZC0+cGFnZV90YWJsZVtpXSkpCiAJCQljb250aW51ZTsKIAot
CQl1bm1hcF9hbmRfZnJlZV9wdChwZC0+cGFnZV90YWJsZVtpXSwgZGV2KTsKKwkJZnJlZV9wdChk
ZXYsIHBkLT5wYWdlX3RhYmxlW2ldKTsKIAkJcGQtPnBhZ2VfdGFibGVbaV0gPSBOVUxMOwogCX0K
IH0KQEAgLTYzMSwxMSArNjI5LDExIEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfY2xlYW51cChz
dHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIAkJCWNvbnRpbnVlOwogCiAJCWdlbjhfZnJl
ZV9wYWdlX3RhYmxlcyhwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldLCBwcGd0dC0+YmFzZS5k
ZXYpOwotCQl1bm1hcF9hbmRfZnJlZV9wZChwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0b3J5W2ldLCBw
cGd0dC0+YmFzZS5kZXYpOworCQlmcmVlX3BkKHBwZ3R0LT5iYXNlLmRldiwgcHBndHQtPnBkcC5w
YWdlX2RpcmVjdG9yeVtpXSk7CiAJfQogCi0JdW5tYXBfYW5kX2ZyZWVfcGQocHBndHQtPnNjcmF0
Y2hfcGQsIHBwZ3R0LT5iYXNlLmRldik7Ci0JdW5tYXBfYW5kX2ZyZWVfcHQocHBndHQtPnNjcmF0
Y2hfcHQsIHBwZ3R0LT5iYXNlLmRldik7CisJZnJlZV9wZChwcGd0dC0+YmFzZS5kZXYsIHBwZ3R0
LT5zY3JhdGNoX3BkKTsKKwlmcmVlX3B0KHBwZ3R0LT5iYXNlLmRldiwgcHBndHQtPnNjcmF0Y2hf
cHQpOwogfQogCiAvKioKQEAgLTY4OCw3ICs2ODYsNyBAQCBzdGF0aWMgaW50IGdlbjhfcHBndHRf
YWxsb2NfcGFnZXRhYnMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCiB1bndpbmRfb3V0
OgogCWZvcl9lYWNoX3NldF9iaXQocGRlLCBuZXdfcHRzLCBJOTE1X1BERVMpCi0JCXVubWFwX2Fu
ZF9mcmVlX3B0KHBkLT5wYWdlX3RhYmxlW3BkZV0sIGRldik7CisJCWZyZWVfcHQoZGV2LCBwZC0+
cGFnZV90YWJsZVtwZGVdKTsKIAogCXJldHVybiAtRU5PTUVNOwogfQpAQCAtNzQ2LDcgKzc0NCw3
IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBp
OTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAogdW53aW5kX291dDoKIAlmb3JfZWFjaF9zZXRfYml0KHBk
cGUsIG5ld19wZHMsIEdFTjhfTEVHQUNZX1BEUEVTKQotCQl1bm1hcF9hbmRfZnJlZV9wZChwZHAt
PnBhZ2VfZGlyZWN0b3J5W3BkcGVdLCBkZXYpOworCQlmcmVlX3BkKGRldiwgcGRwLT5wYWdlX2Rp
cmVjdG9yeVtwZHBlXSk7CiAKIAlyZXR1cm4gLUVOT01FTTsKIH0KQEAgLTkwNCwxMSArOTAyLDEx
IEBAIHN0YXRpYyBpbnQgZ2VuOF9hbGxvY192YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw
YWNlICp2bSwKIGVycl9vdXQ6CiAJd2hpbGUgKHBkcGUtLSkgewogCQlmb3JfZWFjaF9zZXRfYml0
KHRlbXAsIG5ld19wYWdlX3RhYmxlc1twZHBlXSwgSTkxNV9QREVTKQotCQkJdW5tYXBfYW5kX2Zy
ZWVfcHQocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtwZHBlXS0+cGFnZV90YWJsZVt0ZW1wXSwg
dm0tPmRldik7CisJCQlmcmVlX3B0KHZtLT5kZXYsIHBwZ3R0LT5wZHAucGFnZV9kaXJlY3Rvcnlb
cGRwZV0tPnBhZ2VfdGFibGVbdGVtcF0pOwogCX0KIAogCWZvcl9lYWNoX3NldF9iaXQocGRwZSwg
bmV3X3BhZ2VfZGlycywgR0VOOF9MRUdBQ1lfUERQRVMpCi0JCXVubWFwX2FuZF9mcmVlX3BkKHBw
Z3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRwZV0sIHZtLT5kZXYpOworCQlmcmVlX3BkKHZtLT5k
ZXYsIHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRwZV0pOwogCiAJZnJlZV9nZW44X3RlbXBf
Yml0bWFwcyhuZXdfcGFnZV9kaXJzLCBuZXdfcGFnZV90YWJsZXMpOwogCW1hcmtfdGxic19kaXJ0
eShwcGd0dCk7CkBAIC0xMzU4LDcgKzEzNTYsNyBAQCB1bndpbmRfb3V0OgogCQlzdHJ1Y3QgaTkx
NV9wYWdlX3RhYmxlICpwdCA9IHBwZ3R0LT5wZC5wYWdlX3RhYmxlW3BkZV07CiAKIAkJcHBndHQt
PnBkLnBhZ2VfdGFibGVbcGRlXSA9IHBwZ3R0LT5zY3JhdGNoX3B0OwotCQl1bm1hcF9hbmRfZnJl
ZV9wdChwdCwgdm0tPmRldik7CisJCWZyZWVfcHQodm0tPmRldiwgcHQpOwogCX0KIAogCW1hcmtf
dGxic19kaXJ0eShwcGd0dCk7CkBAIC0xMzc3LDExICsxMzc1LDExIEBAIHN0YXRpYyB2b2lkIGdl
bjZfcHBndHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIAogCWdlbjZf
Zm9yX2FsbF9wZGVzKHB0LCBwcGd0dCwgcGRlKSB7CiAJCWlmIChwdCAhPSBwcGd0dC0+c2NyYXRj
aF9wdCkKLQkJCXVubWFwX2FuZF9mcmVlX3B0KHB0LCBwcGd0dC0+YmFzZS5kZXYpOworCQkJZnJl
ZV9wdChwcGd0dC0+YmFzZS5kZXYsIHB0KTsKIAl9CiAKLQl1bm1hcF9hbmRfZnJlZV9wdChwcGd0
dC0+c2NyYXRjaF9wdCwgcHBndHQtPmJhc2UuZGV2KTsKLQl1bm1hcF9hbmRfZnJlZV9wZCgmcHBn
dHQtPnBkLCBwcGd0dC0+YmFzZS5kZXYpOworCWZyZWVfcHQocHBndHQtPmJhc2UuZGV2LCBwcGd0
dC0+c2NyYXRjaF9wdCk7CisJZnJlZV9wZChwcGd0dC0+YmFzZS5kZXYsICZwcGd0dC0+cGQpOwog
fQogCiBzdGF0aWMgaW50IGdlbjZfcHBndHRfYWxsb2NhdGVfcGFnZV9kaXJlY3RvcmllcyhzdHJ1
Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCkBAIC0xNDMxLDcgKzE0MjksNyBAQCBhbGxvYzoKIAly
ZXR1cm4gMDsKIAogZXJyX291dDoKLQl1bm1hcF9hbmRfZnJlZV9wdChwcGd0dC0+c2NyYXRjaF9w
dCwgcHBndHQtPmJhc2UuZGV2KTsKKwlmcmVlX3B0KHBwZ3R0LT5iYXNlLmRldiwgcHBndHQtPnNj
cmF0Y2hfcHQpOwogCXJldHVybiByZXQ7CiB9CiAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu
dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y
Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=