From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 03/18] drm/i915: pass page_size to insert_entries Date: Tue, 4 Apr 2017 23:11:13 +0100 Message-ID: <20170404221128.3943-4-matthew.auld@intel.com> References: <20170404221128.3943-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id E67B56E6CA for ; Tue, 4 Apr 2017 22:11:33 +0000 (UTC) In-Reply-To: <20170404221128.3943-1-matthew.auld@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 List-Id: intel-gfx@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAgICAgICAgICB8IDMzICsrKysr KysrKysrKysrKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmggICAgICAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV92bWEuYyAgICAg ICAgICAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2Vt X2d0dC5jIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19ndHQu YyAgICAgfCAgMSArCiA1IGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDcgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCA4YmFiNGFlYTYzZTYu LjBjODM1MGY3MDlkYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTIwNSw3 ICsyMDUsNyBAQCBzdGF0aWMgaW50IHBwZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1h LAogCQlwdGVfZmxhZ3MgfD0gUFRFX1JFQURfT05MWTsKIAogCXZtYS0+dm0tPmluc2VydF9lbnRy aWVzKHZtYS0+dm0sIHZtYS0+cGFnZXMsIHZtYS0+bm9kZS5zdGFydCwKLQkJCQljYWNoZV9sZXZl bCwgcHRlX2ZsYWdzKTsKKwkJCQl2bWEtPm9iai0+Z3R0X3BhZ2Vfc2l6ZSwgY2FjaGVfbGV2ZWws IHB0ZV9mbGFncyk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTkwNiw2ICs5MDYsNyBAQCBnZW44X3Bw Z3R0X2luc2VydF9wdGVfZW50cmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCiBzdGF0 aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF8zbHZsKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtLAogCQkJCSAgIHN0cnVjdCBzZ190YWJsZSAqcGFnZXMsCiAJCQkJICAgdTY0IHN0YXJ0LAor CQkJCSAgIHVuc2lnbmVkIGludCBwYWdlX3NpemUsCiAJCQkJICAgZW51bSBpOTE1X2NhY2hlX2xl dmVsIGNhY2hlX2xldmVsLAogCQkJCSAgIHUzMiB1bnVzZWQpCiB7CkBAIC05MjQsNiArOTI1LDcg QEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfM2x2bChzdHJ1Y3QgaTkxNV9hZGRyZXNz X3NwYWNlICp2bSwKIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0XzRsdmwoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgc3RydWN0IHNnX3RhYmxlICpwYWdlcywKIAkJ CQkgICB1NjQgc3RhcnQsCisJCQkJICAgdW5zaWduZWQgaW50IHBhZ2Vfc2l6ZSwKIAkJCQkgICBl bnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCiAJCQkJICAgdTMyIHVudXNlZCkKIHsK QEAgLTkzNSw5ICs5MzcsMjQgQEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfNGx2bChz dHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAl9OwogCXN0cnVjdCBpOTE1X3BhZ2VfZGly ZWN0b3J5X3BvaW50ZXIgKipwZHBzID0gcHBndHQtPnBtbDQucGRwczsKIAlzdHJ1Y3QgZ2VuOF9p bnNlcnRfcHRlIGlkeCA9IGdlbjhfaW5zZXJ0X3B0ZShzdGFydCk7CisJYm9vbCAoKmluc2VydF9l bnRyaWVzKShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCisJCQkgICAgICAgc3RydWN0IGk5 MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlciAqcGRwLAorCQkJICAgICAgIHN0cnVjdCBzZ3RfZG1h ICppdGVyLAorCQkJICAgICAgIHN0cnVjdCBnZW44X2luc2VydF9wdGUgKmlkeCwKKwkJCSAgICAg ICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwpOworCisJLyogVE9ETzogdHVybiB0 aGlzIGludG8gdmZ1bmMgKi8KKwlzd2l0Y2ggKHBhZ2Vfc2l6ZSkgeworCWNhc2UgSTkxNV9HVFRf UEFHRV9TSVpFXzRLOgorCQlpbnNlcnRfZW50cmllcyA9IGdlbjhfcHBndHRfaW5zZXJ0X3B0ZV9l bnRyaWVzOworCQlicmVhazsKKwlkZWZhdWx0OgorCQlNSVNTSU5HX0NBU0UocGFnZV9zaXplKTsK KwkJcmV0dXJuOworCX0KIAotCXdoaWxlIChnZW44X3BwZ3R0X2luc2VydF9wdGVfZW50cmllcyhw cGd0dCwgcGRwc1tpZHgucG1sNGUrK10sICZpdGVyLAotCQkJCQkgICAgICZpZHgsIGNhY2hlX2xl dmVsKSkKKwl3aGlsZSAoaW5zZXJ0X2VudHJpZXMocHBndHQsIHBkcHNbaWR4LnBtbDRlKytdLCAm aXRlciwgJmlkeCwKKwkJCSAgICAgIGNhY2hlX2xldmVsKSkKIAkJR0VNX0JVR19PTihpZHgucG1s NGUgPj0gR0VOOF9QTUw0RVNfUEVSX1BNTDQpOwogfQogCkBAIC0xNjIwLDYgKzE2MzcsNyBAQCBz dGF0aWMgdm9pZCBnZW42X3BwZ3R0X2NsZWFyX3JhbmdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLAogc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkx NV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgICBzdHJ1Y3Qgc2dfdGFibGUgKnBhZ2VzLAog CQkJCSAgICAgIHU2NCBzdGFydCwKKwkJCQkgICAgICB1bnNpZ25lZCBpbnQgcGFnZV9zaXplLAog CQkJCSAgICAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwKIAkJCQkgICAgICB1 MzIgZmxhZ3MpCiB7CkBAIC0yMDkzLDYgKzIxMTEsNyBAQCBzdGF0aWMgdm9pZCBnZW44X2dndHRf aW5zZXJ0X3BhZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiBzdGF0aWMgdm9pZCBn ZW44X2dndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJ CQkJICAgICBzdHJ1Y3Qgc2dfdGFibGUgKnN0LAogCQkJCSAgICAgdTY0IHN0YXJ0LAorCQkJCSAg ICAgdW5zaWduZWQgaW50IHBhZ2Vfc2l6ZSwKIAkJCQkgICAgIGVudW0gaTkxNV9jYWNoZV9sZXZl bCBsZXZlbCwKIAkJCQkgICAgIHUzMiB1bnVzZWQpCiB7CkBAIC0yMTQwLDYgKzIxNTksNyBAQCBz dGF0aWMgdm9pZCBnZW42X2dndHRfaW5zZXJ0X3BhZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFj ZSAqdm0sCiBzdGF0aWMgdm9pZCBnZW42X2dndHRfaW5zZXJ0X2VudHJpZXMoc3RydWN0IGk5MTVf YWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgICBzdHJ1Y3Qgc2dfdGFibGUgKnN0LAogCQkJCSAg ICAgdTY0IHN0YXJ0LAorCQkJCSAgICAgdW5zaWduZWQgaW50IHBhZ2Vfc2l6ZSwKIAkJCQkgICAg IGVudW0gaTkxNV9jYWNoZV9sZXZlbCBsZXZlbCwKIAkJCQkgICAgIHUzMiBmbGFncykKIHsKQEAg LTIyMjQsNiArMjI0NCw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2d0dF9pbnNlcnRfcGFnZShzdHJ1 Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHN0YXRpYyB2b2lkIGk5MTVfZ2d0dF9pbnNlcnRf ZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgIHN0cnVjdCBz Z190YWJsZSAqcGFnZXMsCiAJCQkJICAgICB1NjQgc3RhcnQsCisJCQkJICAgICB1bnNpZ25lZCBp bnQgcGFnZV9zaXplLAogCQkJCSAgICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVs LAogCQkJCSAgICAgdTMyIHVudXNlZCkKIHsKQEAgLTIyNjAsNyArMjI4MSw3IEBAIHN0YXRpYyBp bnQgZ2d0dF9iaW5kX3ZtYShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKIAogCWludGVsX3J1bnRpbWVf cG1fZ2V0KGk5MTUpOwogCXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sIHZtYS0+cGFn ZXMsIHZtYS0+bm9kZS5zdGFydCwKLQkJCQljYWNoZV9sZXZlbCwgcHRlX2ZsYWdzKTsKKwkJCQlJ OTE1X0dUVF9QQUdFX1NJWkUsIGNhY2hlX2xldmVsLCBwdGVfZmxhZ3MpOwogCWludGVsX3J1bnRp bWVfcG1fcHV0KGk5MTUpOwogCiAJLyoKQEAgLTIzMTQsMTQgKzIzMzUsMTQgQEAgc3RhdGljIGlu dCBhbGlhc2luZ19ndHRfYmluZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEsCiAKIAkJYXBwZ3R0 LT5iYXNlLmluc2VydF9lbnRyaWVzKCZhcHBndHQtPmJhc2UsCiAJCQkJCSAgICB2bWEtPnBhZ2Vz LCB2bWEtPm5vZGUuc3RhcnQsCi0JCQkJCSAgICBjYWNoZV9sZXZlbCwgcHRlX2ZsYWdzKTsKKwkJ CQkJICAgIEk5MTVfR1RUX1BBR0VfU0laRSwgY2FjaGVfbGV2ZWwsIHB0ZV9mbGFncyk7CiAJfQog CiAJaWYgKGZsYWdzICYgSTkxNV9WTUFfR0xPQkFMX0JJTkQpIHsKIAkJaW50ZWxfcnVudGltZV9w bV9nZXQoaTkxNSk7CiAJCXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sCiAJCQkJCXZt YS0+cGFnZXMsIHZtYS0+bm9kZS5zdGFydCwKLQkJCQkJY2FjaGVfbGV2ZWwsIHB0ZV9mbGFncyk7 CisJCQkJCUk5MTVfR1RUX1BBR0VfU0laRSwgY2FjaGVfbGV2ZWwsIHB0ZV9mbGFncyk7CiAJCWlu dGVsX3J1bnRpbWVfcG1fcHV0KGk5MTUpOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaAppbmRleCAyN2IyYjllNjgxZGIuLjIzMmY3ZWY0YzIxYiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZ3R0LmgKQEAgLTMyOSw2ICszMjksNyBAQCBzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlIHsKIAl2b2lkICgqaW5zZXJ0X2VudHJpZXMpKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtLAogCQkJICAgICAgIHN0cnVjdCBzZ190YWJsZSAqc3QsCiAJCQkgICAgICAgdTY0IHN0YXJ0 LAorCQkJICAgICAgIHVuc2lnbmVkIGludCBwYWdlX3NpemUsCiAJCQkgICAgICAgZW51bSBpOTE1 X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAogCQkJICAgICAgIHUzMiBmbGFncyk7CiAJdm9pZCAo KmNsZWFudXApKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdm1hLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3ZtYS5jCmluZGV4IDFhYmE0NzAyNDY1Ni4uMGNmOWMwYTk4YzE5IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3ZtYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfdm1hLmMKQEAgLTU0NCw2ICs1NDQsNyBAQCBpbnQgX19pOTE1X3ZtYV9kb19waW4oc3RydWN0 IGk5MTVfdm1hICp2bWEsCiAJbG9ja2RlcF9hc3NlcnRfaGVsZCgmdm1hLT52bS0+aTkxNS0+ZHJt LnN0cnVjdF9tdXRleCk7CiAJR0VNX0JVR19PTigoZmxhZ3MgJiAoUElOX0dMT0JBTCB8IFBJTl9V U0VSKSkgPT0gMCk7CiAJR0VNX0JVR19PTigoZmxhZ3MgJiBQSU5fR0xPQkFMKSAmJiAhaTkxNV92 bWFfaXNfZ2d0dCh2bWEpKTsKKwlHRU1fQlVHX09OKCFpc192YWxpZF9ndHRfcGFnZV9zaXplKHZt YS0+b2JqLT5ndHRfcGFnZV9zaXplKSk7CiAKIAlpZiAoV0FSTl9PTihib3VuZCAmIEk5MTVfVk1B X1BJTl9PVkVSRkxPVykpIHsKIAkJcmV0ID0gLUVCVVNZOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2d0dC5jCmluZGV4IDUwNzEwZTNmMWNhYS4uMjU5YjVlMTM5 ZGYxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1f Z3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2d0dC5j CkBAIC0yNTYsNyArMjU2LDggQEAgc3RhdGljIGludCBsb3dsZXZlbF9ob2xlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICppOTE1LAogCQkJCWJyZWFrOwogCiAJCQl2bS0+aW5zZXJ0X2VudHJpZXMo dm0sIG9iai0+bW0ucGFnZXMsIGFkZHIsCi0JCQkJCSAgIEk5MTVfQ0FDSEVfTk9ORSwgMCk7CisJ CQkJCSAgIEk5MTVfR1RUX1BBR0VfU0laRSwgSTkxNV9DQUNIRV9OT05FLAorCQkJCQkgICAwKTsK IAkJfQogCQljb3VudCA9IG47CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3Nl bGZ0ZXN0cy9tb2NrX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tf Z3R0LmMKaW5kZXggYTYxMzA5YzdjYjNlLi4zODUzMmEwMDgzODcgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2d0dC5jCkBAIC0zNSw2ICszNSw3IEBAIHN0YXRpYyB2b2lk IG1vY2tfaW5zZXJ0X3BhZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiBzdGF0aWMg dm9pZCBtb2NrX2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAog CQkJCXN0cnVjdCBzZ190YWJsZSAqc3QsCiAJCQkJdTY0IHN0YXJ0LAorCQkJCXVuc2lnbmVkIGlu dCBwYWdlX3NpemUsCiAJCQkJZW51bSBpOTE1X2NhY2hlX2xldmVsIGxldmVsLCB1MzIgZmxhZ3Mp CiB7CiB9Ci0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==