From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 2/7] drm/i915: Use GGTT view when (un)pinning objects to planes Date: Mon, 23 Mar 2015 11:10:33 +0000 Message-ID: <1427109038-19597-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1427109038-19597-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id DAB3772017 for ; Mon, 23 Mar 2015 04:10:51 -0700 (PDT) In-Reply-To: <1427109038-19597-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRvIHN1cHBv cnQgZnJhbWUgYnVmZmVyIHJvdGF0aW9uIHdlIG5lZWQgdG8gYmUgYWJsZSB0byBwYXNzIG9uIHRo ZSBpbmZvcm1hdGlvbgpvbiB3aGF0IGtpbmQgb2YgR0dUVCB2aWV3IGlzIHJlcXVpcmVkIGZvciBk aXNwbGF5LgoKVGhpcyBwYXRjaCBqdXN0IGFkZHMgdGhlIHBhcmFtZXRlciBhbmQgbWFrZXMgYWxs IHRoZSBjYWxsZXJzIGRlZmF1bHQgdG8gdGhlCm5vcm1hbCB2aWV3LgoKdjI6IFJlYmFzZWQgZm9y IGdndHQgdmlldyBjaGFuZ2VzLgp2MzogRG9uJ3QgbGltaXQgUElOX01BUFBBQkxFIHRvIG5vcm1h bCB2aWV3cyBqdXN0IHlldC4gKEpvb25hcyBMYWh0aW5lbikKClNpZ25lZC1vZmYtYnk6IFR2cnRr byBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgMTQgKysrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMgICAgICB8IDIwICsrKysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgNyArKysrLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9vdmVybGF5LmMgfCAgMyArKy0KIDQgZmlsZXMgY2hhbmdlZCwgMjkgaW5z ZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg ZWIzOGNkMS4uZTdlZDViMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNzY1LDggKzI3 NjUsMTAgQEAgaTkxNV9nZW1fb2JqZWN0X3NldF90b19jcHVfZG9tYWluKHN0cnVjdCBkcm1faTkx NV9nZW1fb2JqZWN0ICpvYmosIGJvb2wgd3JpdGUpOwogaW50IF9fbXVzdF9jaGVjawogaTkxNV9n ZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmosCiAJCQkJICAgICB1MzIgYWxpZ25tZW50LAotCQkJCSAgICAgc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcGlwZWxpbmVkKTsKLXZvaWQgaTkxNV9nZW1fb2JqZWN0X3VucGluX2Zyb21fZGlz cGxheV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKKwkJCQkgICAgIHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnBpcGVsaW5lZCwKKwkJCQkgICAgIGNvbnN0IHN0cnVjdCBp OTE1X2dndHRfdmlldyAqdmlldyk7Cit2b2lkIGk5MTVfZ2VtX29iamVjdF91bnBpbl9mcm9tX2Rp c3BsYXlfcGxhbmUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKKwkJCQkJICAgICAg Y29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3KTsKIGludCBpOTE1X2dlbV9vYmplY3Rf YXR0YWNoX3BoeXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCQlpbnQgYWxp Z24pOwogaW50IGk5MTVfZ2VtX29wZW4oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRy bV9maWxlICpmaWxlKTsKQEAgLTI4NzUsNyArMjg3NywxMyBAQCBpOTE1X2dlbV9vYmplY3RfZ2d0 dF91bmJpbmQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAlyZXR1cm4gaTkxNV92 bWFfdW5iaW5kKGk5MTVfZ2VtX29ial90b19nZ3R0KG9iaikpOwogfQogCi12b2lkIGk5MTVfZ2Vt X29iamVjdF9nZ3R0X3VucGluKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopOwordm9p ZCBpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbl92aWV3KHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmosCisJCQkJICAgICBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpOwor c3RhdGljIGlubGluZSB2b2lkCitpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqKQoreworCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluX3Zp ZXcob2JqLCAmaTkxNV9nZ3R0X3ZpZXdfbm9ybWFsKTsKK30KIAogLyogaTkxNV9nZW1fY29udGV4 dC5jICovCiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2NvbnRleHRfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDg0ZTJhMjMuLjczYjI2 MzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMzg3MSw3ICszODcxLDggQEAgc3RhdGlj IGJvb2wgaXNfcGluX2Rpc3BsYXkoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIGlu dAogaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmosCiAJCQkJICAgICB1MzIgYWxpZ25tZW50LAotCQkJCSAgICAgc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcGlwZWxpbmVkKQorCQkJCSAgICAgc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcGlwZWxpbmVkLAorCQkJCSAgICAgY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2 aWV3KQogewogCXUzMiBvbGRfcmVhZF9kb21haW5zLCBvbGRfd3JpdGVfZG9tYWluOwogCWJvb2wg d2FzX3Bpbl9kaXNwbGF5OwpAQCAtMzkwNyw3ICszOTA4LDcgQEAgaTkxNV9nZW1fb2JqZWN0X3Bp bl90b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJICog KGUuZy4gbGlia21zIGZvciB0aGUgYm9vdHVwIHNwbGFzaCksIHdlIGhhdmUgdG8gZW5zdXJlIHRo YXQgd2UKIAkgKiBhbHdheXMgdXNlIG1hcF9hbmRfZmVuY2VhYmxlIGZvciBhbGwgc2Nhbm91dCBi dWZmZXJzLgogCSAqLwotCXJldCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihvYmosIGFsaWdubWVu dCwgUElOX01BUFBBQkxFKTsKKwlyZXQgPSBpOTE1X2dlbV9vYmplY3RfZ2d0dF9waW4ob2JqLCB2 aWV3LCBhbGlnbm1lbnQsIFBJTl9NQVBQQUJMRSk7CiAJaWYgKHJldCkKIAkJZ290byBlcnJfdW5w aW5fZGlzcGxheTsKIApAQCAtMzkzNSw5ICszOTM2LDExIEBAIGVycl91bnBpbl9kaXNwbGF5Ogog fQogCiB2b2lkCi1pOTE1X2dlbV9vYmplY3RfdW5waW5fZnJvbV9kaXNwbGF5X3BsYW5lKHN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCitpOTE1X2dlbV9vYmplY3RfdW5waW5fZnJvbV9k aXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCisJCQkJCSBjb25z dCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpCiB7Ci0JaTkxNV9nZW1fb2JqZWN0X2dndHRf dW5waW4ob2JqKTsKKwlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbl92aWV3KG9iaiwgdmlldyk7 CisKIAlvYmotPnBpbl9kaXNwbGF5ID0gaXNfcGluX2Rpc3BsYXkob2JqKTsKIH0KIApAQCAtNDIx NCwxNSArNDIxNywxNiBAQCBpOTE1X2dlbV9vYmplY3RfZ2d0dF9waW4oc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm9iaiwKIH0KIAogdm9pZAotaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4o c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKK2k5MTVfZ2VtX29iamVjdF9nZ3R0X3Vu cGluX3ZpZXcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKKwkJCQljb25zdCBzdHJ1 Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpCiB7Ci0Jc3RydWN0IGk5MTVfdm1hICp2bWEgPSBpOTE1 X2dlbV9vYmpfdG9fZ2d0dChvYmopOworCXN0cnVjdCBpOTE1X3ZtYSAqdm1hID0gaTkxNV9nZW1f b2JqX3RvX2dndHRfdmlldyhvYmosIHZpZXcpOwogCiAJQlVHX09OKCF2bWEpOwogCUJVR19PTih2 bWEtPnBpbl9jb3VudCA9PSAwKTsKLQlCVUdfT04oIWk5MTVfZ2VtX29ial9nZ3R0X2JvdW5kKG9i aikpOworCUJVR19PTighaTkxNV9nZW1fb2JqX2dndHRfYm91bmRfdmlldyhvYmosIHZpZXctPnR5 cGUpKTsKIAotCWlmICgtLXZtYS0+cGluX2NvdW50ID09IDApCisJaWYgKC0tdm1hLT5waW5fY291 bnQgPT0gMCAmJiB2aWV3LT50eXBlID09IEk5MTVfR0dUVF9WSUVXX05PUk1BTCkKIAkJb2JqLT5w aW5fbWFwcGFibGUgPSBmYWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IDNiOWNlODkuLjM5MzgwZjQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTIzNTAsNyArMjM1MCw4IEBAIGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAogCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKIAog CWRldl9wcml2LT5tbS5pbnRlcnJ1cHRpYmxlID0gZmFsc2U7Ci0JcmV0ID0gaTkxNV9nZW1fb2Jq ZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKG9iaiwgYWxpZ25tZW50LCBwaXBlbGluZWQpOworCXJl dCA9IGk5MTVfZ2VtX29iamVjdF9waW5fdG9fZGlzcGxheV9wbGFuZShvYmosIGFsaWdubWVudCwg cGlwZWxpbmVkLAorCQkJCQkJICAgJmk5MTVfZ2d0dF92aWV3X25vcm1hbCk7CiAJaWYgKHJldCkK IAkJZ290byBlcnJfaW50ZXJydXB0aWJsZTsKIApAQCAtMjM3MCw3ICsyMzcxLDcgQEAgaW50ZWxf cGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJcmV0dXJuIDA7 CiAKIGVycl91bnBpbjoKLQlpOTE1X2dlbV9vYmplY3RfdW5waW5fZnJvbV9kaXNwbGF5X3BsYW5l KG9iaik7CisJaTkxNV9nZW1fb2JqZWN0X3VucGluX2Zyb21fZGlzcGxheV9wbGFuZShvYmosICZp OTE1X2dndHRfdmlld19ub3JtYWwpOwogZXJyX2ludGVycnVwdGlibGU6CiAJZGV2X3ByaXYtPm1t LmludGVycnVwdGlibGUgPSB0cnVlOwogCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsK QEAgLTIzODIsNyArMjM4Myw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3VucGluX2ZiX29iaihzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgm b2JqLT5iYXNlLmRldi0+c3RydWN0X211dGV4KSk7CiAKIAlpOTE1X2dlbV9vYmplY3RfdW5waW5f ZmVuY2Uob2JqKTsKLQlpOTE1X2dlbV9vYmplY3RfdW5waW5fZnJvbV9kaXNwbGF5X3BsYW5lKG9i aik7CisJaTkxNV9nZW1fb2JqZWN0X3VucGluX2Zyb21fZGlzcGxheV9wbGFuZShvYmosICZpOTE1 X2dndHRfdmlld19ub3JtYWwpOwogfQogCiAvKiBDb21wdXRlcyB0aGUgbGluZWFyIG9mZnNldCB0 byB0aGUgYmFzZSB0aWxlIGFuZCBhZGp1c3RzIHgsIHkuIGJ5dGVzIHBlciBwaXhlbApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfb3ZlcmxheS5jCmluZGV4IDgyM2QxZDkuLmRkOTIxMjIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKQEAgLTcyMCw3ICs3MjAsOCBAQCBzdGF0aWMgaW50 IGludGVsX292ZXJsYXlfZG9fcHV0X2ltYWdlKHN0cnVjdCBpbnRlbF9vdmVybGF5ICpvdmVybGF5 LAogCWlmIChyZXQgIT0gMCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IGk5MTVfZ2VtX29iamVj dF9waW5fdG9fZGlzcGxheV9wbGFuZShuZXdfYm8sIDAsIE5VTEwpOworCXJldCA9IGk5MTVfZ2Vt X29iamVjdF9waW5fdG9fZGlzcGxheV9wbGFuZShuZXdfYm8sIDAsIE5VTEwsCisJCQkJCQkgICAm aTkxNV9nZ3R0X3ZpZXdfbm9ybWFsKTsKIAlpZiAocmV0ICE9IDApCiAJCXJldHVybiByZXQ7CiAK LS0gCjIuMy4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=