From: Michel Thierry Subject: [PATCH v3 17/25] drm/i915/bdw: page directories rework allocation Date: Tue, 13 Jan 2015 11:52:31 +0000 Message-ID: <1421149959-30383-18-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1421149959-30383-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 B9DE56E5D8 for ; Tue, 13 Jan 2015 03:52:30 -0800 (PST) In-Reply-To: <1421149959-30383-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 c2luZyBnZW44X2Zvcl9lYWNoX3BkcGUgbWFjcm8gdG8gYWxsb2NhdGUgdGhlIHBhZ2UgZGlyZWN0 b3JpZXMuCgp2MjogUmViYXNlZCBhZnRlciBzL2ZyZWVfcHRfKi91bm1hcF9hbmRfZnJlZV9wdC8g Y2hhbmdlLgoKU2lnbmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5AYndpZGF3c2submV0PgpT aWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPiAo djIpCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCA0MyArKysrKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzEgaW5zZXJ0 aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpp bmRleCA3NTY5MDdmLi4zNzc5NjUzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpA QCAtNTk1LDggKzU5NSwxMCBAQCBzdGF0aWMgdm9pZCBnZW44X3RlYXJkb3duX3ZhX3JhbmdlKHN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCQl1aW50NjRfdCBwZF9zdGFydCA9IHN0YXJ0 OwogCQlnZW44X2Zvcl9lYWNoX3BkZShwdCwgcGQsIHBkX3N0YXJ0LCBwZF9sZW4sIHRlbXAsIHBk ZSkgewogCQkJdW5tYXBfYW5kX2ZyZWVfcHQocHQsIHZtLT5kZXYpOworCQkJcGQtPnBhZ2VfdGFi bGVzW3BkZV0gPSBOVUxMOwogCQl9CiAJCXVubWFwX2FuZF9mcmVlX3BkKHBkKTsKKwkJcHBndHQt PnBkcC5wYWdlX2RpcmVjdG9yeVtwZHBlXSA9IE5VTEw7CiAJfQogfQogCkBAIC02NzEsMjUgKzY3 MywzOSBAQCB1bndpbmRfb3V0OgogCXJldHVybiAtRU5PTUVNOwogfQogCi1zdGF0aWMgaW50IGdl bjhfcHBndHRfYWxsb2NhdGVfcGFnZV9kaXJlY3RvcmllcyhzdHJ1Y3QgaTkxNV9od19wcGd0dCAq cHBndHQsCi0JCQkJCQljb25zdCBpbnQgbWF4X3BkcCkKK3N0YXRpYyBpbnQgZ2VuOF9wcGd0dF9h bGxvY19wYWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXJf ZW50cnkgKnBkcCwKKwkJCQkgICAgIHVpbnQ2NF90IHN0YXJ0LAorCQkJCSAgICAgdWludDY0X3Qg bGVuZ3RoKQogewotCWludCBpOworCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9CisJCWNv bnRhaW5lcl9vZihwZHAsIHN0cnVjdCBpOTE1X2h3X3BwZ3R0LCBwZHApOworCXN0cnVjdCBpOTE1 X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICp1bnVzZWQ7CisJdWludDY0X3QgdGVtcDsKKwl1aW50MzJf dCBwZHBlOwogCi0JZm9yIChpID0gMDsgaSA8IG1heF9wZHA7IGkrKykgewotCQlwcGd0dC0+cGRw LnBhZ2VfZGlyZWN0b3J5W2ldID0gYWxsb2NfcGRfc2luZ2xlKCk7Ci0JCWlmIChJU19FUlIocHBn dHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtpXSkpCisJLyogRklYTUU6IFBQR1RUIGNvbnRhaW5lcl9v ZiB3b24ndCB3b3JrIGZvciA2NGIgKi8KKwlCVUdfT04oKHN0YXJ0ICsgbGVuZ3RoKSA+IDB4ODAw MDAwMDAwVUxMKTsKKworCWdlbjhfZm9yX2VhY2hfcGRwZSh1bnVzZWQsIHBkcCwgc3RhcnQsIGxl bmd0aCwgdGVtcCwgcGRwZSkgeworCQlCVUdfT04odW51c2VkKTsKKwkJcGRwLT5wYWdlX2RpcmVj dG9yeVtwZHBlXSA9IGFsbG9jX3BkX3NpbmdsZSgpOworCQlpZiAoSVNfRVJSKHBwZ3R0LT5wZHAu cGFnZV9kaXJlY3RvcnlbcGRwZV0pKQogCQkJZ290byB1bndpbmRfb3V0OworCisJCXBwZ3R0LT5u dW1fcGRfcGFnZXMrKzsKIAl9CiAKLQlwcGd0dC0+bnVtX3BkX3BhZ2VzID0gbWF4X3BkcDsKIAlC VUdfT04ocHBndHQtPm51bV9wZF9wYWdlcyA+IEdFTjhfTEVHQUNZX1BEUEVTKTsKIAogCXJldHVy biAwOwogCiB1bndpbmRfb3V0OgotCXdoaWxlIChpLS0pCi0JCXVubWFwX2FuZF9mcmVlX3BkKHBw Z3R0LT5wZHAucGFnZV9kaXJlY3RvcnlbaV0pOworCXdoaWxlIChwZHBlLS0pIHsKKwkJdW5tYXBf YW5kX2ZyZWVfcGQocHBndHQtPnBkcC5wYWdlX2RpcmVjdG9yeVtwZHBlXSk7CisJCXBwZ3R0LT5u dW1fcGRfcGFnZXMtLTsKKwl9CisKKwlXQVJOX09OKHBwZ3R0LT5udW1fcGRfcGFnZXMpOwogCiAJ cmV0dXJuIC1FTk9NRU07CiB9CkBAIC02OTksNyArNzE1LDggQEAgc3RhdGljIGludCBnZW44X3Bw Z3R0X2FsbG9jKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIHsKIAlpbnQgcmV0OwogCi0J cmV0ID0gZ2VuOF9wcGd0dF9hbGxvY2F0ZV9wYWdlX2RpcmVjdG9yaWVzKHBwZ3R0LCBtYXhfcGRw KTsKKwlyZXQgPSBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VfZGlyZWN0b3JpZXMoJnBwZ3R0LT5wZHAs IHBwZ3R0LT5iYXNlLnN0YXJ0LAorCQkJCQlwcGd0dC0+YmFzZS50b3RhbCk7CiAJaWYgKHJldCkK IAkJcmV0dXJuIHJldDsKIApAQCAtNzc2LDYgKzc5MywxMCBAQCBzdGF0aWMgaW50IGdlbjhfcHBn dHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHVpbnQ2NF90IHNpemUpCiAJaWYg KHNpemUgJSAoMTw8MzApKQogCQlEUk1fSU5GTygiUGFnZXMgd2lsbCBiZSB3YXN0ZWQgdW5sZXNz IEdUVCBzaXplICglbGx1KSBpcyBkaXZpc2libGUgYnkgMUdCXG4iLCBzaXplKTsKIAorCXBwZ3R0 LT5iYXNlLnN0YXJ0ID0gMDsKKwlwcGd0dC0+YmFzZS50b3RhbCA9IHNpemU7CisJQlVHX09OKHBw Z3R0LT5iYXNlLnRvdGFsID09IDApOworCiAJLyogMS4gRG8gYWxsIG91ciBhbGxvY2F0aW9ucyBm b3IgcGFnZSBkaXJlY3RvcmllcyBhbmQgcGFnZSB0YWJsZXMuICovCiAJcmV0ID0gZ2VuOF9wcGd0 dF9hbGxvYyhwcGd0dCwgbWF4X3BkcCk7CiAJaWYgKHJldCkKQEAgLTgyMyw4ICs4NDQsNiBAQCBz dGF0aWMgaW50IGdlbjhfcHBndHRfaW5pdChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIHVp bnQ2NF90IHNpemUpCiAJcHBndHQtPmJhc2UuY2xlYXJfcmFuZ2UgPSBnZW44X3BwZ3R0X2NsZWFy X3JhbmdlOwogCXBwZ3R0LT5iYXNlLmluc2VydF9lbnRyaWVzID0gZ2VuOF9wcGd0dF9pbnNlcnRf ZW50cmllczsKIAlwcGd0dC0+YmFzZS5jbGVhbnVwID0gZ2VuOF9wcGd0dF9jbGVhbnVwOwotCXBw Z3R0LT5iYXNlLnN0YXJ0ID0gMDsKLQlwcGd0dC0+YmFzZS50b3RhbCA9IHBwZ3R0LT5udW1fcGRf ZW50cmllcyAqIEdFTjhfUFRFU19QRVJfUEFHRSAqIFBBR0VfU0laRTsKIAogCURSTV9ERUJVR19E UklWRVIoIkFsbG9jYXRlZCAlZCBwYWdlcyBmb3IgcGFnZSBkaXJlY3RvcmllcyAoJWQgd2FzdGVk KVxuIiwKIAkJCSBwcGd0dC0+bnVtX3BkX3BhZ2VzLCBwcGd0dC0+bnVtX3BkX3BhZ2VzIC0gbWF4 X3BkcCk7Ci0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK