From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 06/15] drm/i915: pass page_size to insert_entries Date: Mon, 6 Mar 2017 23:54:05 +0000 Message-ID: <20170306235414.23407-7-matthew.auld@intel.com> References: <20170306235414.23407-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 7CFAE6E578 for ; Mon, 6 Mar 2017 23:54:23 +0000 (UTC) In-Reply-To: <20170306235414.23407-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 IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAgICAgICAgICB8IDMyICsrKysr KysrKysrKysrKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmggICAgICAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVf Z2VtX2d0dC5jIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19n dHQuYyAgICAgfCAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyksIDcgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBjZWU5YzRmZWM1 MmEuLjkyNzQ5NzQ5NTZiMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTIw NSw3ICsyMDUsNyBAQCBzdGF0aWMgaW50IHBwZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAq dm1hLAogCQlwdGVfZmxhZ3MgfD0gUFRFX1JFQURfT05MWTsKIAogCXZtYS0+dm0tPmluc2VydF9l bnRyaWVzKHZtYS0+dm0sIHZtYS0+cGFnZXMsIHZtYS0+bm9kZS5zdGFydCwKLQkJCQljYWNoZV9s ZXZlbCwgcHRlX2ZsYWdzKTsKKwkJCQl2bWEtPm9iai0+cGFnZV9zaXplLCBjYWNoZV9sZXZlbCwg cHRlX2ZsYWdzKTsKIAogCXJldHVybiAwOwogfQpAQCAtOTA2LDYgKzkwNiw3IEBAIGdlbjhfcHBn dHRfaW5zZXJ0X3B0ZV9lbnRyaWVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIHN0YXRp YyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0XzNsdmwoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAq dm0sCiAJCQkJICAgc3RydWN0IHNnX3RhYmxlICpwYWdlcywKIAkJCQkgICB1NjQgc3RhcnQsCisJ CQkJICAgdW5zaWduZWQgbG9uZyBwYWdlX3NpemUsCiAJCQkJICAgZW51bSBpOTE1X2NhY2hlX2xl dmVsIGNhY2hlX2xldmVsLAogCQkJCSAgIHUzMiB1bnVzZWQpCiB7CkBAIC05MjQsNiArOTI1LDcg QEAgc3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfM2x2bChzdHJ1Y3QgaTkxNV9hZGRyZXNz X3NwYWNlICp2bSwKIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0XzRsdmwoc3RydWN0IGk5 MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAgc3RydWN0IHNnX3RhYmxlICpwYWdlcywKIAkJ CQkgICB1NjQgc3RhcnQsCisJCQkJICAgdW5zaWduZWQgbG9uZyBwYWdlX3NpemUsCiAJCQkJICAg ZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAogCQkJCSAgIHUzMiB1bnVzZWQpCiB7 CkBAIC05MzUsOSArOTM3LDIzIEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfaW5zZXJ0XzRsdmwo c3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJfTsKIAlzdHJ1Y3QgaTkxNV9wYWdlX2Rp cmVjdG9yeV9wb2ludGVyICoqcGRwcyA9IHBwZ3R0LT5wbWw0LnBkcHM7CiAJc3RydWN0IGdlbjhf aW5zZXJ0X3B0ZSBpZHggPSBnZW44X2luc2VydF9wdGUoc3RhcnQpOworCWJvb2wgKCppbnNlcnRf ZW50cmllcykoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAorCQkJICAgICAgIHN0cnVjdCBp OTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCwKKwkJCSAgICAgICBzdHJ1Y3Qgc2d0X2Rt YSAqaXRlciwKKwkJCSAgICAgICBzdHJ1Y3QgZ2VuOF9pbnNlcnRfcHRlICppZHgsCisJCQkgICAg ICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsKTsKKworCXN3aXRjaCAocGFnZV9z aXplKSB7CisJY2FzZSBJOTE1X0dUVF9QQUdFX1NJWkU6CisJCWluc2VydF9lbnRyaWVzID0gZ2Vu OF9wcGd0dF9pbnNlcnRfcHRlX2VudHJpZXM7CisJCWJyZWFrOworCWRlZmF1bHQ6CisJCU1JU1NJ TkdfQ0FTRShwYWdlX3NpemUpOworCQlyZXR1cm47CisJfSAKIAotCXdoaWxlIChnZW44X3BwZ3R0 X2luc2VydF9wdGVfZW50cmllcyhwcGd0dCwgcGRwc1tpZHgucG1sNGUrK10sICZpdGVyLAotCQkJ CQkgICAgICZpZHgsIGNhY2hlX2xldmVsKSkKKwl3aGlsZSAoaW5zZXJ0X2VudHJpZXMocHBndHQs IHBkcHNbaWR4LnBtbDRlKytdLCAmaXRlciwgJmlkeCwKKwkJCSAgICAgIGNhY2hlX2xldmVsKSkK IAkJR0VNX0JVR19PTihpZHgucG1sNGUgPj0gR0VOOF9QTUw0RVNfUEVSX1BNTDQpOwogfQogCkBA IC0xNjIwLDYgKzE2MzYsNyBAQCBzdGF0aWMgdm9pZCBnZW42X3BwZ3R0X2NsZWFyX3JhbmdlKHN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbnNl cnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgICBzdHJ1 Y3Qgc2dfdGFibGUgKnBhZ2VzLAogCQkJCSAgICAgIHU2NCBzdGFydCwKKwkJCQkgICAgICB1bnNp Z25lZCBsb25nIHBhZ2Vfc2l6ZSwKIAkJCQkgICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2Fj aGVfbGV2ZWwsCiAJCQkJICAgICAgdTMyIGZsYWdzKQogewpAQCAtMjA5Myw2ICsyMTEwLDcgQEAg c3RhdGljIHZvaWQgZ2VuOF9nZ3R0X2luc2VydF9wYWdlKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLAogc3RhdGljIHZvaWQgZ2VuOF9nZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1 X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCSAgICAgc3RydWN0IHNnX3RhYmxlICpzdCwKIAkJCQkg ICAgIHU2NCBzdGFydCwKKwkJCQkgICAgIHVuc2lnbmVkIGxvbmcgcGFnZV9zaXplLAogCQkJCSAg ICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGxldmVsLAogCQkJCSAgICAgdTMyIHVudXNlZCkKIHsK QEAgLTIxNDAsNiArMjE1OCw3IEBAIHN0YXRpYyB2b2lkIGdlbjZfZ2d0dF9pbnNlcnRfcGFnZShz dHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHN0YXRpYyB2b2lkIGdlbjZfZ2d0dF9pbnNl cnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgIHN0cnVj dCBzZ190YWJsZSAqc3QsCiAJCQkJICAgICB1NjQgc3RhcnQsCisJCQkJICAgICB1bnNpZ25lZCBs b25nIHBhZ2Vfc2l6ZSwKIAkJCQkgICAgIGVudW0gaTkxNV9jYWNoZV9sZXZlbCBsZXZlbCwKIAkJ CQkgICAgIHUzMiBmbGFncykKIHsKQEAgLTIyMjQsNiArMjI0Myw3IEBAIHN0YXRpYyB2b2lkIGk5 MTVfZ2d0dF9pbnNlcnRfcGFnZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHN0YXRp YyB2b2lkIGk5MTVfZ2d0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bSwKIAkJCQkgICAgIHN0cnVjdCBzZ190YWJsZSAqcGFnZXMsCiAJCQkJICAgICB1NjQgc3Rh cnQsCisJCQkJICAgICB1bnNpZ25lZCBsb25nIHBhZ2Vfc2l6ZSwKIAkJCQkgICAgIGVudW0gaTkx NV9jYWNoZV9sZXZlbCBjYWNoZV9sZXZlbCwKIAkJCQkgICAgIHUzMiB1bnVzZWQpCiB7CkBAIC0y MjYwLDcgKzIyODAsNyBAQCBzdGF0aWMgaW50IGdndHRfYmluZF92bWEoc3RydWN0IGk5MTVfdm1h ICp2bWEsCiAKIAlpbnRlbF9ydW50aW1lX3BtX2dldChpOTE1KTsKIAl2bWEtPnZtLT5pbnNlcnRf ZW50cmllcyh2bWEtPnZtLCB2bWEtPnBhZ2VzLCB2bWEtPm5vZGUuc3RhcnQsCi0JCQkJY2FjaGVf bGV2ZWwsIHB0ZV9mbGFncyk7CisJCQkJSTkxNV9HVFRfUEFHRV9TSVpFLCBjYWNoZV9sZXZlbCwg cHRlX2ZsYWdzKTsKIAlpbnRlbF9ydW50aW1lX3BtX3B1dChpOTE1KTsKIAogCS8qCkBAIC0yMzE0 LDE0ICsyMzM0LDE0IEBAIHN0YXRpYyBpbnQgYWxpYXNpbmdfZ3R0X2JpbmRfdm1hKHN0cnVjdCBp OTE1X3ZtYSAqdm1hLAogCiAJCWFwcGd0dC0+YmFzZS5pbnNlcnRfZW50cmllcygmYXBwZ3R0LT5i YXNlLAogCQkJCQkgICAgdm1hLT5wYWdlcywgdm1hLT5ub2RlLnN0YXJ0LAotCQkJCQkgICAgY2Fj aGVfbGV2ZWwsIHB0ZV9mbGFncyk7CisJCQkJCSAgICBJOTE1X0dUVF9QQUdFX1NJWkUsIGNhY2hl X2xldmVsLCBwdGVfZmxhZ3MpOwogCX0KIAogCWlmIChmbGFncyAmIEk5MTVfVk1BX0dMT0JBTF9C SU5EKSB7CiAJCWludGVsX3J1bnRpbWVfcG1fZ2V0KGk5MTUpOwogCQl2bWEtPnZtLT5pbnNlcnRf ZW50cmllcyh2bWEtPnZtLAogCQkJCQl2bWEtPnBhZ2VzLCB2bWEtPm5vZGUuc3RhcnQsCi0JCQkJ CWNhY2hlX2xldmVsLCBwdGVfZmxhZ3MpOworCQkJCQlJOTE1X0dUVF9QQUdFX1NJWkUsIGNhY2hl X2xldmVsLCBwdGVfZmxhZ3MpOwogCQlpbnRlbF9ydW50aW1lX3BtX3B1dChpOTE1KTsKIAl9CiAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggNmM5MGEyZmZkMGUxLi4xZjUxNDAy Y2Y4MTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC0zMjgsNiArMzI4LDcg QEAgc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSB7CiAJdm9pZCAoKmluc2VydF9lbnRyaWVzKShz dHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCSAgICAgICBzdHJ1Y3Qgc2dfdGFibGUg KnN0LAogCQkJICAgICAgIHU2NCBzdGFydCwKKwkJCSAgICAgICB1bnNpZ25lZCBsb25nIHBhZ2Vf c2l6ZSwKIAkJCSAgICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCiAJCQkg ICAgICAgdTMyIGZsYWdzKTsKIAl2b2lkICgqY2xlYW51cCkoc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5 MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2d0 dC5jCmluZGV4IGM0YTM5YjdkN2RkMC4uYzc5NjNlZmU0NmJhIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2d0dC5jCkBAIC0yNTYsNyArMjU2LDggQEAgc3Rh dGljIGludCBsb3dsZXZlbF9ob2xlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAogCQkJ CWJyZWFrOwogCiAJCQl2bS0+aW5zZXJ0X2VudHJpZXModm0sIG9iai0+bW0ucGFnZXMsIGFkZHIs Ci0JCQkJCSAgIEk5MTVfQ0FDSEVfTk9ORSwgMCk7CisJCQkJCSAgIEk5MTVfR1RUX1BBR0VfU0la RSwgSTkxNV9DQUNIRV9OT05FLAorCQkJCQkgICAwKTsKIAkJfQogCQljb3VudCA9IG47CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2d0dC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ3R0LmMKaW5kZXggYTYxMzA5YzdjYjNl Li5hMjEzNzEwMGQyZjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0 cy9tb2NrX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2d0 dC5jCkBAIC0zNSw2ICszNSw3IEBAIHN0YXRpYyB2b2lkIG1vY2tfaW5zZXJ0X3BhZ2Uoc3RydWN0 IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiBzdGF0aWMgdm9pZCBtb2NrX2luc2VydF9lbnRyaWVz KHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCXN0cnVjdCBzZ190YWJsZSAqc3Qs CiAJCQkJdTY0IHN0YXJ0LAorCQkJCXVuc2lnbmVkIGxvbmcgcGFnZV9zaXplLAogCQkJCWVudW0g aTkxNV9jYWNoZV9sZXZlbCBsZXZlbCwgdTMyIGZsYWdzKQogewogfQotLSAKMi45LjMKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=