From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: Re: [PATCH 13/21] drm/i915/gtt: Use macros to access dma mapped pages Date: Wed, 03 Jun 2015 11:57:20 +0100 Message-ID: <556EDD90.8090309@intel.com> References: <1432314314-23530-1-git-send-email-mika.kuoppala@intel.com> <1432314314-23530-14-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 3DD026E25B for ; Wed, 3 Jun 2015 03:57:23 -0700 (PDT) In-Reply-To: <1432314314-23530-14-git-send-email-mika.kuoppala@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Mika Kuoppala , "intel-gfx@lists.freedesktop.org" List-Id: intel-gfx@lists.freedesktop.org T24gNS8yMi8yMDE1IDY6MDUgUE0sIE1pa2EgS3VvcHBhbGEgd3JvdGU6Cj4gTWFrZSBwYWdpbmcg c3RydWN0dXJlIHR5cGUgYWdub3N0aWMgKl9weCBtYWNyb3MgdG8gYWNjZXNzCj4gcGFnZSBkbWEg c3RydWN0LCB0aGUgYmFja2luZyBwYWdlIGFuZCB0aGUgZG1hIGFkZHJlc3MuCj4KPiBUaGlzIG1h a2VzIHRoZSBjb2RlIGxlc3MgY2x1dHRlcmVkIG9uIGludGVybmFscyBvZgo+IGk5MTVfcGFnZV9k bWEuCj4KPiB2MjogU3VwZXJmbHVvdXMgY29uc3QgLT4gbm9uY29uc3QgcmVtb3ZlZAo+Cj4gU2ln bmVkLW9mZi1ieTogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+CgpTaW5j ZSB3ZSdyZSBlbmRpbmcgdXAgd2l0aCBtYWNyb3MgZm9yIGEgbG90IG9mIHRoaW5ncywgc2hvdWxk IHdlIGFkZCBvbmUgCmZvciBwcGd0dC0+YmFzZS5kZXYgPyBMb29rcyBsaWtlIHdlIGNvdWxkIHVz ZSBpdCBpbiB+MjAgcGxhY2VzLgoKUmV2aWV3ZWQtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwu dGhpZXJyeUBpbnRlbC5jb20+Cgo+IC0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMgfCAzNyArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCj4gICBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCB8ICA4ICsrKysrKy0tCj4gICAyIGZp bGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKPiBpbmRleCAwNzIyOTVmLi40ZjlhMDAwIDEwMDY0NAo+ IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCj4gKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKPiBAQCAtMzQ2LDggKzM0NiwxMyBAQCBzdGF0 aWMgdm9pZCBrdW5tYXBfcGFnZV9kbWEoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqdmFk ZHIpCj4gICAgICAgICAga3VubWFwX2F0b21pYyh2YWRkcik7Cj4gICB9Cj4KPiAtI2RlZmluZSBr bWFwX3B4KHB4KSBrbWFwX3BhZ2VfZG1hKCYocHgpLT5iYXNlKQo+IC0jZGVmaW5lIGt1bm1hcF9w eChwcGd0dCwgdmFkZHIpIGt1bm1hcF9wYWdlX2RtYSgocHBndHQpLT5iYXNlLmRldiwgKHZhZGRy KSk7Cj4gKyNkZWZpbmUga21hcF9weChweCkga21hcF9wYWdlX2RtYShweF9iYXNlKHB4KSkKPiAr I2RlZmluZSBrdW5tYXBfcHgocHBndHQsIHZhZGRyKSBrdW5tYXBfcGFnZV9kbWEoKHBwZ3R0KS0+ YmFzZS5kZXYsICh2YWRkcikpCj4gKwo+ICsjZGVmaW5lIHNldHVwX3B4KGRldiwgcHgpIHNldHVw X3BhZ2VfZG1hKChkZXYpLCBweF9iYXNlKHB4KSkKPiArI2RlZmluZSBjbGVhbnVwX3B4KGRldiwg cHgpIGNsZWFudXBfcGFnZV9kbWEoKGRldiksIHB4X2Jhc2UocHgpKQo+ICsjZGVmaW5lIGZpbGxf cHgoZGV2LCBweCwgdikgZmlsbF9wYWdlX2RtYSgoZGV2KSwgcHhfYmFzZShweCksICh2KSkKPiAr I2RlZmluZSBmaWxsMzJfcHgoZGV2LCBweCwgdikgZmlsbF9wYWdlX2RtYV8zMigoZGV2KSwgcHhf YmFzZShweCksICh2KSkKPgo+ICAgc3RhdGljIHZvaWQgZmlsbF9wYWdlX2RtYShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBzdHJ1Y3QgaTkxNV9wYWdlX2RtYSAqcCwKPiAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCB1aW50NjRfdCB2YWwpCj4gQEAgLTM3Myw3ICszNzgsNyBAQCBzdGF0 aWMgdm9pZCBmaWxsX3BhZ2VfZG1hXzMyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBp OTE1X3BhZ2VfZG1hICpwLAo+Cj4gICBzdGF0aWMgdm9pZCBmcmVlX3B0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKnB0KQo+ICAgewo+IC0gICAgICAgY2xl YW51cF9wYWdlX2RtYShkZXYsICZwdC0+YmFzZSk7Cj4gKyAgICAgICBjbGVhbnVwX3B4KGRldiwg cHQpOwo+ICAgICAgICAgIGtmcmVlKHB0LT51c2VkX3B0ZXMpOwo+ICAgICAgICAgIGtmcmVlKHB0 KTsKPiAgIH0KPiBAQCAtMzg1LDcgKzM5MCw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfaW5pdGlhbGl6 ZV9wdChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKPgo+ICAgICAgICAgIHNjcmF0Y2hf cHRlID0gZ2VuOF9wdGVfZW5jb2RlKHZtLT5zY3JhdGNoLmFkZHIsIEk5MTVfQ0FDSEVfTExDLCB0 cnVlKTsKPgo+IC0gICAgICAgZmlsbF9wYWdlX2RtYSh2bS0+ZGV2LCAmcHQtPmJhc2UsIHNjcmF0 Y2hfcHRlKTsKPiArICAgICAgIGZpbGxfcHgodm0tPmRldiwgcHQsIHNjcmF0Y2hfcHRlKTsKPiAg IH0KPgo+ICAgc3RhdGljIHN0cnVjdCBpOTE1X3BhZ2VfdGFibGUgKmFsbG9jX3B0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCj4gQEAgLTQwNSw3ICs0MTAsNyBAQCBzdGF0aWMgc3RydWN0IGk5MTVf cGFnZV90YWJsZSAqYWxsb2NfcHQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgICAgICAgICBp ZiAoIXB0LT51c2VkX3B0ZXMpCj4gICAgICAgICAgICAgICAgICBnb3RvIGZhaWxfYml0bWFwOwo+ Cj4gLSAgICAgICByZXQgPSBzZXR1cF9wYWdlX2RtYShkZXYsICZwdC0+YmFzZSk7Cj4gKyAgICAg ICByZXQgPSBzZXR1cF9weChkZXYsIHB0KTsKPiAgICAgICAgICBpZiAocmV0KQo+ICAgICAgICAg ICAgICAgICAgZ290byBmYWlsX3BhZ2VfbTsKPgo+IEBAIC00MjEsOCArNDI2LDggQEAgZmFpbF9i aXRtYXA6Cj4KPiAgIHN0YXRpYyB2b2lkIGZyZWVfcGQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwg c3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnkgKnBkKQo+ICAgewo+IC0gICAgICAgaWYgKHBkLT5i YXNlLnBhZ2UpIHsKPiAtICAgICAgICAgICAgICAgY2xlYW51cF9wYWdlX2RtYShkZXYsICZwZC0+ YmFzZSk7Cj4gKyAgICAgICBpZiAocHhfcGFnZShwZCkpIHsKPiArICAgICAgICAgICAgICAgY2xl YW51cF9weChkZXYsIHBkKTsKPiAgICAgICAgICAgICAgICAgIGtmcmVlKHBkLT51c2VkX3BkZXMp Owo+ICAgICAgICAgICAgICAgICAga2ZyZWUocGQpOwo+ICAgICAgICAgIH0KPiBAQCAtNDQyLDcg KzQ0Nyw3IEBAIHN0YXRpYyBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqYWxsb2NfcGQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKPiAgICAgICAgICBpZiAoIXBkLT51c2VkX3BkZXMpCj4gICAg ICAgICAgICAgICAgICBnb3RvIGZyZWVfcGQ7Cj4KPiAtICAgICAgIHJldCA9IHNldHVwX3BhZ2Vf ZG1hKGRldiwgJnBkLT5iYXNlKTsKPiArICAgICAgIHJldCA9IHNldHVwX3B4KGRldiwgcGQpOwo+ ICAgICAgICAgIGlmIChyZXQpCj4gICAgICAgICAgICAgICAgICBnb3RvIGZyZWVfYml0bWFwOwo+ Cj4gQEAgLTUyNyw3ICs1MzIsNyBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFyX3Jhbmdl KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAo+Cj4gICAgICAgICAgICAgICAgICBwdCA9 IHBkLT5wYWdlX3RhYmxlW3BkZV07Cj4KPiAtICAgICAgICAgICAgICAgaWYgKFdBUk5fT04oIXB0 LT5iYXNlLnBhZ2UpKQo+ICsgICAgICAgICAgICAgICBpZiAoV0FSTl9PTighcHhfcGFnZShwdCkp KQo+ICAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKPgo+ICAgICAgICAgICAgICAg ICAgbGFzdF9wdGUgPSBwdGUgKyBudW1fZW50cmllczsKPiBAQCAtNTk5LDcgKzYwNCw3IEBAIHN0 YXRpYyB2b2lkIF9fZ2VuOF9kb19tYXBfcHQoZ2VuOF9wZGVfdCAqIGNvbnN0IHBkZSwKPiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAgewo+ ICAgICAgICAgIGdlbjhfcGRlX3QgZW50cnkgPQo+IC0gICAgICAgICAgICAgICBnZW44X3BkZV9l bmNvZGUoZGV2LCBwdC0+YmFzZS5kYWRkciwgSTkxNV9DQUNIRV9MTEMpOwo+ICsgICAgICAgICAg ICAgICBnZW44X3BkZV9lbmNvZGUoZGV2LCBweF9kbWEocHQpLCBJOTE1X0NBQ0hFX0xMQyk7Cj4g ICAgICAgICAgKnBkZSA9IGVudHJ5Owo+ICAgfQo+Cj4gQEAgLTYxMCwxNyArNjE1LDE3IEBAIHN0 YXRpYyB2b2lkIGdlbjhfaW5pdGlhbGl6ZV9wZChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSwKPiAgICAgICAgICAgICAgICAgIGNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBn dHQsIGJhc2UpOwo+ICAgICAgICAgIGdlbjhfcGRlX3Qgc2NyYXRjaF9wZGU7Cj4KPiAtICAgICAg IHNjcmF0Y2hfcGRlID0gZ2VuOF9wZGVfZW5jb2RlKHZtLT5kZXYsIHBwZ3R0LT5zY3JhdGNoX3B0 LT5iYXNlLmRhZGRyLAo+ICsgICAgICAgc2NyYXRjaF9wZGUgPSBnZW44X3BkZV9lbmNvZGUodm0t PmRldiwgcHhfZG1hKHBwZ3R0LT5zY3JhdGNoX3B0KSwKPiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBJOTE1X0NBQ0hFX0xMQyk7Cj4KPiAtICAgICAgIGZpbGxfcGFnZV9k bWEodm0tPmRldiwgJnBkLT5iYXNlLCBzY3JhdGNoX3BkZSk7Cj4gKyAgICAgICBmaWxsX3B4KHZt LT5kZXYsIHBkLCBzY3JhdGNoX3BkZSk7Cj4gICB9Cj4KPiAgIHN0YXRpYyB2b2lkIGdlbjhfZnJl ZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQsIHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCj4gICB7Cj4gICAgICAgICAgaW50IGk7Cj4KPiAtICAgICAgIGlmICghcGQt PmJhc2UucGFnZSkKPiArICAgICAgIGlmICghcHhfcGFnZShwZCkpCj4gICAgICAgICAgICAgICAg ICByZXR1cm47Cj4KPiAgICAgICAgICBmb3JfZWFjaF9zZXRfYml0KGksIHBkLT51c2VkX3BkZXMs IEk5MTVfUERFUykgewo+IEBAIC0xMDIxLDcgKzEwMjYsNyBAQCBzdGF0aWMgdm9pZCBnZW42X2R1 bXBfcHBndHQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0p Cj4gICAgICAgICAgZ2VuNl9mb3JfZWFjaF9wZGUodW51c2VkLCAmcHBndHQtPnBkLCBzdGFydCwg bGVuZ3RoLCB0ZW1wLCBwZGUpIHsKPiAgICAgICAgICAgICAgICAgIHUzMiBleHBlY3RlZDsKPiAg ICAgICAgICAgICAgICAgIGdlbjZfcHRlX3QgKnB0X3ZhZGRyOwo+IC0gICAgICAgICAgICAgICBk bWFfYWRkcl90IHB0X2FkZHIgPSBwcGd0dC0+cGQucGFnZV90YWJsZVtwZGVdLT5iYXNlLmRhZGRy Owo+ICsgICAgICAgICAgICAgICBjb25zdCBkbWFfYWRkcl90IHB0X2FkZHIgPSBweF9kbWEocHBn dHQtPnBkLnBhZ2VfdGFibGVbcGRlXSk7Cj4gICAgICAgICAgICAgICAgICBwZF9lbnRyeSA9IHJl YWRsKHBwZ3R0LT5wZF9hZGRyICsgcGRlKTsKPiAgICAgICAgICAgICAgICAgIGV4cGVjdGVkID0g KEdFTjZfUERFX0FERFJfRU5DT0RFKHB0X2FkZHIpIHwgR0VONl9QREVfVkFMSUQpOwo+Cj4gQEAg LTEwNjgsNyArMTA3Myw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfd3JpdGVfcGRlKHN0cnVjdCBpOTE1 X3BhZ2VfZGlyZWN0b3J5ICpwZCwKPiAgICAgICAgICAgICAgICAgIGNvbnRhaW5lcl9vZihwZCwg c3RydWN0IGk5MTVfaHdfcHBndHQsIHBkKTsKPiAgICAgICAgICB1MzIgcGRfZW50cnk7Cj4KPiAt ICAgICAgIHBkX2VudHJ5ID0gR0VONl9QREVfQUREUl9FTkNPREUocHQtPmJhc2UuZGFkZHIpOwo+ ICsgICAgICAgcGRfZW50cnkgPSBHRU42X1BERV9BRERSX0VOQ09ERShweF9kbWEocHQpKTsKPiAg ICAgICAgICBwZF9lbnRyeSB8PSBHRU42X1BERV9WQUxJRDsKPgo+ICAgICAgICAgIHdyaXRlbChw ZF9lbnRyeSwgcHBndHQtPnBkX2FkZHIgKyBwZGUpOwo+IEBAIC0xMzEzLDcgKzEzMTgsNyBAQCBz dGF0aWMgdm9pZCBnZW42X2luaXRpYWxpemVfcHQoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAq dm0sCj4KPiAgICAgICAgICBzY3JhdGNoX3B0ZSA9IHZtLT5wdGVfZW5jb2RlKHZtLT5zY3JhdGNo LmFkZHIsIEk5MTVfQ0FDSEVfTExDLCB0cnVlLCAwKTsKPgo+IC0gICAgICAgZmlsbF9wYWdlX2Rt YV8zMih2bS0+ZGV2LCAmcHQtPmJhc2UsIHNjcmF0Y2hfcHRlKTsKPiArICAgICAgIGZpbGwzMl9w eCh2bS0+ZGV2LCBwdCwgc2NyYXRjaF9wdGUpOwo+ICAgfQo+Cj4gICBzdGF0aWMgaW50IGdlbjZf YWxsb2NfdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCj4gZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZ3R0LmgKPiBpbmRleCA2NjZkZWNjLi4wMDZiODM5IDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCj4gKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKPiBAQCAtMjEzLDYgKzIxMywxMCBAQCBzdHJ1Y3Qg aTkxNV9wYWdlX2RtYSB7Cj4gICAgICAgICAgfTsKPiAgIH07Cj4KPiArI2RlZmluZSBweF9iYXNl KHB4KSAoJihweCktPmJhc2UpCj4gKyNkZWZpbmUgcHhfcGFnZShweCkgKHB4X2Jhc2UocHgpLT5w YWdlKQo+ICsjZGVmaW5lIHB4X2RtYShweCkgKHB4X2Jhc2UocHgpLT5kYWRkcikKPiArCj4gICBz dHJ1Y3QgaTkxNV9wYWdlX3RhYmxlIHsKPiAgICAgICAgICBzdHJ1Y3QgaTkxNV9wYWdlX2RtYSBi YXNlOwo+Cj4gQEAgLTQ3NSw4ICs0NzksOCBAQCBzdGF0aWMgaW5saW5lIGRtYV9hZGRyX3QKPiAg IGk5MTVfcGFnZV9kaXJfZG1hX2FkZHIoY29uc3Qgc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0 LCBjb25zdCB1bnNpZ25lZCBuKQo+ICAgewo+ICAgICAgICAgIHJldHVybiB0ZXN0X2JpdChuLCBw cGd0dC0+cGRwLnVzZWRfcGRwZXMpID8KPiAtICAgICAgICAgICAgICAgcHBndHQtPnBkcC5wYWdl X2RpcmVjdG9yeVtuXS0+YmFzZS5kYWRkciA6Cj4gLSAgICAgICAgICAgICAgIHBwZ3R0LT5zY3Jh dGNoX3BkLT5iYXNlLmRhZGRyOwo+ICsgICAgICAgICAgICAgICBweF9kbWEocHBndHQtPnBkcC5w YWdlX2RpcmVjdG9yeVtuXSkgOgo+ICsgICAgICAgICAgICAgICBweF9kbWEocHBndHQtPnNjcmF0 Y2hfcGQpOwo+ICAgfQo+Cj4gICBpbnQgaTkxNV9nZW1fZ3R0X2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7Cj4gLS0KPiAxLjkuMQo+Cj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngKPgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=