From: Michel Thierry Subject: [PATCH v4 17/24] drm/i915/bdw: pagetable allocation rework Date: Thu, 22 Jan 2015 17:01:39 +0000 Message-ID: <1421946106-7921-18-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421946106-7921-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id B9C01720A1 for ; Thu, 22 Jan 2015 09:01:42 -0800 (PST) In-Reply-To: <1421946106-7921-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 RnJvbTogQmVuIFdpZGF3c2t5IDxiZW5qYW1pbi53aWRhd3NreUBpbnRlbC5jb20+CgpTdGFydCB1 c2luZyBnZW44X2Zvcl9lYWNoX3BkZSBtYWNybyB0byBhbGxvY2F0ZSBwYWdlIHRhYmxlcy4KCnYy OiB0ZWFyZG93bl92YV9yYW5nZSByZWZlcmVuY2VzIHJlbW92ZWQuCgpTaWduZWQtb2ZmLWJ5OiBC ZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGll cnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ICh2MikKLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYyB8IDQ2ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDViNmI2NjUuLmU4NWQwZjkgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC02NTgsMjIgKzY1OCwyNyBAQCBzdGF0 aWMgdm9pZCBnZW44X3BwZ3R0X2NsZWFudXAoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0p CiAJZ2VuOF9wcGd0dF9mcmVlKHBwZ3R0KTsKIH0KIAotc3RhdGljIGludCBnZW44X3BwZ3R0X2Fs bG9jYXRlX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKK3N0YXRpYyBp bnQgZ2VuOF9wcGd0dF9hbGxvY19wYWdldGFicyhzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9l bnRyeSAqcGQsCisJCQkJICAgICB1aW50NjRfdCBzdGFydCwKKwkJCQkgICAgIHVpbnQ2NF90IGxl bmd0aCwKKwkJCQkgICAgIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7Ci0JaW50IGksIHJldDsK KwlzdHJ1Y3QgaTkxNV9wYWdlX3RhYmxlX2VudHJ5ICp1bnVzZWQ7CisJdWludDY0X3QgdGVtcDsK Kwl1aW50MzJfdCBwZGU7CiAKLQlmb3IgKGkgPSAwOyBpIDwgcHBndHQtPm51bV9wZF9wYWdlczsg aSsrKSB7Ci0JCXJldCA9IGFsbG9jX3B0X3JhbmdlKHBwZ3R0LT5wZHAucGFnZV9kaXJlY3Rvcnlb aV0sCi0JCQkJICAgICAwLCBHRU44X1BERVNfUEVSX1BBR0UsIHBwZ3R0LT5iYXNlLmRldik7Ci0J CWlmIChyZXQpCisJZ2VuOF9mb3JfZWFjaF9wZGUodW51c2VkLCBwZCwgc3RhcnQsIGxlbmd0aCwg dGVtcCwgcGRlKSB7CisJCUJVR19PTih1bnVzZWQpOworCQlwZC0+cGFnZV90YWJsZXNbcGRlXSA9 IGFsbG9jX3B0X3NpbmdsZShkZXYpOworCQlpZiAoSVNfRVJSKHBkLT5wYWdlX3RhYmxlc1twZGVd KSkKIAkJCWdvdG8gdW53aW5kX291dDsKIAl9CiAKIAlyZXR1cm4gMDsKIAogdW53aW5kX291dDoK LQl3aGlsZSAoaS0tKQotCQlnZW44X2ZyZWVfcGFnZV90YWJsZXMocHBndHQtPnBkcC5wYWdlX2Rp cmVjdG9yeVtpXSwgcHBndHQtPmJhc2UuZGV2KTsKKwl3aGlsZSAocGRlLS0pCisJCXVubWFwX2Fu ZF9mcmVlX3B0KHBkLT5wYWdlX3RhYmxlc1twZGVdLCBkZXYpOwogCiAJcmV0dXJuIC1FTk9NRU07 CiB9CkBAIC03MTYsMjAgKzcyMSwyOCBAQCB1bndpbmRfb3V0OgogfQogCiBzdGF0aWMgaW50IGdl bjhfcHBndHRfYWxsb2Moc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAotCQkJICAgIGNvbnN0 IGludCBtYXhfcGRwKQorCQkJICAgIHVpbnQ2NF90IHN0YXJ0LAorCQkJICAgIHVpbnQ2NF90IGxl bmd0aCkKIHsKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQ7CisJdWludDY0 X3QgdGVtcDsKKwl1aW50MzJfdCBwZHBlOwogCWludCByZXQ7CiAKLQlyZXQgPSBnZW44X3BwZ3R0 X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXMoJnBwZ3R0LT5wZHAsIHBwZ3R0LT5iYXNlLnN0YXJ0LAot CQkJCQlwcGd0dC0+YmFzZS50b3RhbCk7CisJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY19wYWdlX2Rp cmVjdG9yaWVzKCZwcGd0dC0+cGRwLCBzdGFydCwgbGVuZ3RoKTsKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwogCi0JcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX3RhYmxlcyhwcGd0dCk7 Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfb3V0OworCWdlbjhfZm9yX2VhY2hfcGRwZShwZCwgJnBw Z3R0LT5wZHAsIHN0YXJ0LCBsZW5ndGgsIHRlbXAsIHBkcGUpIHsKKwkJcmV0ID0gZ2VuOF9wcGd0 dF9hbGxvY19wYWdldGFicyhwZCwgc3RhcnQsIGxlbmd0aCwKKwkJCQkJCXBwZ3R0LT5iYXNlLmRl dik7CisJCWlmIChyZXQpCisJCQlnb3RvIGVycl9vdXQ7CisKKwkJcHBndHQtPm51bV9wZF9lbnRy aWVzICs9IEdFTjhfUERFU19QRVJfUEFHRTsKKwl9CiAKLQlwcGd0dC0+bnVtX3BkX2VudHJpZXMg PSBtYXhfcGRwICogR0VOOF9QREVTX1BFUl9QQUdFOworCUJVR19PTihwZHBlID4gcHBndHQtPm51 bV9wZF9wYWdlcyk7CiAKIAlyZXR1cm4gMDsKIApAQCAtODAwLDEwICs4MTMsOSBAQCBzdGF0aWMg aW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHVpbnQ2NF90 IHNpemUpCiAKIAlwcGd0dC0+YmFzZS5zdGFydCA9IDA7CiAJcHBndHQtPmJhc2UudG90YWwgPSBz aXplOwotCUJVR19PTihwcGd0dC0+YmFzZS50b3RhbCA9PSAwKTsKIAogCS8qIDEuIERvIGFsbCBv dXIgYWxsb2NhdGlvbnMgZm9yIHBhZ2UgZGlyZWN0b3JpZXMgYW5kIHBhZ2UgdGFibGVzLiAqLwot CXJldCA9IGdlbjhfcHBndHRfYWxsb2MocHBndHQsIG1heF9wZHApOworCXJldCA9IGdlbjhfcHBn dHRfYWxsb2MocHBndHQsIHBwZ3R0LT5iYXNlLnN0YXJ0LCBwcGd0dC0+YmFzZS50b3RhbCk7CiAJ aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotLSAKMi4xLjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==