From: changbin.du@intel.com Subject: [PATCH v5 11/14] drm/i915/gvt: Add 2M huge gtt support Date: Mon, 7 May 2018 15:21:50 +0800 Message-ID: <1525677713-8395-12-git-send-email-changbin.du@intel.com> References: <1525677713-8395-1-git-send-email-changbin.du@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1525677713-8395-1-git-send-email-changbin.du@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-gvt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQ2hhbmdiaW4gRHUgPGNoYW5nYmluLmR1QGludGVsLmNvbT4KClRoaXMgYWRkIDJNIGh1 Z2UgZ3R0IHN1cHBvcnQgZm9yIEdWVGcuIFVubGlrZSA2NEsgZ3R0IGVudHJ5LCB3ZSBjYW4Kc2hh ZG93IDJNIGd1ZXN0IGVudHJ5IHdpdGggcmVhbCBodWdlIGd0dC4gQnV0IGJlZm9yZSB0aGF0LCB3 ZSBoYXZlIHRvCmNoZWNrIG1lbW9yeSBwaHlzaWNhbCBjb250aW51b3VzLCBhbGlnbm1lbnQgYW5k IGlmIGl0IGlzIHN1cHBvcnRlZCBvbgp0aGUgaG9zdC4gV2UgY2FuIGdldCBhbGwgc3VwcG9ydGVk IHBhZ2Ugc2l6ZXMgZnJvbQppbnRlbF9kZXZpY2VfaW5mby5wYWdlX3NpemVzLgoKRmluYWxseSB3 ZSBtdXN0IHNwbGl0IHRoZSAyTSBwYWdlIGludG8gc21hbGxlciBwYWdlcyBpZiB3ZSBjYW5ub3QK c2F0aXNmeSBndWVzdCBIdWdlIFBhZ2UuCgpTaWduZWQtb2ZmLWJ5OiBDaGFuZ2JpbiBEdSA8Y2hh bmdiaW4uZHVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9ndHQuYyB8 IDEwMCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLQogMSBmaWxlIGNo YW5nZWQsIDk1IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d0 dC5jCmluZGV4IGZmZWVjZGEuLmJmNzE4YTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2d2dC9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0LmMKQEAgLTkw Miw2ICs5MDIsMTEgQEAgc3RhdGljIHN0cnVjdCBpbnRlbF92Z3B1X3BwZ3R0X3NwdCAqcHBndHRf YWxsb2Nfc3B0X2dmbigKIAkJaWYgKCFwcGd0dF9nZXRfc2hhZG93X2VudHJ5KHNwdCwgZSwgaSkg JiYgXAogCQkgICAgc3B0LT52Z3B1LT5ndnQtPmd0dC5wdGVfb3BzLT50ZXN0X3ByZXNlbnQoZSkp CiAKKyNkZWZpbmUgZm9yX2VhY2hfc2hhZG93X2VudHJ5KHNwdCwgZSwgaSkgXAorCWZvciAoaSA9 IDA7IGkgPCBwdF9lbnRyaWVzKHNwdCk7IFwKKwkgICAgIGkgKz0gKHNwdC0+c2hhZG93X3BhZ2Uu cGRlX2lwcyA/IEdUVF82NEtfUFRFX1NUUklERSA6IDEpKSBcCisJCWlmICghcHBndHRfZ2V0X3No YWRvd19lbnRyeShzcHQsIGUsIGkpKQorCiBzdGF0aWMgdm9pZCBwcGd0dF9nZXRfc3B0KHN0cnVj dCBpbnRlbF92Z3B1X3BwZ3R0X3NwdCAqc3B0KQogewogCWludCB2ID0gYXRvbWljX3JlYWQoJnNw dC0+cmVmY291bnQpOwpAQCAtOTQ5LDcgKzk1NCw4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBwcGd0 dF9pbnZhbGlkYXRlX3B0ZShzdHJ1Y3QgaW50ZWxfdmdwdV9wcGd0dF9zcHQgKnNwdCwKIAlwZm4g PSBvcHMtPmdldF9wZm4oZW50cnkpOwogCXR5cGUgPSBzcHQtPnNoYWRvd19wYWdlLnR5cGU7CiAK LQlpZiAocGZuID09IHZncHUtPmd0dC5zY3JhdGNoX3B0W3R5cGVdLnBhZ2VfbWZuKQorCS8qIFVu aW5pdGlhbGl6ZWQgc3B0ZSBvciB1bnNoYWRvd2VkIHNwdGUuICovCisJaWYgKCFwZm4gfHwgcGZu ID09IHZncHUtPmd0dC5zY3JhdGNoX3B0W3R5cGVdLnBhZ2VfbWZuKQogCQlyZXR1cm47CiAKIAlp bnRlbF9ndnRfaHlwZXJ2aXNvcl9kbWFfdW5tYXBfZ3Vlc3RfcGFnZSh2Z3B1LCBwZm4gPDwgUEFH RV9TSElGVCk7CkBAIC05ODIsOCArOTg4LDEwIEBAIHN0YXRpYyBpbnQgcHBndHRfaW52YWxpZGF0 ZV9zcHQoc3RydWN0IGludGVsX3ZncHVfcHBndHRfc3B0ICpzcHQpCiAJCQlXQVJOKDEsICJzdXNw aWNpb3VzIDY0SyBndHQgZW50cnlcbiIpOwogCQkJY29udGludWU7CiAJCWNhc2UgR1RUX1RZUEVf UFBHVFRfUFRFXzJNX0VOVFJZOgorCQkJZ3Z0X3ZkYmdfbW0oImludmFsaWRhdGUgMk0gZW50cnlc biIpOworCQkJY29udGludWU7CiAJCWNhc2UgR1RUX1RZUEVfUFBHVFRfUFRFXzFHX0VOVFJZOgot CQkJV0FSTigxLCAiR1ZUIGRvZXNuJ3Qgc3VwcG9ydCAyTS8xR0IgcGFnZVxuIik7CisJCQlXQVJO KDEsICJHVlQgZG9lc24ndCBzdXBwb3J0IDFHQiBwYWdlXG4iKTsKIAkJCWNvbnRpbnVlOwogCQlj YXNlIEdUVF9UWVBFX1BQR1RUX1BNTDRfRU5UUlk6CiAJCWNhc2UgR1RUX1RZUEVfUFBHVFRfUERQ X0VOVFJZOgpAQCAtMTA4Myw2ICsxMDkxLDczIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBwcGd0dF9n ZW5lcmF0ZV9zaGFkb3dfZW50cnkoc3RydWN0IGludGVsX2d2dF9ndHRfZW50cnkgKnNlLAogCW9w cy0+c2V0X3BmbihzZSwgcy0+c2hhZG93X3BhZ2UubWZuKTsKIH0KIAorLyoqCisgKiBSZXR1cm4g MSBpZiAyTUIgaHVnZSBndHQgc2hhZG93aW5nIGlzIHBvc3NpbGJlLCAwIGlmIG1pc2NvbmRpdGlv biwKKyAqIG5lZ3RpdmUgaWYgZm91bmQgZXJyLgorICovCitzdGF0aWMgaW50IGlzXzJNQl9ndHRf cG9zc2libGUoc3RydWN0IGludGVsX3ZncHUgKnZncHUsCisJc3RydWN0IGludGVsX2d2dF9ndHRf ZW50cnkgKmVudHJ5KQoreworCXN0cnVjdCBpbnRlbF9ndnRfZ3R0X3B0ZV9vcHMgKm9wcyA9IHZn cHUtPmd2dC0+Z3R0LnB0ZV9vcHM7CisJdW5zaWduZWQgbG9uZyBwZm47CisKKwlpZiAoIUhBU19Q QUdFX1NJWkVTKHZncHUtPmd2dC0+ZGV2X3ByaXYsIEk5MTVfR1RUX1BBR0VfU0laRV8yTSkpCisJ CXJldHVybiAwOworCisJcGZuID0gaW50ZWxfZ3Z0X2h5cGVydmlzb3JfZ2ZuX3RvX21mbih2Z3B1 LCBvcHMtPmdldF9wZm4oZW50cnkpKTsKKwlpZiAocGZuID09IElOVEVMX0dWVF9JTlZBTElEX0FE RFIpCisJCXJldHVybiAtRUlOVkFMOworCisJcmV0dXJuIFBhZ2VUcmFuc0h1Z2UocGZuX3RvX3Bh Z2UocGZuKSk7Cit9CisKK3N0YXRpYyBpbnQgc3BsaXRfMk1CX2d0dF9lbnRyeShzdHJ1Y3QgaW50 ZWxfdmdwdSAqdmdwdSwKKwlzdHJ1Y3QgaW50ZWxfdmdwdV9wcGd0dF9zcHQgKnNwdCwgdW5zaWdu ZWQgbG9uZyBpbmRleCwKKwlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9lbnRyeSAqc2UpCit7CisJc3Ry dWN0IGludGVsX2d2dF9ndHRfcHRlX29wcyAqb3BzID0gdmdwdS0+Z3Z0LT5ndHQucHRlX29wczsK KwlzdHJ1Y3QgaW50ZWxfdmdwdV9wcGd0dF9zcHQgKnN1Yl9zcHQ7CisJc3RydWN0IGludGVsX2d2 dF9ndHRfZW50cnkgc3ViX3NlOworCXVuc2lnbmVkIGxvbmcgc3RhcnRfZ2ZuOworCWRtYV9hZGRy X3QgZG1hX2FkZHI7CisJdW5zaWduZWQgbG9uZyBzdWJfaW5kZXg7CisJaW50IHJldDsKKworCWd2 dF9kYmdfbW0oIlNwbGl0IDJNIGd0dCBlbnRyeSwgaW5kZXggJWx1XG4iLCBpbmRleCk7CisKKwlz dGFydF9nZm4gPSBvcHMtPmdldF9wZm4oc2UpOworCisJc3ViX3NwdCA9IHBwZ3R0X2FsbG9jX3Nw dCh2Z3B1LCBHVFRfVFlQRV9QUEdUVF9QVEVfUFQpOworCWlmIChJU19FUlIoc3ViX3NwdCkpCisJ CXJldHVybiBQVFJfRVJSKHN1Yl9zcHQpOworCisJZm9yX2VhY2hfc2hhZG93X2VudHJ5KHN1Yl9z cHQsICZzdWJfc2UsIHN1Yl9pbmRleCkgeworCQlyZXQgPSBpbnRlbF9ndnRfaHlwZXJ2aXNvcl9k bWFfbWFwX2d1ZXN0X3BhZ2UodmdwdSwKKwkJCQlzdGFydF9nZm4gKyBzdWJfaW5kZXgsIFBBR0Vf U0laRSwgJmRtYV9hZGRyKTsKKwkJaWYgKHJldCkgeworCQkJcHBndHRfaW52YWxpZGF0ZV9zcHQo c3B0KTsKKwkJCXJldHVybiByZXQ7CisJCX0KKwkJc3ViX3NlLnZhbDY0ID0gc2UtPnZhbDY0Owor CisJCS8qIENvcHkgdGhlIFBBVCBmaWVsZCBmcm9tIFBERS4gKi8KKwkJc3ViX3NlLnZhbDY0ICY9 IH5fUEFHRV9QQVQ7CisJCXN1Yl9zZS52YWw2NCB8PSAoc2UtPnZhbDY0ICYgX1BBR0VfUEFUX0xB UkdFKSA+PiA1OworCisJCW9wcy0+c2V0X3Bmbigmc3ViX3NlLCBkbWFfYWRkciA+PiBQQUdFX1NI SUZUKTsKKwkJcHBndHRfc2V0X3NoYWRvd19lbnRyeShzdWJfc3B0LCAmc3ViX3NlLCBzdWJfaW5k ZXgpOworCX0KKworCS8qIENsZWFyIGRpcnR5IGZpZWxkLiAqLworCXNlLT52YWw2NCAmPSB+X1BB R0VfRElSVFk7CisKKwlvcHMtPmNsZWFyX3BzZShzZSk7CisJb3BzLT5jbGVhcl9pcHMoc2UpOwor CW9wcy0+c2V0X3BmbihzZSwgc3ViX3NwdC0+c2hhZG93X3BhZ2UubWZuKTsKKwlwcGd0dF9zZXRf c2hhZG93X2VudHJ5KHNwdCwgc2UsIGluZGV4KTsKKwlyZXR1cm4gMDsKK30KKwogc3RhdGljIGlu dCBzcGxpdF82NEtCX2d0dF9lbnRyeShzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwKIAlzdHJ1Y3Qg aW50ZWxfdmdwdV9wcGd0dF9zcHQgKnNwdCwgdW5zaWduZWQgbG9uZyBpbmRleCwKIAlzdHJ1Y3Qg aW50ZWxfZ3Z0X2d0dF9lbnRyeSAqc2UpCkBAIC0xMTIwLDcgKzExOTUsNyBAQCBzdGF0aWMgaW50 IHBwZ3R0X3BvcHVsYXRlX3NoYWRvd19lbnRyeShzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwKIHsK IAlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9wdGVfb3BzICpwdGVfb3BzID0gdmdwdS0+Z3Z0LT5ndHQu cHRlX29wczsKIAlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9lbnRyeSBzZSA9ICpnZTsKLQl1bnNpZ25l ZCBsb25nIGdmbjsKKwl1bnNpZ25lZCBsb25nIGdmbiwgcGFnZV9zaXplID0gUEFHRV9TSVpFOwog CWRtYV9hZGRyX3QgZG1hX2FkZHI7CiAJaW50IHJldDsKIApAQCAtMTE0MiwxNSArMTIxNywyNCBA QCBzdGF0aWMgaW50IHBwZ3R0X3BvcHVsYXRlX3NoYWRvd19lbnRyeShzdHJ1Y3QgaW50ZWxfdmdw dSAqdmdwdSwKIAkJICovCiAJCXJldHVybiBzcGxpdF82NEtCX2d0dF9lbnRyeSh2Z3B1LCBzcHQs IGluZGV4LCAmc2UpOwogCWNhc2UgR1RUX1RZUEVfUFBHVFRfUFRFXzJNX0VOVFJZOgorCQlndnRf dmRiZ19tbSgic2hhZG93IDJNIGd0dCBlbnRyeVxuIik7CisJCXJldCA9IGlzXzJNQl9ndHRfcG9z c2libGUodmdwdSwgZ2UpOworCQlpZiAocmV0ID09IDApCisJCQlyZXR1cm4gc3BsaXRfMk1CX2d0 dF9lbnRyeSh2Z3B1LCBzcHQsIGluZGV4LCAmc2UpOworCQllbHNlIGlmIChyZXQgPCAwKQorCQkJ cmV0dXJuIHJldDsKKwkJcGFnZV9zaXplID0gSTkxNV9HVFRfUEFHRV9TSVpFXzJNOworCQlicmVh azsKIAljYXNlIEdUVF9UWVBFX1BQR1RUX1BURV8xR19FTlRSWToKLQkJZ3Z0X3ZncHVfZXJyKCJH VlQgZG9lc24ndCBzdXBwb3J0IDJNLzFHQiBlbnRyeVxuIik7CisJCWd2dF92Z3B1X2VycigiR1ZU IGRvZXNuJ3Qgc3VwcG9ydCAxR0IgZW50cnlcbiIpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAlkZWZh dWx0OgogCQlHRU1fQlVHX09OKDEpOwogCX07CiAKIAkvKiBkaXJlY3Qgc2hhZG93ICovCi0JcmV0 ID0gaW50ZWxfZ3Z0X2h5cGVydmlzb3JfZG1hX21hcF9ndWVzdF9wYWdlKHZncHUsIGdmbiwgUEFH RV9TSVpFLCAmZG1hX2FkZHIpOworCXJldCA9IGludGVsX2d2dF9oeXBlcnZpc29yX2RtYV9tYXBf Z3Vlc3RfcGFnZSh2Z3B1LCBnZm4sIHBhZ2Vfc2l6ZSwKKwkJCQkJCSAgICAgICZkbWFfYWRkcik7 CiAJaWYgKHJldCkKIAkJcmV0dXJuIC1FTlhJTzsKIApAQCAtMTQ5Myw2ICsxNTc3LDEyIEBAIHN0 YXRpYyBpbnQgcHBndHRfaGFuZGxlX2d1ZXN0X3dyaXRlX3BhZ2VfdGFibGUoCiAJCQkJCXZncHUt Pmd0dC5zY3JhdGNoX3B0W3R5cGVdLnBhZ2VfbWZuKTsKIAkJCQlwcGd0dF9zZXRfc2hhZG93X2Vu dHJ5KHNwdCwgJm9sZF9zZSwgaW5kZXggKyBpKTsKIAkJCX0KKwkJfSBlbHNlIGlmIChvbGRfc2Uu dHlwZSA9PSBHVFRfVFlQRV9QUEdUVF9QVEVfMk1fRU5UUlkgfHwKKwkJCSAgIG9sZF9zZS50eXBl ID09IEdUVF9UWVBFX1BQR1RUX1BURV8xR19FTlRSWSkgeworCQkJb3BzLT5jbGVhcl9wc2UoJm9s ZF9zZSk7CisJCQlvcHMtPnNldF9wZm4oJm9sZF9zZSwKKwkJCQkgICAgIHZncHUtPmd0dC5zY3Jh dGNoX3B0W3R5cGVdLnBhZ2VfbWZuKTsKKwkJCXBwZ3R0X3NldF9zaGFkb3dfZW50cnkoc3B0LCAm b2xkX3NlLCBpbmRleCk7CiAJCX0gZWxzZSB7CiAJCQlvcHMtPnNldF9wZm4oJm9sZF9zZSwKIAkJ CQkgICAgIHZncHUtPmd0dC5zY3JhdGNoX3B0W3R5cGVdLnBhZ2VfbWZuKTsKLS0gCjIuNy40Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK