From: changbin.du@intel.com Subject: [PATCH v6 07/14] drm/i915/gvt: Split ppgtt_alloc_spt into two parts Date: Tue, 8 May 2018 17:05:09 +0800 Message-ID: <1525770316-5287-8-git-send-email-changbin.du@intel.com> References: <1525770316-5287-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: <1525770316-5287-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 RnJvbTogQ2hhbmdiaW4gRHUgPGNoYW5nYmluLmR1QGludGVsLmNvbT4KCldlIG5lZWQgYSBpbnRl cmZhY2UgdG8gYWxsb2NhdGUgYSBwdXJlIHNoYWRvdyBwYWdlIHdoaWNoIGRvZXNuJ3QgaGF2ZQph IGd1ZXN0IHBhZ2UgYXNzb2NpYXRlZCB3aXRoLiBTdWNoIHNoYWRvdyBwYWdlIGlzIHVzZWQgdG8g c2hhZG93IDJNCmh1Z2UgZ3R0IGVudHJ5LgoKU2lnbmVkLW9mZi1ieTogQ2hhbmdiaW4gRHUgPGNo YW5nYmluLmR1QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0LmMg fCA2MiArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQv Z3R0LmMKaW5kZXggMDk2NmVlNy4uMjJlNzdkNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvZ3Z0L2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9ndHQuYwpAQCAt NzM1LDEwICs3MzUsMTIgQEAgc3RhdGljIHZvaWQgcHBndHRfZnJlZV9zcHQoc3RydWN0IGludGVs X3ZncHVfcHBndHRfc3B0ICpzcHQpCiAKIAlyYWRpeF90cmVlX2RlbGV0ZSgmc3B0LT52Z3B1LT5n dHQuc3B0X3RyZWUsIHNwdC0+c2hhZG93X3BhZ2UubWZuKTsKIAotCWlmIChzcHQtPmd1ZXN0X3Bh Z2Uub29zX3BhZ2UpCi0JCWRldGFjaF9vb3NfcGFnZShzcHQtPnZncHUsIHNwdC0+Z3Vlc3RfcGFn ZS5vb3NfcGFnZSk7CisJaWYgKHNwdC0+Z3Vlc3RfcGFnZS5nZm4pIHsKKwkJaWYgKHNwdC0+Z3Vl c3RfcGFnZS5vb3NfcGFnZSkKKwkJCWRldGFjaF9vb3NfcGFnZShzcHQtPnZncHUsIHNwdC0+Z3Vl c3RfcGFnZS5vb3NfcGFnZSk7CiAKLQlpbnRlbF92Z3B1X3VucmVnaXN0ZXJfcGFnZV90cmFjayhz cHQtPnZncHUsIHNwdC0+Z3Vlc3RfcGFnZS5nZm4pOworCQlpbnRlbF92Z3B1X3VucmVnaXN0ZXJf cGFnZV90cmFjayhzcHQtPnZncHUsIHNwdC0+Z3Vlc3RfcGFnZS5nZm4pOworCX0KIAogCWxpc3Rf ZGVsX2luaXQoJnNwdC0+cG9zdF9zaGFkb3dfbGlzdCk7CiAJZnJlZV9zcHQoc3B0KTsKQEAgLTc5 OSw5ICs4MDEsOSBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBpbnRlbF92Z3B1X3BwZ3R0X3NwdCAq aW50ZWxfdmdwdV9maW5kX3NwdF9ieV9tZm4oCiAKIHN0YXRpYyBpbnQgcmVjbGFpbV9vbmVfcHBn dHRfbW0oc3RydWN0IGludGVsX2d2dCAqZ3Z0KTsKIAorLyogQWxsb2NhdGUgc2hhZG93IHBhZ2Ug dGFibGUgd2l0aG91dCBndWVzdCBwYWdlLiAqLwogc3RhdGljIHN0cnVjdCBpbnRlbF92Z3B1X3Bw Z3R0X3NwdCAqcHBndHRfYWxsb2Nfc3B0KAotCQlzdHJ1Y3QgaW50ZWxfdmdwdSAqdmdwdSwgaW50 IHR5cGUsIHVuc2lnbmVkIGxvbmcgZ2ZuLAotCQlib29sIGd1ZXN0X3BkZV9pcHMpCisJCXN0cnVj dCBpbnRlbF92Z3B1ICp2Z3B1LCBpbnRlbF9ndnRfZ3R0X3R5cGVfdCB0eXBlKQogewogCXN0cnVj dCBkZXZpY2UgKmtkZXYgPSAmdmdwdS0+Z3Z0LT5kZXZfcHJpdi0+ZHJtLnBkZXYtPmRldjsKIAlz dHJ1Y3QgaW50ZWxfdmdwdV9wcGd0dF9zcHQgKnNwdCA9IE5VTEw7CkBAIC04MzYsMjcgKzgzOCwx MiBAQCBzdGF0aWMgc3RydWN0IGludGVsX3ZncHVfcHBndHRfc3B0ICpwcGd0dF9hbGxvY19zcHQo CiAJc3B0LT5zaGFkb3dfcGFnZS52YWRkciA9IHBhZ2VfYWRkcmVzcyhzcHQtPnNoYWRvd19wYWdl LnBhZ2UpOwogCXNwdC0+c2hhZG93X3BhZ2UubWZuID0gZGFkZHIgPj4gSTkxNV9HVFRfUEFHRV9T SElGVDsKIAotCS8qCi0JICogSW5pdCBndWVzdF9wYWdlLgotCSAqLwotCXNwdC0+Z3Vlc3RfcGFn ZS50eXBlID0gdHlwZTsKLQlzcHQtPmd1ZXN0X3BhZ2UuZ2ZuID0gZ2ZuOwotCXNwdC0+Z3Vlc3Rf cGFnZS5wZGVfaXBzID0gZ3Vlc3RfcGRlX2lwczsKLQotCXJldCA9IGludGVsX3ZncHVfcmVnaXN0 ZXJfcGFnZV90cmFjayh2Z3B1LCBzcHQtPmd1ZXN0X3BhZ2UuZ2ZuLAotCQkJCQlwcGd0dF93cml0 ZV9wcm90ZWN0aW9uX2hhbmRsZXIsIHNwdCk7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfdW5tYXBf ZG1hOwotCiAJcmV0ID0gcmFkaXhfdHJlZV9pbnNlcnQoJnZncHUtPmd0dC5zcHRfdHJlZSwgc3B0 LT5zaGFkb3dfcGFnZS5tZm4sIHNwdCk7CiAJaWYgKHJldCkKLQkJZ290byBlcnJfdW5yZWdfcGFn ZV90cmFjazsKKwkJZ290byBlcnJfdW5tYXBfZG1hOwogCi0JdHJhY2Vfc3B0X2FsbG9jKHZncHUt PmlkLCBzcHQsIHR5cGUsIHNwdC0+c2hhZG93X3BhZ2UubWZuLCBnZm4pOwogCXJldHVybiBzcHQ7 CiAKLWVycl91bnJlZ19wYWdlX3RyYWNrOgotCWludGVsX3ZncHVfdW5yZWdpc3Rlcl9wYWdlX3Ry YWNrKHZncHUsIHNwdC0+Z3Vlc3RfcGFnZS5nZm4pOwogZXJyX3VubWFwX2RtYToKIAlkbWFfdW5t YXBfcGFnZShrZGV2LCBkYWRkciwgUEFHRV9TSVpFLCBQQ0lfRE1BX0JJRElSRUNUSU9OQUwpOwog ZXJyX2ZyZWVfc3B0OgpAQCAtODY0LDYgKzg1MSwzNyBAQCBzdGF0aWMgc3RydWN0IGludGVsX3Zn cHVfcHBndHRfc3B0ICpwcGd0dF9hbGxvY19zcHQoCiAJcmV0dXJuIEVSUl9QVFIocmV0KTsKIH0K IAorLyogQWxsb2NhdGUgc2hhZG93IHBhZ2UgdGFibGUgYXNzb2NpYXRlZCB3aXRoIHNwZWNpZmlj IGdmbi4gKi8KK3N0YXRpYyBzdHJ1Y3QgaW50ZWxfdmdwdV9wcGd0dF9zcHQgKnBwZ3R0X2FsbG9j X3NwdF9nZm4oCisJCXN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1LCBpbnRlbF9ndnRfZ3R0X3R5cGVf dCB0eXBlLAorCQl1bnNpZ25lZCBsb25nIGdmbiwgYm9vbCBndWVzdF9wZGVfaXBzKQoreworCXN0 cnVjdCBpbnRlbF92Z3B1X3BwZ3R0X3NwdCAqc3B0OworCWludCByZXQ7CisKKwlzcHQgPSBwcGd0 dF9hbGxvY19zcHQodmdwdSwgdHlwZSk7CisJaWYgKElTX0VSUihzcHQpKQorCQlyZXR1cm4gc3B0 OworCisJLyoKKwkgKiBJbml0IGd1ZXN0X3BhZ2UuCisJICovCisJcmV0ID0gaW50ZWxfdmdwdV9y ZWdpc3Rlcl9wYWdlX3RyYWNrKHZncHUsIGdmbiwKKwkJCXBwZ3R0X3dyaXRlX3Byb3RlY3Rpb25f aGFuZGxlciwgc3B0KTsKKwlpZiAocmV0KSB7CisJCXBwZ3R0X2ZyZWVfc3B0KHNwdCk7CisJCXJl dHVybiBFUlJfUFRSKHJldCk7CisJfQorCisJc3B0LT5ndWVzdF9wYWdlLnR5cGUgPSB0eXBlOwor CXNwdC0+Z3Vlc3RfcGFnZS5nZm4gPSBnZm47CisJc3B0LT5ndWVzdF9wYWdlLnBkZV9pcHMgPSBn dWVzdF9wZGVfaXBzOworCisJdHJhY2Vfc3B0X2FsbG9jKHZncHUtPmlkLCBzcHQsIHR5cGUsIHNw dC0+c2hhZG93X3BhZ2UubWZuLCBnZm4pOworCisJcmV0dXJuIHNwdDsKK30KKwogI2RlZmluZSBw dF9lbnRyeV9zaXplX3NoaWZ0KHNwdCkgXAogCSgoc3B0KS0+dmdwdS0+Z3Z0LT5kZXZpY2VfaW5m by5ndHRfZW50cnlfc2l6ZV9zaGlmdCkKIApAQCAtMTAxOSw3ICsxMDM3LDcgQEAgc3RhdGljIHN0 cnVjdCBpbnRlbF92Z3B1X3BwZ3R0X3NwdCAqcHBndHRfcG9wdWxhdGVfc3B0X2J5X2d1ZXN0X2Vu dHJ5KAogCQlpZiAod2UtPnR5cGUgPT0gR1RUX1RZUEVfUFBHVFRfUERFX0VOVFJZKQogCQkJaXBz ID0gdmdwdV9pcHNfZW5hYmxlZCh2Z3B1KSAmJiBvcHMtPnRlc3RfaXBzKHdlKTsKIAotCQlzcHQg PSBwcGd0dF9hbGxvY19zcHQodmdwdSwgdHlwZSwgb3BzLT5nZXRfcGZuKHdlKSwgaXBzKTsKKwkJ c3B0ID0gcHBndHRfYWxsb2Nfc3B0X2dmbih2Z3B1LCB0eXBlLCBvcHMtPmdldF9wZm4od2UpLCBp cHMpOwogCQlpZiAoSVNfRVJSKHNwdCkpIHsKIAkJCXJldCA9IFBUUl9FUlIoc3B0KTsKIAkJCWdv dG8gZmFpbDsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK