From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Add ppgtt->kunmap_page_dma vfunc Date: Tue, 17 May 2016 14:34:49 +0100 Message-ID: <1463492089-23881-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id EA60A6E257 for ; Tue, 17 May 2016 13:35:02 +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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJhdGhlciB0 aGFuIGFza2luZyBpdHNlbGYgImFtIEkgYSBCcm9hZHdlbGwsIGFtIEkgYSBDaGVycnl2aWV3LApv ciBhbSBJIG5laXRoZXIgb2YgdGhlIHR3byIgb24gb24gbG93IGxldmVsIHBhZ2UgdGFibGUgb3Bl cmF0aW9ucywKbGlrZSBpbnNlcnRpbmcgYW5kIGNsZWFyaW5nIFBURXM7IGFkZCBhIG5ldyB2ZnVu YyBrdW5tYXBfcGFnZV9kbWEKYW5kIHNldCBpdCB0byBhcHByb3ByaWF0ZSBmbGF2b3VyIGF0IHBw Z3R0IGluaXQgdGltZS4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJz dWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMg fCA1MSArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuaCB8ICAxICsKIDIgZmlsZXMgY2hhbmdlZCwgMzMgaW5zZXJ0 aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpp bmRleCA3ZWFiNjE5YTNlYjIuLmRjN2UxMjhkNzQ4MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMKQEAgLTM2MSwyOSArMzYxLDMwIEBAIHN0YXRpYyB2b2lkICprbWFwX3BhZ2VfZG1h KHN0cnVjdCBpOTE1X3BhZ2VfZG1hICpwKQogCXJldHVybiBrbWFwX2F0b21pYyhwLT5wYWdlKTsK IH0KIAorc3RhdGljIHZvaWQga3VubWFwX3BhZ2VfZG1hKHZvaWQgKnZhZGRyKQoreworCWt1bm1h cF9hdG9taWModmFkZHIpOworfQorCiAvKiBXZSB1c2UgdGhlIGZsdXNoaW5nIHVubWFwIG9ubHkg d2l0aCBwcGd0dCBzdHJ1Y3R1cmVzOgogICogcGFnZSBkaXJlY3RvcmllcywgcGFnZSB0YWJsZXMg YW5kIHNjcmF0Y2ggcGFnZXMuCiAgKi8KLXN0YXRpYyB2b2lkIGt1bm1hcF9wYWdlX2RtYShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICp2YWRkcikKK3N0YXRpYyB2b2lkIGt1bm1hcF9wYWdl X2RtYV9mbHVzaCh2b2lkICp2YWRkcikKIHsKLQkvKiBUaGVyZSBhcmUgb25seSBmZXcgZXhjZXB0 aW9ucyBmb3IgZ2VuID49Ni4gY2h2IGFuZCBieHQuCi0JICogQW5kIHdlIGFyZSBub3Qgc3VyZSBh Ym91dCB0aGUgbGF0dGVyIHNvIHBsYXkgc2FmZSBmb3Igbm93LgotCSAqLwotCWlmIChJU19DSEVS UllWSUVXKGRldikgfHwgSVNfQlJPWFRPTihkZXYpKQotCQlkcm1fY2xmbHVzaF92aXJ0X3Jhbmdl KHZhZGRyLCBQQUdFX1NJWkUpOworCWRybV9jbGZsdXNoX3ZpcnRfcmFuZ2UodmFkZHIsIFBBR0Vf U0laRSk7CiAKIAlrdW5tYXBfYXRvbWljKHZhZGRyKTsKIH0KIAogI2RlZmluZSBrbWFwX3B4KHB4 KSBrbWFwX3BhZ2VfZG1hKHB4X2Jhc2UocHgpKQotI2RlZmluZSBrdW5tYXBfcHgocHBndHQsIHZh ZGRyKSBrdW5tYXBfcGFnZV9kbWEoKHBwZ3R0KS0+YmFzZS5kZXYsICh2YWRkcikpCisjZGVmaW5l IGt1bm1hcF9weChwcGd0dCwgdmFkZHIpIChwcGd0dCktPmt1bm1hcF9wYWdlX2RtYSgodmFkZHIp KQogCiAjZGVmaW5lIHNldHVwX3B4KGRldiwgcHgpIHNldHVwX3BhZ2VfZG1hKChkZXYpLCBweF9i YXNlKHB4KSkKICNkZWZpbmUgY2xlYW51cF9weChkZXYsIHB4KSBjbGVhbnVwX3BhZ2VfZG1hKChk ZXYpLCBweF9iYXNlKHB4KSkKLSNkZWZpbmUgZmlsbF9weChkZXYsIHB4LCB2KSBmaWxsX3BhZ2Vf ZG1hKChkZXYpLCBweF9iYXNlKHB4KSwgKHYpKQotI2RlZmluZSBmaWxsMzJfcHgoZGV2LCBweCwg dikgZmlsbF9wYWdlX2RtYV8zMigoZGV2KSwgcHhfYmFzZShweCksICh2KSkKKyNkZWZpbmUgZmls bF9weChwcGd0dCwgcHgsIHYpIGZpbGxfcGFnZV9kbWEoKHBwZ3R0KSwgcHhfYmFzZShweCksICh2 KSkKKyNkZWZpbmUgZmlsbDMyX3B4KHBwZ3R0LCBweCwgdikgZmlsbF9wYWdlX2RtYV8zMigocHBn dHQpLCBweF9iYXNlKHB4KSwgKHYpKQogCi1zdGF0aWMgdm9pZCBmaWxsX3BhZ2VfZG1hKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2VfZG1hICpwLAorc3RhdGljIHZvaWQg ZmlsbF9wYWdlX2RtYShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHN0cnVjdCBpOTE1X3Bh Z2VfZG1hICpwLAogCQkJICBjb25zdCB1aW50NjRfdCB2YWwpCiB7CiAJaW50IGk7CkBAIC0zOTIs MTcgKzM5MywxNyBAQCBzdGF0aWMgdm9pZCBmaWxsX3BhZ2VfZG1hKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHN0cnVjdCBpOTE1X3BhZ2VfZG1hICpwLAogCWZvciAoaSA9IDA7IGkgPCA1MTI7IGkr KykKIAkJdmFkZHJbaV0gPSB2YWw7CiAKLQlrdW5tYXBfcGFnZV9kbWEoZGV2LCB2YWRkcik7CisJ cHBndHQtPmt1bm1hcF9wYWdlX2RtYSh2YWRkcik7CiB9CiAKLXN0YXRpYyB2b2lkIGZpbGxfcGFn ZV9kbWFfMzIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGk5MTVfcGFnZV9kbWEgKnAs Ci0JCQkgICAgIGNvbnN0IHVpbnQzMl90IHZhbDMyKQorc3RhdGljIHZvaWQgZmlsbF9wYWdlX2Rt YV8zMihzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCisJCQkgICAgIHN0cnVjdCBpOTE1X3Bh Z2VfZG1hICpwLCBjb25zdCB1aW50MzJfdCB2YWwzMikKIHsKIAl1aW50NjRfdCB2ID0gdmFsMzI7 CiAKIAl2ID0gdiA8PCAzMiB8IHZhbDMyOwogCi0JZmlsbF9wYWdlX2RtYShkZXYsIHAsIHYpOwor CWZpbGxfcGFnZV9kbWEocHBndHQsIHAsIHYpOwogfQogCiBzdGF0aWMgc3RydWN0IGk5MTVfcGFn ZV9zY3JhdGNoICphbGxvY19zY3JhdGNoX3BhZ2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAg LTQ4MCw3ICs0ODEsNyBAQCBzdGF0aWMgdm9pZCBnZW44X2luaXRpYWxpemVfcHQoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJc2NyYXRjaF9wdGUgPSBnZW44X3B0ZV9lbmNvZGUocHhf ZG1hKHZtLT5zY3JhdGNoX3BhZ2UpLAogCQkJCSAgICAgIEk5MTVfQ0FDSEVfTExDLCB0cnVlKTsK IAotCWZpbGxfcHgodm0tPmRldiwgcHQsIHNjcmF0Y2hfcHRlKTsKKwlmaWxsX3B4KGk5MTVfdm1f dG9fcHBndHQodm0pLCBwdCwgc2NyYXRjaF9wdGUpOwogfQogCiBzdGF0aWMgdm9pZCBnZW42X2lu aXRpYWxpemVfcHQoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCkBAIC00OTMsNyArNDk0 LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9pbml0aWFsaXplX3B0KHN0cnVjdCBpOTE1X2FkZHJlc3Nf c3BhY2UgKnZtLAogCXNjcmF0Y2hfcHRlID0gdm0tPnB0ZV9lbmNvZGUocHhfZG1hKHZtLT5zY3Jh dGNoX3BhZ2UpLAogCQkJCSAgICAgSTkxNV9DQUNIRV9MTEMsIHRydWUsIDApOwogCi0JZmlsbDMy X3B4KHZtLT5kZXYsIHB0LCBzY3JhdGNoX3B0ZSk7CisJZmlsbDMyX3B4KGk5MTVfdm1fdG9fcHBn dHQodm0pLCBwdCwgc2NyYXRjaF9wdGUpOwogfQogCiBzdGF0aWMgc3RydWN0IGk5MTVfcGFnZV9k aXJlY3RvcnkgKmFsbG9jX3BkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC01NDAsNyArNTQx LDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9pbml0aWFsaXplX3BkKHN0cnVjdCBpOTE1X2FkZHJlc3Nf c3BhY2UgKnZtLAogCiAJc2NyYXRjaF9wZGUgPSBnZW44X3BkZV9lbmNvZGUocHhfZG1hKHZtLT5z Y3JhdGNoX3B0KSwgSTkxNV9DQUNIRV9MTEMpOwogCi0JZmlsbF9weCh2bS0+ZGV2LCBwZCwgc2Ny YXRjaF9wZGUpOworCWZpbGxfcHgoaTkxNV92bV90b19wcGd0dCh2bSksIHBkLCBzY3JhdGNoX3Bk ZSk7CiB9CiAKIHN0YXRpYyBpbnQgX19wZHBfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LApA QCAtNjIxLDcgKzYyMiw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfaW5pdGlhbGl6ZV9wZHAoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAKIAlzY3JhdGNoX3BkcGUgPSBnZW44X3BkcGVfZW5j b2RlKHB4X2RtYSh2bS0+c2NyYXRjaF9wZCksIEk5MTVfQ0FDSEVfTExDKTsKIAotCWZpbGxfcHgo dm0tPmRldiwgcGRwLCBzY3JhdGNoX3BkcGUpOworCWZpbGxfcHgoaTkxNV92bV90b19wcGd0dCh2 bSksIHBkcCwgc2NyYXRjaF9wZHBlKTsKIH0KIAogc3RhdGljIHZvaWQgZ2VuOF9pbml0aWFsaXpl X3BtbDQoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCkBAIC02MzIsNyArNjMzLDcgQEAg c3RhdGljIHZvaWQgZ2VuOF9pbml0aWFsaXplX3BtbDQoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFj ZSAqdm0sCiAJc2NyYXRjaF9wbWw0ZSA9IGdlbjhfcG1sNGVfZW5jb2RlKHB4X2RtYSh2bS0+c2Ny YXRjaF9wZHApLAogCQkJCQkgIEk5MTVfQ0FDSEVfTExDKTsKIAotCWZpbGxfcHgodm0tPmRldiwg cG1sNCwgc2NyYXRjaF9wbWw0ZSk7CisJZmlsbF9weChpOTE1X3ZtX3RvX3BwZ3R0KHZtKSwgcG1s NCwgc2NyYXRjaF9wbWw0ZSk7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC0xNTEyLDggKzE1MTMsMTcg QEAgc3RhdGljIGludCBnZW44X3ByZWFsbG9jYXRlX3RvcF9sZXZlbF9wZHBzKHN0cnVjdCBpOTE1 X2h3X3BwZ3R0ICpwcGd0dCkKICAqLwogc3RhdGljIGludCBnZW44X3BwZ3R0X2luaXQoc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUocHBndHQtPmJhc2UuZGV2KTsKIAlpbnQgcmV0OwogCisJLyogVGhlcmUg YXJlIG9ubHkgZmV3IGV4Y2VwdGlvbnMgZm9yIGdlbiA+PTYuIGNodiBhbmQgYnh0LgorCSAqIEFu ZCB3ZSBhcmUgbm90IHN1cmUgYWJvdXQgdGhlIGxhdHRlciBzbyBwbGF5IHNhZmUgZm9yIG5vdy4K KwkgKi8KKwlpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9w cml2KSkKKwkJcHBndHQtPmt1bm1hcF9wYWdlX2RtYSA9IGt1bm1hcF9wYWdlX2RtYV9mbHVzaDsK KwllbHNlCisJCXBwZ3R0LT5rdW5tYXBfcGFnZV9kbWEgPSBrdW5tYXBfcGFnZV9kbWE7CisKIAly ZXQgPSBnZW44X2luaXRfc2NyYXRjaCgmcHBndHQtPmJhc2UpOwogCWlmIChyZXQpCiAJCXJldHVy biByZXQ7CkBAIC0yMDczLDYgKzIwODMsOSBAQCBzdGF0aWMgaW50IGdlbjZfcHBndHRfaW5pdChz dHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJaW50IHJldDsKIAogCXBwZ3R0LT5iYXNlLnB0 ZV9lbmNvZGUgPSBnZ3R0LT5iYXNlLnB0ZV9lbmNvZGU7CisKKwlwcGd0dC0+a3VubWFwX3BhZ2Vf ZG1hID0ga3VubWFwX3BhZ2VfZG1hOworCiAJaWYgKElTX0dFTjYoZGV2KSkgewogCQlwcGd0dC0+ c3dpdGNoX21tID0gZ2VuNl9tbV9zd2l0Y2g7CiAJfSBlbHNlIGlmIChJU19IQVNXRUxMKGRldikp IHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggNjJiZTc3Y2FjNWNkLi5iMzZi OTk3NDA2YzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC0zNzksNiArMzc5 LDcgQEAgc3RydWN0IGk5MTVfaHdfcHBndHQgewogCiAJZ2VuNl9wdGVfdCBfX2lvbWVtICpwZF9h ZGRyOwogCisJdm9pZCAoKmt1bm1hcF9wYWdlX2RtYSkodm9pZCAqdmFkZHIpOwogCWludCAoKmVu YWJsZSkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KTsKIAlpbnQgKCpzd2l0Y2hfbW0pKHN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAkJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcSk7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==