From: Michel Thierry Subject: [PATCH 08/16] drm/i915: Plumb sg_iter through va allocation ->maps Date: Tue, 26 May 2015 15:21:15 +0100 Message-ID: <1432650084-24491-9-git-send-email-michel.thierry@intel.com> References: <1432650084-24491-1-git-send-email-michel.thierry@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 ESMTP id B611472073 for ; Tue, 26 May 2015 07:21:28 -0700 (PDT) In-Reply-To: <1432650084-24491-1-git-send-email-michel.thierry@intel.com> 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 Cc: akash.goel@intel.com List-Id: intel-gfx@lists.freedesktop.org QXMgYSBzdGVwIHRvd2FyZHMgaW1wbGVtZW50aW5nIDQgbGV2ZWxzLCB3aGlsZSBub3QgZGlzY2Fy ZGluZyB0aGUKZXhpc3RpbmcgcHRlIG1hcCBmdW5jdGlvbnMsIHdlIG5lZWQgdG8gcGFzcyB0aGUg c2dfaXRlciB0aHJvdWdoLiBUaGUKY3VycmVudCBmdW5jdGlvbiB1bmRlcnN0YW5kcyB0byB0aGUg cGFnZSBkaXJlY3RvcnkgZ3JhbnVsYXJpdHkuIEFuCm9iamVjdCdzIHBhZ2VzIG1heSBzcGFuIHRo ZSBwYWdlIGRpcmVjdG9yeSwgYW5kIHNvIHVzaW5nIHRoZSBpdGVyCmRpcmVjdGx5IGFzIHdlIHdy aXRlIHRoZSBQVEVzIGFsbG93cyB0aGUgaXRlcmF0b3IgdG8gc3RheSBjb2hlcmVudAp0aHJvdWdo IGEgVk1BIG1hcHBpbmcgb3BlcmF0aW9uIHNwYW5uaW5nIG11bHRpcGxlIHBhZ2UgdGFibGUgbGV2 ZWxzLgoKdjI6IFJlYmFzZSBhZnRlciBzL3BhZ2VfdGFibGVzL3BhZ2VfdGFibGUvLgoKU2lnbmVk LW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5AYndpZGF3c2submV0PgpTaWduZWQtb2ZmLWJ5OiBN aWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgNDYgKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggZTcxZGJmYy4uMmI2ZWU4 ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTY2MSw3ICs2NjEsNyBAQCBz dGF0aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLAogCiBzdGF0aWMgdm9pZAogZ2VuOF9wcGd0dF9pbnNlcnRfcHRlX2VudHJpZXMoc3Ry dWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwLAotCQkJICAgICAgc3RydWN0IHNn X3RhYmxlICpwYWdlcywKKwkJCSAgICAgIHN0cnVjdCBzZ19wYWdlX2l0ZXIgKnNnX2l0ZXIsCiAJ CQkgICAgICB1aW50NjRfdCBzdGFydCwKIAkJCSAgICAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBj YWNoZV9sZXZlbCwKIAkJCSAgICAgIGNvbnN0IGJvb2wgZmx1c2gpCkBAIC02NzAsMTEgKzY3MCwx MCBAQCBnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50cmllcyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVj dG9yeV9wb2ludGVyICpwZHAsCiAJdW5zaWduZWQgcGRwZSA9IHN0YXJ0ID4+IEdFTjhfUERQRV9T SElGVCAmIEdFTjhfUERQRV9NQVNLOwogCXVuc2lnbmVkIHBkZSA9IHN0YXJ0ID4+IEdFTjhfUERF X1NISUZUICYgR0VOOF9QREVfTUFTSzsKIAl1bnNpZ25lZCBwdGUgPSBzdGFydCA+PiBHRU44X1BU RV9TSElGVCAmIEdFTjhfUFRFX01BU0s7Ci0Jc3RydWN0IHNnX3BhZ2VfaXRlciBzZ19pdGVyOwog CiAJcHRfdmFkZHIgPSBOVUxMOwogCi0JZm9yX2VhY2hfc2dfcGFnZShwYWdlcy0+c2dsLCAmc2df aXRlciwgcGFnZXMtPm5lbnRzLCAwKSB7CisJd2hpbGUgKF9fc2dfcGFnZV9pdGVyX25leHQoc2df aXRlcikpIHsKIAkJaWYgKHB0X3ZhZGRyID09IE5VTEwpIHsKIAkJCXN0cnVjdCBpOTE1X3BhZ2Vf ZGlyZWN0b3J5ICpwZCA9IHBkcC0+cGFnZV9kaXJlY3RvcnlbcGRwZV07CiAJCQlzdHJ1Y3QgaTkx NV9wYWdlX3RhYmxlICpwdCA9IHBkLT5wYWdlX3RhYmxlW3BkZV07CkBAIC02ODQsNyArNjgzLDcg QEAgZ2VuOF9wcGd0dF9pbnNlcnRfcHRlX2VudHJpZXMoc3RydWN0IGk5MTVfcGFnZV9kaXJlY3Rv cnlfcG9pbnRlciAqcGRwLAogCQl9CiAKIAkJcHRfdmFkZHJbcHRlXSA9Ci0JCQlnZW44X3B0ZV9l bmNvZGUoc2dfcGFnZV9pdGVyX2RtYV9hZGRyZXNzKCZzZ19pdGVyKSwKKwkJCWdlbjhfcHRlX2Vu Y29kZShzZ19wYWdlX2l0ZXJfZG1hX2FkZHJlc3Moc2dfaXRlciksCiAJCQkJCWNhY2hlX2xldmVs LCB0cnVlKTsKIAkJaWYgKCsrcHRlID09IEdFTjhfUFRFUykgewogCQkJaWYgKGZsdXNoKQpAQCAt NzEzLDggKzcxMiwxMCBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogewogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpw cGd0dCA9IGNvbnRhaW5lcl9vZih2bSwgc3RydWN0IGk5MTVfaHdfcHBndHQsIGJhc2UpOwogCXN0 cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCA9ICZwcGd0dC0+cGRwOyAvKiBG SVhNRTogNDhiICovCisJc3RydWN0IHNnX3BhZ2VfaXRlciBzZ19pdGVyOwogCi0JZ2VuOF9wcGd0 dF9pbnNlcnRfcHRlX2VudHJpZXMocGRwLCBwYWdlcywgc3RhcnQsIGNhY2hlX2xldmVsLCAhSEFT X0xMQyh2bS0+ZGV2KSk7CisJX19zZ19wYWdlX2l0ZXJfc3RhcnQoJnNnX2l0ZXIsIHBhZ2VzLT5z Z2wsIHNnX25lbnRzKHBhZ2VzLT5zZ2wpLCAwKTsKKwlnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50 cmllcyhwZHAsICZzZ19pdGVyLCBzdGFydCwgY2FjaGVfbGV2ZWwsICFIQVNfTExDKHZtLT5kZXYp KTsKIH0KIAogc3RhdGljIHZvaWQgX19nZW44X2RvX21hcF9wdChnZW44X3BkZV90ICogY29uc3Qg cGRlLApAQCAtMTA2NywxMCArMTA2OCwxMiBAQCBlcnJfb3V0OgogCXJldHVybiAtRU5PTUVNOwog fQogCi1zdGF0aWMgaW50IGdlbjhfYWxsb2NfdmFfcmFuZ2VfM2x2bChzdHJ1Y3QgaTkxNV9hZGRy ZXNzX3NwYWNlICp2bSwKLQkJCQkgICAgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRl ciAqcGRwLAotCQkJCSAgICB1aW50NjRfdCBzdGFydCwKLQkJCQkgICAgdWludDY0X3QgbGVuZ3Ro KQorc3RhdGljIGludCBfX2dlbjhfYWxsb2Nfdm1hX3JhbmdlXzNsdmwoc3RydWN0IGk5MTVfYWRk cmVzc19zcGFjZSAqdm0sCisJCQkJICAgICAgIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3Bv aW50ZXIgKnBkcCwKKwkJCQkgICAgICAgc3RydWN0IHNnX3BhZ2VfaXRlciAqc2dfaXRlciwKKwkJ CQkgICAgICAgdWludDY0X3Qgc3RhcnQsCisJCQkJICAgICAgIHVpbnQ2NF90IGxlbmd0aCwKKwkJ CQkgICAgICAgdTMyIGZsYWdzKQogewogCXVuc2lnbmVkIGxvbmcgKm5ld19wYWdlX2RpcnMsICoq bmV3X3BhZ2VfdGFibGVzOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSB2bS0+ZGV2OwpAQCAt MTEyOSw3ICsxMTMyLDExIEBAIHN0YXRpYyBpbnQgZ2VuOF9hbGxvY192YV9yYW5nZV8zbHZsKHN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCSAgIGdlbjhfcHRlX2luZGV4KHBkX3N0 YXJ0KSwKIAkJCQkgICBnZW44X3B0ZV9jb3VudChwZF9zdGFydCwgcGRfbGVuKSk7CiAKLQkJCS8q IE91ciBwZGUgaXMgbm93IHBvaW50aW5nIHRvIHRoZSBwYWdldGFibGUsIHB0ICovCisJCQlpZiAo c2dfaXRlcikgeworCQkJCVdBUk5fT04oIXNnX2l0ZXItPl9fbmVudHMpOworCQkJCWdlbjhfcHBn dHRfaW5zZXJ0X3B0ZV9lbnRyaWVzKHBkcCwgc2dfaXRlciwgcGRfc3RhcnQsCisJCQkJCQkJICAg ICAgZmxhZ3MsICFIQVNfTExDKHZtLT5kZXYpKTsKKwkJCX0KIAkJCXNldF9iaXQocGRlLCBwZC0+ dXNlZF9wZGVzKTsKIAkJfQogCkBAIC0xMTU0LDEwICsxMTYxLDEyIEBAIGVycl9vdXQ6CiAJcmV0 dXJuIHJldDsKIH0KIAotc3RhdGljIGludCBnZW44X2FsbG9jX3ZhX3JhbmdlXzRsdmwoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCi0JCQkJICAgIHN0cnVjdCBpOTE1X3BtbDQgKnBtbDQs Ci0JCQkJICAgIHVpbnQ2NF90IHN0YXJ0LAotCQkJCSAgICB1aW50NjRfdCBsZW5ndGgpCitzdGF0 aWMgaW50IF9fZ2VuOF9hbGxvY192bWFfcmFuZ2VfNGx2bChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSwKKwkJCQkgICAgICAgc3RydWN0IGk5MTVfcG1sNCAqcG1sNCwKKwkJCQkgICAgICAg c3RydWN0IHNnX3BhZ2VfaXRlciAqc2dfaXRlciwKKwkJCQkgICAgICAgdWludDY0X3Qgc3RhcnQs CisJCQkJICAgICAgIHVpbnQ2NF90IGxlbmd0aCwKKwkJCQkgICAgICAgdTMyIGZsYWdzKQogewog CURFQ0xBUkVfQklUTUFQKG5ld19wZHBzLCBHRU44X1BNTDRFU19QRVJfUE1MNCk7CiAJc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KQEAgLTEyMDAsNyArMTIwOSw4IEBAIHN0YXRpYyBpbnQg Z2VuOF9hbGxvY192YV9yYW5nZV80bHZsKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAog CWdlbjhfZm9yX2VhY2hfcG1sNGUocGRwLCBwbWw0LCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwbWw0 ZSkgewogCQlXQVJOX09OKCFwZHApOwogCi0JCXJldCA9IGdlbjhfYWxsb2NfdmFfcmFuZ2VfM2x2 bCh2bSwgcGRwLCBzdGFydCwgbGVuZ3RoKTsKKwkJcmV0ID0gX19nZW44X2FsbG9jX3ZtYV9yYW5n ZV8zbHZsKHZtLCBwZHAsIHNnX2l0ZXIsCisJCQkJCQkgIHN0YXJ0LCBsZW5ndGgsIGZsYWdzKTsK IAkJaWYgKHJldCkKIAkJCWdvdG8gZXJyX291dDsKIApAQCAtMTIyNiw5ICsxMjM2LDExIEBAIHN0 YXRpYyBpbnQgZ2VuOF9hbGxvY192YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2 bSwKIAkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9od19wcGd0dCwgYmFzZSk7CiAKIAlp ZiAoVVNFU19GVUxMXzQ4QklUX1BQR1RUKHZtLT5kZXYpKQotCQlyZXR1cm4gZ2VuOF9hbGxvY192 YV9yYW5nZV80bHZsKHZtLCAmcHBndHQtPnBtbDQsIHN0YXJ0LCBsZW5ndGgpOworCQlyZXR1cm4g X19nZW44X2FsbG9jX3ZtYV9yYW5nZV80bHZsKHZtLCAmcHBndHQtPnBtbDQsIE5VTEwsCisJCQkJ CQkgICBzdGFydCwgbGVuZ3RoLCAwKTsKIAllbHNlCi0JCXJldHVybiBnZW44X2FsbG9jX3ZhX3Jh bmdlXzNsdmwodm0sICZwcGd0dC0+cGRwLCBzdGFydCwgbGVuZ3RoKTsKKwkJcmV0dXJuIF9fZ2Vu OF9hbGxvY192bWFfcmFuZ2VfM2x2bCh2bSwgJnBwZ3R0LT5wZHAsIE5VTEwsCisJCQkJCQkgICBz dGFydCwgbGVuZ3RoLCAwKTsKIH0KIAogLyoKLS0gCjIuNC4wCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=