From: Michel Thierry Subject: [PATCH v3 19/25] drm/i915/bdw: Update pdp switch and point unused PDPs to scratch page Date: Tue, 13 Jan 2015 11:52:33 +0000 Message-ID: <1421149959-30383-20-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 59C876E5E1 for ; Tue, 13 Jan 2015 03:52:32 -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+CgpPbmUgaW1w b3J0YW50IHBhcnQgb2YgdGhpcyBwYXRjaCBpcyB3ZSBub3cgd3JpdGUgYSBzY3JhdGNoIHBhZ2UK ZGlyZWN0b3J5IGludG8gYW55IHVudXNlZCBQRFAgZGVzY3JpcHRvcnMuIFRoaXMgbWF0dGVycyBm b3IgMiByZWFzb25zLApmaXJzdCwgd2UncmUgbm90IGFsbG93ZWQgdG8ganVzdCB1c2UgMCwgb3Ig YW4gaW52YWxpZCBwb2ludGVyLCBhbmQgc2Vjb25kLAp3ZSBtdXN0IHdpcGUgb3V0IGFueSBwcmV2 aW91cyBjb250ZW50cyBmcm9tIHRoZSBsYXN0IGNvbnRleHQuCgpUaGUgbGF0dGVyIHBvaW50IG9u bHkgbWF0dGVycyB3aXRoIGZ1bGwgUFBHVFQuIFRoZSBmb3JtZXIgcG9pbnQgb25seQplZmZlY3Qg cGxhdGZvcm1zIHdpdGggbGVzcyB0aGFuIDRHQiBtZW1vcnkuCgp2MjogVXBkYXRlZCBjb21taXQg bWVzc2FnZSB0byBwb2ludCB0aGF0IHdlIG11c3Qgc2V0IHVudXNlZCBQRFBzIHRvIHRoZQpzY3Jh dGNoIHBhZ2UuCgpTaWduZWQtb2ZmLWJ5OiBCZW4gV2lkYXdza3kgPGJlbkBid2lkYXdzay5uZXQ+ ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBUaGllcnJ5IDxtaWNoZWwudGhpZXJyeUBpbnRlbC5jb20+ ICh2MikKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDI5ICsrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaCB8ICA1ICsrKystCiAyIGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDEyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggMWEwNzBiNy4u MmMwMGIyNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTQ0Niw4ICs0NDYs OSBAQCBzdGF0aWMgc3RydWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfZW50cnkgKmFsbG9jX3BkX3Np bmdsZSh2b2lkKQogfQogCiAvKiBCcm9hZHdlbGwgUGFnZSBEaXJlY3RvcnkgUG9pbnRlciBEZXNj cmlwdG9ycyAqLwotc3RhdGljIGludCBnZW44X3dyaXRlX3BkcChzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nLCB1bnNpZ25lZCBlbnRyeSwKLQkJCSAgIHVpbnQ2NF90IHZhbCkKK3N0YXRpYyBp bnQgZ2VuOF93cml0ZV9wZHAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKKwkJCSAgdW5z aWduZWQgZW50cnksCisJCQkgIGRtYV9hZGRyX3QgYWRkcikKIHsKIAlpbnQgcmV0OwogCkBAIC00 NTksMTAgKzQ2MCwxMCBAQCBzdGF0aWMgaW50IGdlbjhfd3JpdGVfcGRwKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcsIHVuc2lnbmVkIGVudHJ5LAogCiAJaW50ZWxfcmluZ19lbWl0KHJpbmcs IE1JX0xPQURfUkVHSVNURVJfSU1NKDEpKTsKIAlpbnRlbF9yaW5nX2VtaXQocmluZywgR0VOOF9S SU5HX1BEUF9VRFcocmluZywgZW50cnkpKTsKLQlpbnRlbF9yaW5nX2VtaXQocmluZywgKHUzMiko dmFsID4+IDMyKSk7CisJaW50ZWxfcmluZ19lbWl0KHJpbmcsIHVwcGVyXzMyX2JpdHMoYWRkcikp OwogCWludGVsX3JpbmdfZW1pdChyaW5nLCBNSV9MT0FEX1JFR0lTVEVSX0lNTSgxKSk7CiAJaW50 ZWxfcmluZ19lbWl0KHJpbmcsIEdFTjhfUklOR19QRFBfTERXKHJpbmcsIGVudHJ5KSk7Ci0JaW50 ZWxfcmluZ19lbWl0KHJpbmcsICh1MzIpKHZhbCkpOworCWludGVsX3JpbmdfZW1pdChyaW5nLCBs b3dlcl8zMl9iaXRzKGFkZHIpKTsKIAlpbnRlbF9yaW5nX2FkdmFuY2UocmluZyk7CiAKIAlyZXR1 cm4gMDsKQEAgLTQ3MywxMiArNDc0LDEyIEBAIHN0YXRpYyBpbnQgZ2VuOF9tbV9zd2l0Y2goc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogewogCWludCBpLCByZXQ7CiAKLQkvKiBiaXQgb2Yg YSBoYWNrIHRvIGZpbmQgdGhlIGFjdHVhbCBsYXN0IHVzZWQgcGQgKi8KLQlpbnQgdXNlZF9wZCA9 IHBwZ3R0LT5udW1fcGRfZW50cmllcyAvIEdFTjhfUERFU19QRVJfUEFHRTsKLQotCWZvciAoaSA9 IHVzZWRfcGQgLSAxOyBpID49IDA7IGktLSkgewotCQlkbWFfYWRkcl90IGFkZHIgPSBwcGd0dC0+ cGRwLnBhZ2VfZGlyZWN0b3J5W2ldLT5kYWRkcjsKLQkJcmV0ID0gZ2VuOF93cml0ZV9wZHAocmlu ZywgaSwgYWRkcik7CisJZm9yIChpID0gR0VOOF9MRUdBQ1lfUERQRVMgLSAxOyBpID49IDA7IGkt LSkgeworCQlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQgPSBwcGd0dC0+cGRw LnBhZ2VfZGlyZWN0b3J5W2ldOworCQlkbWFfYWRkcl90IHBkX2RhZGRyID0gcGQgPyBwZC0+ZGFk ZHIgOiBwcGd0dC0+c2NyYXRjaF9wZC0+ZGFkZHI7CisJCS8qIFRoZSBwYWdlIGRpcmVjdG9yeSBt aWdodCBiZSBOVUxMLCBidXQgd2UgbmVlZCB0byBjbGVhciBvdXQKKwkJICogd2hhdGV2ZXIgdGhl IHByZXZpb3VzIGNvbnRleHQgbWlnaHQgaGF2ZSB1c2VkLiAqLworCQlyZXQgPSBnZW44X3dyaXRl X3BkcChyaW5nLCBpLCBwZF9kYWRkcik7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCX0K QEAgLTgwMSwxMCArODAyLDE2IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9pbml0KHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCwgdWludDY0X3Qgc2l6ZSkKIAlwcGd0dC0+YmFzZS5zdGFydCA9 IDA7CiAJcHBndHQtPmJhc2UudG90YWwgPSBzaXplOwogCisJcHBndHQtPnNjcmF0Y2hfcGQgPSBh bGxvY19wdF9zY3JhdGNoKHBwZ3R0LT5iYXNlLmRldik7CisJaWYgKElTX0VSUihwcGd0dC0+c2Ny YXRjaF9wZCkpCisJCXJldHVybiBQVFJfRVJSKHBwZ3R0LT5zY3JhdGNoX3BkKTsKKwogCS8qIDEu IERvIGFsbCBvdXIgYWxsb2NhdGlvbnMgZm9yIHBhZ2UgZGlyZWN0b3JpZXMgYW5kIHBhZ2UgdGFi bGVzLiAqLwogCXJldCA9IGdlbjhfcHBndHRfYWxsb2MocHBndHQsIHBwZ3R0LT5iYXNlLnN0YXJ0 LCBwcGd0dC0+YmFzZS50b3RhbCk7Ci0JaWYgKHJldCkKKwlpZiAocmV0KSB7CisJCXVubWFwX2Fu ZF9mcmVlX3B0KHBwZ3R0LT5zY3JhdGNoX3BkLCBwcGd0dC0+YmFzZS5kZXYpOwogCQlyZXR1cm4g cmV0OworCX0KIAogCS8qCiAJICogMi4gQ3JlYXRlIERNQSBtYXBwaW5ncyBmb3IgdGhlIHBhZ2Ug ZGlyZWN0b3JpZXMgYW5kIHBhZ2UgdGFibGVzLgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu aAppbmRleCBmNDE2ZTAxLi40MGFjNDU3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu aApAQCAtMzA5LDcgKzMwOSwxMCBAQCBzdHJ1Y3QgaTkxNV9od19wcGd0dCB7CiAJCXN0cnVjdCBp OTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5IHBkOwogCX07CiAKLQlzdHJ1Y3QgaTkxNV9wYWdlX3Rh YmxlX2VudHJ5ICpzY3JhdGNoX3B0OworCXVuaW9uIHsKKwkJc3RydWN0IGk5MTVfcGFnZV90YWJs ZV9lbnRyeSAqc2NyYXRjaF9wdDsKKwkJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqc2Ny YXRjaF9wZDsgLyogSnVzdCBuZWVkIHRoZSBkYWRkciAqLworCX07CiAKIAlzdHJ1Y3QgZHJtX2k5 MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXY7CiAKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=