From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Subject: [PATCH 10/18] drm/i915/gtt: Use macros to access dma
	mapped pages
Date: Thu, 25 Jun 2015 18:35:12 +0300
Message-ID: <1435246520-14745-11-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 B79F76EC61
 for <intel-gfx@lists.freedesktop.org>; Thu, 25 Jun 2015 08:35:41 -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

TWFrZSBwYWdpbmcgc3RydWN0dXJlIHR5cGUgYWdub3N0aWMgKl9weCBtYWNyb3MgdG8gYWNjZXNz
CnBhZ2UgZG1hIHN0cnVjdCwgdGhlIGJhY2tpbmcgcGFnZSBhbmQgdGhlIGRtYSBhZGRyZXNzLgoK
VGhpcyBtYWtlcyB0aGUgY29kZSBsZXNzIGNsdXR0ZXJlZCBvbiBpbnRlcm5hbHMgb2YKaTkxNV9w
YWdlX2RtYS4KCnYyOiBTdXBlcmZsdW91cyBjb25zdCAtPiBub25jb25zdCByZW1vdmVkCnYzOiBS
ZWJhc2VkCgpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVs
LmNvbT4KUmV2aWV3ZWQtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5j
b20+ICh2MikKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDM1ICsr
KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbV9ndHQuaCB8ICA4ICsrKysrKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDI2IGluc2VydGlv
bnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5k
ZXggNmFiY2YzMi4uZTg1Njc2ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAg
LTM0OSw5ICszNDksMTQgQEAgc3RhdGljIHZvaWQga3VubWFwX3BhZ2VfZG1hKHN0cnVjdCBkcm1f
ZGV2aWNlICpkZXYsIHZvaWQgKnZhZGRyKQogCWt1bm1hcF9hdG9taWModmFkZHIpOwogfQogCi0j
ZGVmaW5lIGttYXBfcHgocHgpIGttYXBfcGFnZV9kbWEoJihweCktPmJhc2UpCisjZGVmaW5lIGtt
YXBfcHgocHgpIGttYXBfcGFnZV9kbWEocHhfYmFzZShweCkpCiAjZGVmaW5lIGt1bm1hcF9weChw
cGd0dCwgdmFkZHIpIGt1bm1hcF9wYWdlX2RtYSgocHBndHQpLT5iYXNlLmRldiwgKHZhZGRyKSkK
IAorI2RlZmluZSBzZXR1cF9weChkZXYsIHB4KSBzZXR1cF9wYWdlX2RtYSgoZGV2KSwgcHhfYmFz
ZShweCkpCisjZGVmaW5lIGNsZWFudXBfcHgoZGV2LCBweCkgY2xlYW51cF9wYWdlX2RtYSgoZGV2
KSwgcHhfYmFzZShweCkpCisjZGVmaW5lIGZpbGxfcHgoZGV2LCBweCwgdikgZmlsbF9wYWdlX2Rt
YSgoZGV2KSwgcHhfYmFzZShweCksICh2KSkKKyNkZWZpbmUgZmlsbDMyX3B4KGRldiwgcHgsIHYp
IGZpbGxfcGFnZV9kbWFfMzIoKGRldiksIHB4X2Jhc2UocHgpLCAodikpCisKIHN0YXRpYyB2b2lk
IGZpbGxfcGFnZV9kbWEoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGk5MTVfcGFnZV9k
bWEgKnAsCiAJCQkgIGNvbnN0IHVpbnQ2NF90IHZhbCkKIHsKQEAgLTM3Niw3ICszODEsNyBAQCBz
dGF0aWMgdm9pZCBmaWxsX3BhZ2VfZG1hXzMyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVj
dCBpOTE1X3BhZ2VfZG1hICpwLAogCiBzdGF0aWMgdm9pZCBmcmVlX3B0KHN0cnVjdCBkcm1fZGV2
aWNlICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0KQogewotCWNsZWFudXBfcGFnZV9k
bWEoZGV2LCAmcHQtPmJhc2UpOworCWNsZWFudXBfcHgoZGV2LCBwdCk7CiAJa2ZyZWUocHQtPnVz
ZWRfcHRlcyk7CiAJa2ZyZWUocHQpOwogfQpAQCAtMzg4LDcgKzM5Myw3IEBAIHN0YXRpYyB2b2lk
IGdlbjhfaW5pdGlhbGl6ZV9wdChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAogCXNj
cmF0Y2hfcHRlID0gZ2VuOF9wdGVfZW5jb2RlKHZtLT5zY3JhdGNoLmFkZHIsIEk5MTVfQ0FDSEVf
TExDLCB0cnVlKTsKIAotCWZpbGxfcGFnZV9kbWEodm0tPmRldiwgJnB0LT5iYXNlLCBzY3JhdGNo
X3B0ZSk7CisJZmlsbF9weCh2bS0+ZGV2LCBwdCwgc2NyYXRjaF9wdGUpOwogfQogCiBzdGF0aWMg
c3RydWN0IGk5MTVfcGFnZV90YWJsZSAqYWxsb2NfcHQoc3RydWN0IGRybV9kZXZpY2UgKmRldikK
QEAgLTQwOCw3ICs0MTMsNyBAQCBzdGF0aWMgc3RydWN0IGk5MTVfcGFnZV90YWJsZSAqYWxsb2Nf
cHQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoIXB0LT51c2VkX3B0ZXMpCiAJCWdvdG8g
ZmFpbF9iaXRtYXA7CiAKLQlyZXQgPSBzZXR1cF9wYWdlX2RtYShkZXYsICZwdC0+YmFzZSk7CisJ
cmV0ID0gc2V0dXBfcHgoZGV2LCBwdCk7CiAJaWYgKHJldCkKIAkJZ290byBmYWlsX3BhZ2VfbTsK
IApAQCAtNDI0LDggKzQyOSw4IEBAIGZhaWxfYml0bWFwOgogCiBzdGF0aWMgdm9pZCBmcmVlX3Bk
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZCkK
IHsKLQlpZiAocGQtPmJhc2UucGFnZSkgewotCQljbGVhbnVwX3BhZ2VfZG1hKGRldiwgJnBkLT5i
YXNlKTsKKwlpZiAocHhfcGFnZShwZCkpIHsKKwkJY2xlYW51cF9weChkZXYsIHBkKTsKIAkJa2Zy
ZWUocGQtPnVzZWRfcGRlcyk7CiAJCWtmcmVlKHBkKTsKIAl9CkBAIC00NDUsNyArNDUwLDcgQEAg
c3RhdGljIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICphbGxvY19wZChzdHJ1Y3QgZHJtX2Rl
dmljZSAqZGV2KQogCWlmICghcGQtPnVzZWRfcGRlcykKIAkJZ290byBmYWlsX2JpdG1hcDsKIAot
CXJldCA9IHNldHVwX3BhZ2VfZG1hKGRldiwgJnBkLT5iYXNlKTsKKwlyZXQgPSBzZXR1cF9weChk
ZXYsIHBkKTsKIAlpZiAocmV0KQogCQlnb3RvIGZhaWxfcGFnZV9tOwogCkBAIC01MzEsNyArNTM2
LDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9jbGVhcl9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRy
ZXNzX3NwYWNlICp2bSwKIAogCQlwdCA9IHBkLT5wYWdlX3RhYmxlW3BkZV07CiAKLQkJaWYgKFdB
Uk5fT04oIXB0LT5iYXNlLnBhZ2UpKQorCQlpZiAoV0FSTl9PTighcHhfcGFnZShwdCkpKQogCQkJ
Y29udGludWU7CiAKIAkJbGFzdF9wdGUgPSBwdGUgKyBudW1fZW50cmllczsKQEAgLTYwMyw3ICs2
MDgsNyBAQCBzdGF0aWMgdm9pZCBfX2dlbjhfZG9fbWFwX3B0KGdlbjhfcGRlX3QgKiBjb25zdCBw
ZGUsCiAJCQkgICAgIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJZ2VuOF9wZGVfdCBlbnRy
eSA9Ci0JCWdlbjhfcGRlX2VuY29kZShkZXYsIHB0LT5iYXNlLmRhZGRyLCBJOTE1X0NBQ0hFX0xM
Qyk7CisJCWdlbjhfcGRlX2VuY29kZShkZXYsIHB4X2RtYShwdCksIEk5MTVfQ0FDSEVfTExDKTsK
IAkqcGRlID0gZW50cnk7CiB9CiAKQEAgLTYxNCwxNyArNjE5LDE3IEBAIHN0YXRpYyB2b2lkIGdl
bjhfaW5pdGlhbGl6ZV9wZChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJY29udGFp
bmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CiAJZ2VuOF9wZGVfdCBzY3Jh
dGNoX3BkZTsKIAotCXNjcmF0Y2hfcGRlID0gZ2VuOF9wZGVfZW5jb2RlKHZtLT5kZXYsIHBwZ3R0
LT5zY3JhdGNoX3B0LT5iYXNlLmRhZGRyLAorCXNjcmF0Y2hfcGRlID0gZ2VuOF9wZGVfZW5jb2Rl
KHZtLT5kZXYsIHB4X2RtYShwcGd0dC0+c2NyYXRjaF9wdCksCiAJCQkJICAgICAgSTkxNV9DQUNI
RV9MTEMpOwogCi0JZmlsbF9wYWdlX2RtYSh2bS0+ZGV2LCAmcGQtPmJhc2UsIHNjcmF0Y2hfcGRl
KTsKKwlmaWxsX3B4KHZtLT5kZXYsIHBkLCBzY3JhdGNoX3BkZSk7CiB9CiAKIHN0YXRpYyB2b2lk
IGdlbjhfZnJlZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQsIHN0
cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJaW50IGk7CiAKLQlpZiAoIXBkLT5iYXNlLnBhZ2Up
CisJaWYgKCFweF9wYWdlKHBkKSkKIAkJcmV0dXJuOwogCiAJZm9yX2VhY2hfc2V0X2JpdChpLCBw
ZC0+dXNlZF9wZGVzLCBJOTE1X1BERVMpIHsKQEAgLTk4Myw3ICs5ODgsNyBAQCBzdGF0aWMgdm9p
ZCBnZW42X2R1bXBfcHBndHQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCBzdHJ1Y3Qgc2Vx
X2ZpbGUgKm0pCiAJZ2VuNl9mb3JfZWFjaF9wZGUodW51c2VkLCAmcHBndHQtPnBkLCBzdGFydCwg
bGVuZ3RoLCB0ZW1wLCBwZGUpIHsKIAkJdTMyIGV4cGVjdGVkOwogCQlnZW42X3B0ZV90ICpwdF92
YWRkcjsKLQkJZG1hX2FkZHJfdCBwdF9hZGRyID0gcHBndHQtPnBkLnBhZ2VfdGFibGVbcGRlXS0+
YmFzZS5kYWRkcjsKKwkJY29uc3QgZG1hX2FkZHJfdCBwdF9hZGRyID0gcHhfZG1hKHBwZ3R0LT5w
ZC5wYWdlX3RhYmxlW3BkZV0pOwogCQlwZF9lbnRyeSA9IHJlYWRsKHBwZ3R0LT5wZF9hZGRyICsg
cGRlKTsKIAkJZXhwZWN0ZWQgPSAoR0VONl9QREVfQUREUl9FTkNPREUocHRfYWRkcikgfCBHRU42
X1BERV9WQUxJRCk7CiAKQEAgLTEwMzAsNyArMTAzNSw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfd3Jp
dGVfcGRlKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5ICpwZCwKIAkJY29udGFpbmVyX29mKHBk
LCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgcGQpOwogCXUzMiBwZF9lbnRyeTsKIAotCXBkX2VudHJ5
ID0gR0VONl9QREVfQUREUl9FTkNPREUocHQtPmJhc2UuZGFkZHIpOworCXBkX2VudHJ5ID0gR0VO
Nl9QREVfQUREUl9FTkNPREUocHhfZG1hKHB0KSk7CiAJcGRfZW50cnkgfD0gR0VONl9QREVfVkFM
SUQ7CiAKIAl3cml0ZWwocGRfZW50cnksIHBwZ3R0LT5wZF9hZGRyICsgcGRlKTsKQEAgLTEyNzks
NyArMTI4NCw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfaW5pdGlhbGl6ZV9wdChzdHJ1Y3QgaTkxNV9h
ZGRyZXNzX3NwYWNlICp2bSwKIAogCXNjcmF0Y2hfcHRlID0gdm0tPnB0ZV9lbmNvZGUodm0tPnNj
cmF0Y2guYWRkciwgSTkxNV9DQUNIRV9MTEMsIHRydWUsIDApOwogCi0JZmlsbF9wYWdlX2RtYV8z
Mih2bS0+ZGV2LCAmcHQtPmJhc2UsIHNjcmF0Y2hfcHRlKTsKKwlmaWxsMzJfcHgodm0tPmRldiwg
cHQsIHNjcmF0Y2hfcHRlKTsKIH0KIAogc3RhdGljIGludCBnZW42X2FsbG9jX3ZhX3JhbmdlKHN0
cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu
aAppbmRleCBjNjgxNTczYi4uZjRiY2VjMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0
LmgKQEAgLTIxOSw2ICsyMTksMTAgQEAgc3RydWN0IGk5MTVfcGFnZV9kbWEgewogCX07CiB9Owog
CisjZGVmaW5lIHB4X2Jhc2UocHgpICgmKHB4KS0+YmFzZSkKKyNkZWZpbmUgcHhfcGFnZShweCkg
KHB4X2Jhc2UocHgpLT5wYWdlKQorI2RlZmluZSBweF9kbWEocHgpIChweF9iYXNlKHB4KS0+ZGFk
ZHIpCisKIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgewogCXN0cnVjdCBpOTE1X3BhZ2VfZG1hIGJh
c2U7CiAKQEAgLTQ4MSw4ICs0ODUsOCBAQCBzdGF0aWMgaW5saW5lIGRtYV9hZGRyX3QKIGk5MTVf
cGFnZV9kaXJfZG1hX2FkZHIoY29uc3Qgc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCBjb25z
dCB1bnNpZ25lZCBuKQogewogCXJldHVybiB0ZXN0X2JpdChuLCBwcGd0dC0+cGRwLnVzZWRfcGRw
ZXMpID8KLQkJcHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtuXS0+YmFzZS5kYWRkciA6Ci0JCXBw
Z3R0LT5zY3JhdGNoX3BkLT5iYXNlLmRhZGRyOworCQlweF9kbWEocHBndHQtPnBkcC5wYWdlX2Rp
cmVjdG9yeVtuXSkgOgorCQlweF9kbWEocHBndHQtPnNjcmF0Y2hfcGQpOwogfQogCiBpbnQgaTkx
NV9nZW1fZ3R0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci0tIAoxLjkuMQoKX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp
bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl
ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK