From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 11/18] drm/i915: support inserting 1G pages in the ppgtt Date: Tue, 4 Apr 2017 23:11:21 +0100 Message-ID: <20170404221128.3943-12-matthew.auld@intel.com> References: <20170404221128.3943-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 39AC16E6EC for ; Tue, 4 Apr 2017 22:11:42 +0000 (UTC) In-Reply-To: <20170404221128.3943-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 U2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgNDUgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmggfCAgMiArKwogMiBmaWxlcyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCA5ZGMxMjk1NWY1NTcuLjUyNjkwOTJiYTA0OCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTg0OCw2ICs4NDgsNDggQEAgc3RhdGlj IF9fYWx3YXlzX2lubGluZSBzdHJ1Y3QgZ2VuOF9pbnNlcnRfcHRlIGdlbjhfaW5zZXJ0X3B0ZSh1 NjQgc3RhcnQpCiB9CiAKIHN0YXRpYyBfX2Fsd2F5c19pbmxpbmUgYm9vbAorZ2VuOF9wcGd0dF9p bnNlcnRfMUdfcGRwZV9lbnRyaWVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKKwkJCQkg IHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50ZXIgKnBkcCwKKwkJCQkgIHN0cnVjdCBz Z3RfZG1hICppdGVyLAorCQkJCSAgc3RydWN0IGdlbjhfaW5zZXJ0X3B0ZSAqaWR4LAorCQkJCSAg ZW51bSBpOTE1X2NhY2hlX2xldmVsIGNhY2hlX2xldmVsKQoreworCWNvbnN0IGdlbjhfcHRlX3Qg cGRwZV9lbmNvZGUgPSBnZW44X3B0ZV9lbmNvZGUoR0VOOF9QRFBFX1BTXzFHLAorCQkJCQkJICAg ICAgIGNhY2hlX2xldmVsKTsKKwlnZW44X3B0ZV90ICp2YWRkcjsKKwlib29sIHJldDsKKworCUdF TV9CVUdfT04oaWR4LT5wdGUpOworCUdFTV9CVUdfT04oaWR4LT5wZGUpOworCUdFTV9CVUdfT04o aWR4LT5wZHBlID49IGk5MTVfcGRwZXNfcGVyX3BkcCgmcHBndHQtPmJhc2UpKTsKKwl2YWRkciA9 IGttYXBfYXRvbWljX3B4KHBkcCk7CisJZG8geworCQl2YWRkcltpZHgtPnBkcGVdID0gcGRwZV9l bmNvZGUgfCBpdGVyLT5kbWE7CisJCWl0ZXItPmRtYSArPSBJOTE1X0dUVF9QQUdFX1NJWkVfMUc7 CisJCWlmIChpdGVyLT5kbWEgPj0gaXRlci0+bWF4KSB7CisJCQlpdGVyLT5zZyA9IF9fc2dfbmV4 dChpdGVyLT5zZyk7CisJCQlpZiAoIWl0ZXItPnNnKSB7CisJCQkJcmV0ID0gZmFsc2U7CisJCQkJ YnJlYWs7CisJCQl9CisKKwkJCWl0ZXItPmRtYSA9IHNnX2RtYV9hZGRyZXNzKGl0ZXItPnNnKTsK KwkJCWl0ZXItPm1heCA9IGl0ZXItPmRtYSArIGl0ZXItPnNnLT5sZW5ndGg7CisJCX0KKworCQlp ZiAoKytpZHgtPnBkcGUgPT0gR0VOOF9QTUw0RVNfUEVSX1BNTDQpIHsKKwkJCWlkeC0+cGRwZSA9 IDA7CisJCQlyZXQgPSB0cnVlOworCQkJYnJlYWs7CisJCX0KKworCX0gd2hpbGUgKDEpOworCWt1 bm1hcF9hdG9taWModmFkZHIpOworCisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIF9fYWx3YXlz X2lubGluZSBib29sCiBnZW44X3BwZ3R0X2luc2VydF8yTV9wZGVfZW50cmllcyhzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQsCiAJCQkJIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X3BvaW50 ZXIgKnBkcCwKIAkJCQkgc3RydWN0IHNndF9kbWEgKml0ZXIsCkBAIC0xMDcxLDYgKzExMTMsOSBA QCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF80bHZsKHN0cnVjdCBpOTE1X2FkZHJlc3Nf c3BhY2UgKnZtLAogCWNhc2UgSTkxNV9HVFRfUEFHRV9TSVpFXzJNOgogCQlpbnNlcnRfZW50cmll cyA9IGdlbjhfcHBndHRfaW5zZXJ0XzJNX3BkZV9lbnRyaWVzOwogCQlicmVhazsKKwljYXNlIEk5 MTVfR1RUX1BBR0VfU0laRV8xRzoKKwkJaW5zZXJ0X2VudHJpZXMgPSBnZW44X3BwZ3R0X2luc2Vy dF8xR19wZHBlX2VudHJpZXM7CisJCWJyZWFrOwogCWRlZmF1bHQ6CiAJCU1JU1NJTkdfQ0FTRShw YWdlX3NpemUpOwogCQlyZXR1cm47CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4 IGNmZTMxZGI2YjQwMC4uOGI5NzBlOWU3NjRjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9n dHQuaApAQCAtMTYxLDYgKzE2MSw4IEBAIHR5cGVkZWYgdTY0IGdlbjhfcHBndHRfcG1sNGVfdDsK ICNkZWZpbmUgR0VOOF9QREVfSVBTXzY0SyBCSVQoMTEpCiAjZGVmaW5lIEdFTjhfUERFX1BTXzJN ICAgQklUKDcpCiAKKyNkZWZpbmUgR0VOOF9QRFBFX1BTXzFHICBCSVQoNykKKwogc3RydWN0IHNn X3RhYmxlOwogCiBzdHJ1Y3QgaW50ZWxfcm90YXRpb25faW5mbyB7Ci0tIAoyLjkuMwoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==