From: Michel Thierry Subject: [PATCH 06/13] drm/i915/gen8: pagetable allocation rework Date: Wed, 8 Apr 2015 12:13:28 +0100 Message-ID: <1428491615-27577-7-git-send-email-michel.thierry@intel.com> References: <1428491615-27577-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 D156B89E75 for ; Wed, 8 Apr 2015 04:13:38 -0700 (PDT) In-Reply-To: <1428491615-27577-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 List-Id: intel-gfx@lists.freedesktop.org U3RhcnQgdXNpbmcgZ2VuOF9mb3JfZWFjaF9wZGUgbWFjcm8gdG8gYWxsb2NhdGUgcGFnZSB0YWJs ZXMuCgp2MjogdGVhcmRvd25fdmFfcmFuZ2UgcmVmZXJlbmNlcyByZW1vdmVkLgp2MzogUmViYXNl IGFmdGVyIHMvcGFnZV90YWJsZXMvcGFnZV90YWJsZS8uCnY0OiBLZWVwIHNldHRpbmcgdXAgcGFn ZSB0YWJsZXMgZm9yIGFsbCBwYWdlIGRpcmVjdG9yaWVzIGluIHN5c3RlbXMgd2l0aApsZXNzIHRo YW4gNEdCIG9mIG1lbW9yeS4KdjU6IEFsc28gaW5pdGlhbGl6ZSB0aGUgcGFnZSB0YWJsZXMuIChN aWthKQp2NjogSW5pdGlhbGl6ZSBhbGwgcGFnZSB0YWJsZXMsIGluY2x1ZGluZyB0aGUgZXh0cmEg b25lcyBmcm9tIHN5c3RlbXMKd2l0aCBsZXNzIHRoYW4gNEdCIG9mIG1lbW9yeS4gKE1pa2EpCgpD YzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1v ZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KU2lnbmVkLW9mZi1ieTogTWlj aGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4gKHYyKykKLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDgzICsrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1OSBpbnNlcnRpb25zKCspLCAyNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGFjODJjY2IuLjQ2 YjU3Y2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC02NzUsMjIgKzY3NSw0 MSBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFudXAoc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0pCiAJZ2VuOF9wcGd0dF9mcmVlKHBwZ3R0KTsKIH0KIAotc3RhdGljIGludCBnZW44 X3BwZ3R0X2FsbG9jYXRlX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkK K3N0YXRpYyBpbnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicyhzdHJ1Y3QgaTkxNV9wYWdlX2Rp cmVjdG9yeSAqcGQsCisJCQkJICAgICB1aW50NjRfdCBzdGFydCwKKwkJCQkgICAgIHVpbnQ2NF90 IGxlbmd0aCwKKwkJCQkgICAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQogewotCWlu dCBpLCByZXQ7CisJc3RydWN0IGk5MTVfcGFnZV90YWJsZSAqdW51c2VkOworCXVpbnQ2NF90IHRl bXA7CisJdWludDMyX3QgcGRlOwogCi0JZm9yIChpID0gMDsgaSA8IHBwZ3R0LT5udW1fcGRfcGFn ZXM7IGkrKykgewotCQlyZXQgPSBhbGxvY19wdF9yYW5nZShwcGd0dC0+cGRwLnBhZ2VfZGlyZWN0 b3J5W2ldLAotCQkJCSAgICAgMCwgSTkxNV9QREVTLCBwcGd0dC0+YmFzZS5kZXYpOwotCQlpZiAo cmV0KQorCWdlbjhfZm9yX2VhY2hfcGRlKHVudXNlZCwgcGQsIHN0YXJ0LCBsZW5ndGgsIHRlbXAs IHBkZSkgeworCQlXQVJOX09OKHVudXNlZCk7CisJCXBkLT5wYWdlX3RhYmxlW3BkZV0gPSBhbGxv Y19wdF9zaW5nbGUodm0tPmRldik7CisJCWlmIChJU19FUlIocGQtPnBhZ2VfdGFibGVbcGRlXSkp CisJCQlnb3RvIHVud2luZF9vdXQ7CisKKwkJZ2VuOF9pbml0aWFsaXplX3B0KHZtLCBwZC0+cGFn ZV90YWJsZVtwZGVdKTsKKwl9CisKKwkvKiBYWFg6IFN0aWxsIGFsbG9jIGFsbCBwYWdlIHRhYmxl cyBpbiBzeXN0ZW1zIHdpdGggbGVzcyB0aGFuCisJICogNEdCIG9mIG1lbW9yeS4gVGhpcyB3b24n dCBiZSBuZWVkZWQgYWZ0ZXIgYSBzdWJzZXF1ZW50IHBhdGNoLgorCSAqLworCXdoaWxlIChwZGUg PCBJOTE1X1BERVMpIHsKKwkJcGQtPnBhZ2VfdGFibGVbcGRlXSA9IGFsbG9jX3B0X3NpbmdsZSh2 bS0+ZGV2KTsKKwkJaWYgKElTX0VSUihwZC0+cGFnZV90YWJsZVtwZGVdKSkKIAkJCWdvdG8gdW53 aW5kX291dDsKKworCQlnZW44X2luaXRpYWxpemVfcHQodm0sIHBkLT5wYWdlX3RhYmxlW3BkZV0p OworCQlwZGUrKzsKIAl9CiAKIAlyZXR1cm4gMDsKIAogdW53aW5kX291dDoKLQl3aGlsZSAoaS0t KQotCQlnZW44X2ZyZWVfcGFnZV90YWJsZXMocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSwg cHBndHQtPmJhc2UuZGV2KTsKKwl3aGlsZSAocGRlLS0pCisJCXVubWFwX2FuZF9mcmVlX3B0KHBk LT5wYWdlX3RhYmxlW3BkZV0sIHZtLT5kZXYpOwogCiAJcmV0dXJuIC1FTk9NRU07CiB9CkBAIC03 NDksMjAgKzc2OCw0MiBAQCB1bndpbmRfb3V0OgogfQogCiBzdGF0aWMgaW50IGdlbjhfcHBndHRf YWxsb2Moc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAotCQkJICAgIGNvbnN0IGludCBtYXhf cGRwKQorCQkJICAgIHVpbnQ2NF90IHN0YXJ0LAorCQkJICAgIHVpbnQ2NF90IGxlbmd0aCkKIHsK KwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeSAqcGQ7CisJdWludDY0X3QgdGVtcDsKKwl1aW50 MzJfdCBwZHBlOwogCWludCByZXQ7CiAKLQlyZXQgPSBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VfZGly ZWN0b3JpZXMoJnBwZ3R0LT5wZHAsIHBwZ3R0LT5iYXNlLnN0YXJ0LAotCQkJCQlwcGd0dC0+YmFz ZS50b3RhbCk7CisJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY19wYWdlX2RpcmVjdG9yaWVzKCZwcGd0 dC0+cGRwLCBzdGFydCwgbGVuZ3RoKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0 ID0gZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxlcyhwcGd0dCk7Ci0JaWYgKHJldCkKLQkJ Z290byBlcnJfb3V0OworCWdlbjhfZm9yX2VhY2hfcGRwZShwZCwgJnBwZ3R0LT5wZHAsIHN0YXJ0 LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKKwkJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFi cyhwZCwgc3RhcnQsIGxlbmd0aCwKKwkJCQkJCSZwcGd0dC0+YmFzZSk7CisJCWlmIChyZXQpCisJ CQlnb3RvIGVycl9vdXQ7CisKKwkJcHBndHQtPm51bV9wZF9lbnRyaWVzICs9IEk5MTVfUERFUzsK Kwl9CiAKLQlwcGd0dC0+bnVtX3BkX2VudHJpZXMgPSBtYXhfcGRwICogSTkxNV9QREVTOworCS8q IFhYWDogV2UgYWxsb2NhdGVkIGFsbCBwYWdlIGRpcmVjdG9yaWVzIGluIHN5c3RlbXMgd2l0aCBs ZXNzIHRoYW4KKwkgKiA0R0Igb2YgbWVtb3J5LiBTbyBpbml0YWxpemUgcGFnZSB0YWJsZXMgb2Yg YWxsIFBEUHMuCisJICogVGhpcyB3b24ndCBiZSBuZWVkZWQgYWZ0ZXIgdGhlIG5leHQgcGF0Y2gu CisJICovCisJd2hpbGUgKHBkcGUgPCBHRU44X0xFR0FDWV9QRFBFUykgeworCQlyZXQgPSBnZW44 X3BwZ3R0X2FsbG9jX3BhZ2V0YWJzKHBwZ3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbcGRwZV0sIHN0 YXJ0LCBsZW5ndGgsCisJCQkJCQkmcHBndHQtPmJhc2UpOworCQlpZiAocmV0KQorCQkJZ290byBl cnJfb3V0OworCisJCXBwZ3R0LT5udW1fcGRfZW50cmllcyArPSBJOTE1X1BERVM7CisJCXBkcGUr KzsKKwl9CisKKwlXQVJOX09OKHBkcGUgPiBwcGd0dC0+bnVtX3BkX3BhZ2VzKTsKIAogCXJldHVy biAwOwogCkBAIC04MzMsOSArODc0LDcgQEAgc3RhdGljIGludCBnZW44X3BwZ3R0X2luaXQoc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCB1aW50NjRfdCBzaXplKQogCQlEUk1fSU5GTygiUGFn ZXMgd2lsbCBiZSB3YXN0ZWQgdW5sZXNzIEdUVCBzaXplICglbGx1KSBpcyBkaXZpc2libGUgYnkg MUdCXG4iLCBzaXplKTsKIAogCXBwZ3R0LT5iYXNlLnN0YXJ0ID0gMDsKLQkvKiBUaGlzIGlzIHRo ZSBhcmVhIHRoYXQgd2UgYWR2ZXJ0aXNlIGFzIHVzYWJsZSBmb3IgdGhlIGNhbGxlciAqLwotCXBw Z3R0LT5iYXNlLnRvdGFsID0gbWF4X3BkcCAqIEk5MTVfUERFUyAqIEdFTjhfUFRFUyAqIFBBR0Vf U0laRTsKLQlXQVJOX09OKHBwZ3R0LT5iYXNlLnRvdGFsID09IDApOworCXBwZ3R0LT5iYXNlLnRv dGFsID0gc2l6ZTsKIAogCXBwZ3R0LT5zY3JhdGNoX3B0ID0gYWxsb2NfcHRfc2luZ2xlKHBwZ3R0 LT5iYXNlLmRldik7CiAJaWYgKElTX0VSUihwcGd0dC0+c2NyYXRjaF9wdCkpCkBAIC04NDMsMTIg Kzg4Miw4IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICpwcGd0dCwgdWludDY0X3Qgc2l6ZSkKIAogCWdlbjhfaW5pdGlhbGl6ZV9wdCgmcHBndHQtPmJh c2UsIHBwZ3R0LT5zY3JhdGNoX3B0KTsKIAotCS8qIDEuIERvIGFsbCBvdXIgYWxsb2NhdGlvbnMg Zm9yIHBhZ2UgZGlyZWN0b3JpZXMgYW5kIHBhZ2UgdGFibGVzLgotCSAqIFdlIGFsbG9jYXRlIG1v cmUgdGhhbiB3YXMgYXNrZWQgc28gdGhhdCB3ZSBjYW4gcG9pbnQgdGhlIHVudXNlZCBwYXJ0cwot CSAqIHRvIHZhbGlkIGVudHJpZXMgdGhhdCBwb2ludCB0byBzY3JhdGNoIHBhZ2UuIER5bmFtaWMg cGFnZSB0YWJsZXMKLQkgKiB3aWxsIGZpeCB0aGlzIGV2ZW50dWFsbHkuCi0JICovCi0JcmV0ID0g Z2VuOF9wcGd0dF9hbGxvYyhwcGd0dCwgR0VOOF9MRUdBQ1lfUERQRVMpOworCS8qIDEuIERvIGFs bCBvdXIgYWxsb2NhdGlvbnMgZm9yIHBhZ2UgZGlyZWN0b3JpZXMgYW5kIHBhZ2UgdGFibGVzLiAq LworCXJldCA9IGdlbjhfcHBndHRfYWxsb2MocHBndHQsIHBwZ3R0LT5iYXNlLnN0YXJ0LCBwcGd0 dC0+YmFzZS50b3RhbCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotLSAKMi4xLjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==