From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: [PATCH 04/12] drm/i915/bdw: Add ppgtt info for dynamic pages Date: Fri, 20 Feb 2015 17:45:58 +0000 Message-ID: <1424454366-19006-5-git-send-email-michel.thierry@intel.com> References: <1424454366-19006-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 043A06E70B for ; Fri, 20 Feb 2015 09:46:44 -0800 (PST) In-Reply-To: <1424454366-19006-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+CgpOb3RlIHRo YXQgdGhlcmUgaXMgbm8gZ2VuOCBwcGd0dCBkZWJ1Z19kdW1wIGZ1bmN0aW9uIHlldC4KClNpZ25l ZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KU2lnbmVkLW9mZi1ieTog TWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDE5ICsrKysrKysrKystLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgMzIgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIHwgIDkgKysr KysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCA0MDYzMGJkLi45M2MzNGFiIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMjE2NSw3ICsyMTY1LDYgQEAgc3Rh dGljIHZvaWQgZ2VuNl9wcGd0dF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7Ci0Jc3RydWN0IGRy bV9maWxlICpmaWxlOwogCWludCBpOwogCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDYp CkBAIC0yMTg5LDE0ICsyMTg4LDYgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbmZvKHN0cnVj dCBzZXFfZmlsZSAqbSwgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCQlwcGd0dC0+ZGVidWdf ZHVtcChwcGd0dCwgbSk7CiAJfQotCi0JbGlzdF9mb3JfZWFjaF9lbnRyeV9yZXZlcnNlKGZpbGUs ICZkZXYtPmZpbGVsaXN0LCBsaGVhZCkgewotCQlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRl ICpmaWxlX3ByaXYgPSBmaWxlLT5kcml2ZXJfcHJpdjsKLQotCQlzZXFfcHJpbnRmKG0sICJwcm9j OiAlc1xuIiwKLQkJCSAgIGdldF9waWRfdGFzayhmaWxlLT5waWQsIFBJRFRZUEVfUElEKS0+Y29t bSk7Ci0JCWlkcl9mb3JfZWFjaCgmZmlsZV9wcml2LT5jb250ZXh0X2lkciwgcGVyX2ZpbGVfY3R4 LCBtKTsKLQl9CiB9CiAKIHN0YXRpYyBpbnQgaTkxNV9wcGd0dF9pbmZvKHN0cnVjdCBzZXFfZmls ZSAqbSwgdm9pZCAqZGF0YSkKQEAgLTIyMDQsNiArMjE5NSw3IEBAIHN0YXRpYyBpbnQgaTkxNV9w cGd0dF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAlzdHJ1Y3QgZHJtX2lu Zm9fbm9kZSAqbm9kZSA9IG0tPnByaXZhdGU7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG5v ZGUtPm1pbm9yLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGU7CiAKIAlpbnQgcmV0ID0gbXV0 ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJaWYgKHJldCkKQEAg LTIyMTUsNiArMjIwNywxNSBAQCBzdGF0aWMgaW50IGk5MTVfcHBndHRfaW5mbyhzdHJ1Y3Qgc2Vx X2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0g NikKIAkJZ2VuNl9wcGd0dF9pbmZvKG0sIGRldik7CiAKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5X3Jl dmVyc2UoZmlsZSwgJmRldi0+ZmlsZWxpc3QsIGxoZWFkKSB7CisJCXN0cnVjdCBkcm1faTkxNV9m aWxlX3ByaXZhdGUgKmZpbGVfcHJpdiA9IGZpbGUtPmRyaXZlcl9wcml2OworCisJCXNlcV9wcmlu dGYobSwgIlxucHJvYzogJXNcbiIsCisJCQkgICBnZXRfcGlkX3Rhc2soZmlsZS0+cGlkLCBQSURU WVBFX1BJRCktPmNvbW0pOworCQlpZHJfZm9yX2VhY2goJmZpbGVfcHJpdi0+Y29udGV4dF9pZHIs IHBlcl9maWxlX2N0eCwKKwkJCSAgICAgKHZvaWQgKikodW5zaWduZWQgbG9uZyltKTsKKwl9CisK IAlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0 cnVjdF9tdXRleCk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggZWNmYjYy YS4uMWVkY2MxNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTIxMjUsNiAr MjEyNSwzOCBAQCBzdGF0aWMgdm9pZCBnZW44X2dndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVf YWRkcmVzc19zcGFjZSAqdm0sCiAJcmVhZGwoZ3R0X2Jhc2UpOwogfQogCit2b2lkIGdlbjhfZm9y X2V2ZXJ5X3BkcGVfcGRlKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKKwkJCSAgICAgdm9p ZCAoKmNhbGxiYWNrKShzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9wb2ludGVyX2VudHJ5ICpw ZHAsCisJCQkJCSAgICAgIHN0cnVjdCBpOTE1X3BhZ2VfZGlyZWN0b3J5X2VudHJ5ICpwZCwKKwkJ CQkJICAgICAgc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQsCisJCQkJCSAgICAgIHVu c2lnbmVkIHBkcGUsCisJCQkJCSAgICAgIHVuc2lnbmVkIHBkZSwKKwkJCQkJICAgICAgdm9pZCAq ZGF0YSksCisJCQkgICAgIHZvaWQgKmRhdGEpCit7CisJdWludDY0X3Qgc3RhcnQgPSBwcGd0dC0+ YmFzZS5zdGFydDsKKwl1aW50NjRfdCBsZW5ndGggPSBwcGd0dC0+YmFzZS50b3RhbDsKKwl1aW50 NjRfdCBwZHBlLCBwZGUsIHRlbXA7CisKKwlzdHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRy eSAqcGQ7CisJc3RydWN0IGk5MTVfcGFnZV90YWJsZV9lbnRyeSAqcHQ7CisKKwlnZW44X2Zvcl9l YWNoX3BkcGUocGQsICZwcGd0dC0+cGRwLCBzdGFydCwgbGVuZ3RoLCB0ZW1wLCBwZHBlKSB7CisJ CXVpbnQ2NF90IHBkX3N0YXJ0ID0gc3RhcnQsIHBkX2xlbmd0aCA9IGxlbmd0aDsKKwkJaW50IGk7 CisKKwkJaWYgKHBkID09IE5VTEwpIHsKKwkJCWZvciAoaSA9IDA7IGkgPCBHRU44X1BERVNfUEVS X1BBR0U7IGkrKykKKwkJCQljYWxsYmFjaygmcHBndHQtPnBkcCwgTlVMTCwgTlVMTCwgcGRwZSwg aSwgZGF0YSk7CisJCQljb250aW51ZTsKKwkJfQorCisJCWdlbjhfZm9yX2VhY2hfcGRlKHB0LCBw ZCwgcGRfc3RhcnQsIHBkX2xlbmd0aCwgdGVtcCwgcGRlKSB7CisJCQljYWxsYmFjaygmcHBndHQt PnBkcCwgcGQsIHB0LCBwZHBlLCBwZGUsIGRhdGEpOworCQl9CisJfQorfQorCiBzdGF0aWMgdm9p ZCBnZW42X2dndHRfY2xlYXJfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0sCiAJ CQkJICB1aW50NjRfdCBzdGFydCwKIAkJCQkgIHVpbnQ2NF90IGxlbmd0aCwKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmgKaW5kZXggYTMzYzZlOS4uMTQ0ODU4ZSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmgKQEAgLTQ4Myw2ICs0ODMsMTUgQEAgc3RhdGljIGlubGluZSBzaXpl X3QgZ2VuOF9wZGVfY291bnQodWludDY0X3QgYWRkciwgdWludDY0X3QgbGVuZ3RoKQogCXJldHVy biBpOTE1X3BkZV9pbmRleChlbmQsIEdFTjhfUERFX1NISUZUKSAtIGk5MTVfcGRlX2luZGV4KGFk ZHIsIEdFTjhfUERFX1NISUZUKTsKIH0KIAordm9pZCBnZW44X2Zvcl9ldmVyeV9wZHBlX3BkZShz dHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCisJCQkgICAgIHZvaWQgKCpjYWxsYmFjaykoc3Ry dWN0IGk5MTVfcGFnZV9kaXJlY3RvcnlfcG9pbnRlcl9lbnRyeSAqcGRwLAorCQkJCQkgICAgICBz dHJ1Y3QgaTkxNV9wYWdlX2RpcmVjdG9yeV9lbnRyeSAqcGQsCisJCQkJCSAgICAgIHN0cnVjdCBp OTE1X3BhZ2VfdGFibGVfZW50cnkgKnB0LAorCQkJCQkgICAgICB1bnNpZ25lZCBwZHBlLAorCQkJ CQkgICAgICB1bnNpZ25lZCBwZGUsCisJCQkJCSAgICAgIHZvaWQgKmRhdGEpLAorCQkJICAgICB2 b2lkICpkYXRhKTsKKwogaW50IGk5MTVfZ2VtX2d0dF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwogdm9pZCBpOTE1X2dlbV9pbml0X2dsb2JhbF9ndHQoc3RydWN0IGRybV9kZXZpY2UgKmRl dik7CiB2b2lkIGk5MTVfZ2xvYmFsX2d0dF9jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp OwotLSAKMi4xLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==