From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 08/17] drm/i915: pass gtt page size to insert_entries Date: Tue, 16 May 2017 09:29:39 +0100 Message-ID: <20170516082948.28090-9-matthew.auld@intel.com> References: <20170516082948.28090-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id B9D616E2D6 for ; Tue, 16 May 2017 08:30:04 +0000 (UTC) In-Reply-To: <20170516082948.28090-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 RXhwb3NlIGEgcGFnZSBzaXplIHBhcmFtZXRlciBmb3IgaW5zZXJ0X2VudHJpZXMsIHRoaXMgaXMg b25seSByZWxldmFudApmb3IgaW5zZXJ0aW5nIGludG8gdGhlIDRsdmwgcHBndHQgd2hlcmUgd2Ug cGFzcyB0aGUgZ3R0X3BhZ2Vfc2l6ZSBvZiB0aGUKb2JqZWN0LgoKU2lnbmVkLW9mZi1ieTogTWF0 dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxq b29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5jICAgICAgICAgICB8IDMyICsrKysrKysrKysrKysrKysrKysrKysrLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggICAgICAgICAgIHwgIDEgKwog ZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2d0dC5jIHwgIDMgKystCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19ndHQuYyAgICAgfCAgMSArCiA0IGZp bGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBiYzNjNjNlOTJjMTYuLjNiZTNjYmZiNmQyOCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTIxMCw3ICsyMTAsOCBAQCBzdGF0aWMg aW50IHBwZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQlwdGVfZmxhZ3MgfD0g UFRFX1JFQURfT05MWTsKIAogCXZtYS0+dm0tPmluc2VydF9lbnRyaWVzKHZtYS0+dm0sIHZtYS0+ cGFnZXMsIHZtYS0+bm9kZS5zdGFydCwKLQkJCQljYWNoZV9sZXZlbCwgcHRlX2ZsYWdzKTsKKwkJ CQl2bWEtPm9iai0+Z3R0X3BhZ2Vfc2l6ZSwgY2FjaGVfbGV2ZWwsCisJCQkJcHRlX2ZsYWdzKTsK IAogCXJldHVybiAwOwogfQpAQCAtOTExLDYgKzkxMiw3IEBAIGdlbjhfcHBndHRfaW5zZXJ0X3B0 ZV9lbnRyaWVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIHN0YXRpYyB2b2lkIGdlbjhf cHBndHRfaW5zZXJ0XzNsdmwoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkJICAg c3RydWN0IHNnX3RhYmxlICpwYWdlcywKIAkJCQkgICB1NjQgc3RhcnQsCisJCQkJICAgdW5zaWdu ZWQgaW50IHBhZ2Vfc2l6ZSwKIAkJCQkgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2 ZWwsCiAJCQkJICAgdTMyIHVudXNlZCkKIHsKQEAgLTkyOSw2ICs5MzEsNyBAQCBzdGF0aWMgdm9p ZCBnZW44X3BwZ3R0X2luc2VydF8zbHZsKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAog c3RhdGljIHZvaWQgZ2VuOF9wcGd0dF9pbnNlcnRfNGx2bChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3Nw YWNlICp2bSwKIAkJCQkgICBzdHJ1Y3Qgc2dfdGFibGUgKnBhZ2VzLAogCQkJCSAgIHU2NCBzdGFy dCwKKwkJCQkgICB1bnNpZ25lZCBpbnQgcGFnZV9zaXplLAogCQkJCSAgIGVudW0gaTkxNV9jYWNo ZV9sZXZlbCBjYWNoZV9sZXZlbCwKIAkJCQkgICB1MzIgdW51c2VkKQogewpAQCAtOTQwLDkgKzk0 MywyNCBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF80bHZsKHN0cnVjdCBpOTE1X2Fk ZHJlc3Nfc3BhY2UgKnZtLAogCX07CiAJc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRl ciAqKnBkcHMgPSBwcGd0dC0+cG1sNC5wZHBzOwogCXN0cnVjdCBnZW44X2luc2VydF9wdGUgaWR4 ID0gZ2VuOF9pbnNlcnRfcHRlKHN0YXJ0KTsKKwlib29sICgqaW5zZXJ0X2VudHJpZXMpKHN0cnVj dCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKKwkJCSAgICAgICBzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVj dG9yeV9wb2ludGVyICpwZHAsCisJCQkgICAgICAgc3RydWN0IHNndF9kbWEgKml0ZXIsCisJCQkg ICAgICAgc3RydWN0IGdlbjhfaW5zZXJ0X3B0ZSAqaWR4LAorCQkJICAgICAgIGVudW0gaTkxNV9j YWNoZV9sZXZlbCBjYWNoZV9sZXZlbCk7CisKKwkvKiBUT0RPOiB0dXJuIHRoaXMgaW50byB2ZnVu YyAqLworCXN3aXRjaCAocGFnZV9zaXplKSB7CisJY2FzZSBJOTE1X0dUVF9QQUdFX1NJWkVfNEs6 CisJCWluc2VydF9lbnRyaWVzID0gZ2VuOF9wcGd0dF9pbnNlcnRfcHRlX2VudHJpZXM7CisJCWJy ZWFrOworCWRlZmF1bHQ6CisJCU1JU1NJTkdfQ0FTRShwYWdlX3NpemUpOworCQlyZXR1cm47CisJ fQogCi0Jd2hpbGUgKGdlbjhfcHBndHRfaW5zZXJ0X3B0ZV9lbnRyaWVzKHBwZ3R0LCBwZHBzW2lk eC5wbWw0ZSsrXSwgJml0ZXIsCi0JCQkJCSAgICAgJmlkeCwgY2FjaGVfbGV2ZWwpKQorCXdoaWxl IChpbnNlcnRfZW50cmllcyhwcGd0dCwgcGRwc1tpZHgucG1sNGUrK10sICZpdGVyLCAmaWR4LAor CQkJICAgICAgY2FjaGVfbGV2ZWwpKQogCQlHRU1fQlVHX09OKGlkeC5wbWw0ZSA+PSBHRU44X1BN TDRFU19QRVJfUE1MNCk7CiB9CiAKQEAgLTE2MjUsNiArMTY0Myw3IEBAIHN0YXRpYyB2b2lkIGdl bjZfcHBndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiBzdGF0 aWMgdm9pZCBnZW42X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3Bh Y2UgKnZtLAogCQkJCSAgICAgIHN0cnVjdCBzZ190YWJsZSAqcGFnZXMsCiAJCQkJICAgICAgdTY0 IHN0YXJ0LAorCQkJCSAgICAgIHVuc2lnbmVkIGludCBwYWdlX3NpemUsCiAJCQkJICAgICAgZW51 bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsLAogCQkJCSAgICAgIHUzMiBmbGFncykKIHsK QEAgLTIwOTgsNiArMjExNyw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfZ2d0dF9pbnNlcnRfcGFnZShz dHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHN0YXRpYyB2b2lkIGdlbjhfZ2d0dF9pbnNl cnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkgICAgIHN0cnVj dCBzZ190YWJsZSAqc3QsCiAJCQkJICAgICB1NjQgc3RhcnQsCisJCQkJICAgICB1bnNpZ25lZCBp bnQgcGFnZV9zaXplLAogCQkJCSAgICAgZW51bSBpOTE1X2NhY2hlX2xldmVsIGxldmVsLAogCQkJ CSAgICAgdTMyIHVudXNlZCkKIHsKQEAgLTIxNDUsNiArMjE2NSw3IEBAIHN0YXRpYyB2b2lkIGdl bjZfZ2d0dF9pbnNlcnRfcGFnZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIHN0YXRp YyB2b2lkIGdlbjZfZ2d0dF9pbnNlcnRfZW50cmllcyhzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNl ICp2bSwKIAkJCQkgICAgIHN0cnVjdCBzZ190YWJsZSAqc3QsCiAJCQkJICAgICB1NjQgc3RhcnQs CisJCQkJICAgICB1bnNpZ25lZCBpbnQgcGFnZV9zaXplLAogCQkJCSAgICAgZW51bSBpOTE1X2Nh Y2hlX2xldmVsIGxldmVsLAogCQkJCSAgICAgdTMyIGZsYWdzKQogewpAQCAtMjIyOSw2ICsyMjUw LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9nZ3R0X2luc2VydF9wYWdlKHN0cnVjdCBpOTE1X2FkZHJl c3Nfc3BhY2UgKnZtLAogc3RhdGljIHZvaWQgaTkxNV9nZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVj dCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCSAgICAgc3RydWN0IHNnX3RhYmxlICpwYWdl cywKIAkJCQkgICAgIHU2NCBzdGFydCwKKwkJCQkgICAgIHVuc2lnbmVkIGludCBwYWdlX3NpemUs CiAJCQkJICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCiAJCQkJICAgICB1 MzIgdW51c2VkKQogewpAQCAtMjI2NSw3ICsyMjg3LDcgQEAgc3RhdGljIGludCBnZ3R0X2JpbmRf dm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCiAJaW50ZWxfcnVudGltZV9wbV9nZXQoaTkxNSk7 CiAJdm1hLT52bS0+aW5zZXJ0X2VudHJpZXModm1hLT52bSwgdm1hLT5wYWdlcywgdm1hLT5ub2Rl LnN0YXJ0LAotCQkJCWNhY2hlX2xldmVsLCBwdGVfZmxhZ3MpOworCQkJCUk5MTVfR1RUX1BBR0Vf U0laRSwgY2FjaGVfbGV2ZWwsIHB0ZV9mbGFncyk7CiAJaW50ZWxfcnVudGltZV9wbV9wdXQoaTkx NSk7CiAKIAkvKgpAQCAtMjMyMCw2ICsyMzQyLDcgQEAgc3RhdGljIGludCBhbGlhc2luZ19ndHRf YmluZF92bWEoc3RydWN0IGk5MTVfdm1hICp2bWEsCiAKIAkJYXBwZ3R0LT5iYXNlLmluc2VydF9l bnRyaWVzKCZhcHBndHQtPmJhc2UsCiAJCQkJCSAgICB2bWEtPnBhZ2VzLCB2bWEtPm5vZGUuc3Rh cnQsCisJCQkJCSAgICBJOTE1X0dUVF9QQUdFX1NJWkUsCiAJCQkJCSAgICBjYWNoZV9sZXZlbCwg cHRlX2ZsYWdzKTsKIAl9CiAKQEAgLTIzMjcsNiArMjM1MCw3IEBAIHN0YXRpYyBpbnQgYWxpYXNp bmdfZ3R0X2JpbmRfdm1hKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQlpbnRlbF9ydW50aW1lX3Bt X2dldChpOTE1KTsKIAkJdm1hLT52bS0+aW5zZXJ0X2VudHJpZXModm1hLT52bSwKIAkJCQkJdm1h LT5wYWdlcywgdm1hLT5ub2RlLnN0YXJ0LAorCQkJCQlJOTE1X0dUVF9QQUdFX1NJWkUsCiAJCQkJ CWNhY2hlX2xldmVsLCBwdGVfZmxhZ3MpOwogCQlpbnRlbF9ydW50aW1lX3BtX3B1dChpOTE1KTsK IAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IGY4ZGIyMzFjMjhhYS4uNWEy YTM5MDdkMjY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtMzIwLDYgKzMy MCw3IEBAIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgewogCXZvaWQgKCppbnNlcnRfZW50cmll cykoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJCQkgICAgICAgc3RydWN0IHNnX3Rh YmxlICpzdCwKIAkJCSAgICAgICB1NjQgc3RhcnQsCisJCQkgICAgICAgdW5zaWduZWQgaW50IHBh Z2Vfc2l6ZSwKIAkJCSAgICAgICBlbnVtIGk5MTVfY2FjaGVfbGV2ZWwgY2FjaGVfbGV2ZWwsCiAJ CQkgICAgICAgdTMyIGZsYWdzKTsKIAl2b2lkICgqY2xlYW51cCkoc3RydWN0IGk5MTVfYWRkcmVz c19zcGFjZSAqdm0pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3Rz L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2Vt X2d0dC5jCmluZGV4IDUwNzEwZTNmMWNhYS4uMjU5YjVlMTM5ZGYxIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2d0dC5jCkBAIC0yNTYsNyArMjU2LDggQEAg c3RhdGljIGludCBsb3dsZXZlbF9ob2xlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAog CQkJCWJyZWFrOwogCiAJCQl2bS0+aW5zZXJ0X2VudHJpZXModm0sIG9iai0+bW0ucGFnZXMsIGFk ZHIsCi0JCQkJCSAgIEk5MTVfQ0FDSEVfTk9ORSwgMCk7CisJCQkJCSAgIEk5MTVfR1RUX1BBR0Vf U0laRSwgSTkxNV9DQUNIRV9OT05FLAorCQkJCQkgICAwKTsKIAkJfQogCQljb3VudCA9IG47CiAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2d0dC5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ3R0LmMKaW5kZXggYTYxMzA5Yzdj YjNlLi4zODUzMmEwMDgzODcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0 ZXN0cy9tb2NrX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2Nr X2d0dC5jCkBAIC0zNSw2ICszNSw3IEBAIHN0YXRpYyB2b2lkIG1vY2tfaW5zZXJ0X3BhZ2Uoc3Ry dWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiBzdGF0aWMgdm9pZCBtb2NrX2luc2VydF9lbnRy aWVzKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQkJCXN0cnVjdCBzZ190YWJsZSAq c3QsCiAJCQkJdTY0IHN0YXJ0LAorCQkJCXVuc2lnbmVkIGludCBwYWdlX3NpemUsCiAJCQkJZW51 bSBpOTE1X2NhY2hlX2xldmVsIGxldmVsLCB1MzIgZmxhZ3MpCiB7CiB9Ci0tIAoyLjkuNAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==