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: Tue, 17 Mar 2015 15:45:12 +0000 Message-ID: <1426607117-10626-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1426607117-10626-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 3AB676E708 for ; Tue, 17 Mar 2015 08:45:24 -0700 (PDT) In-Reply-To: <1426607117-10626-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 IGdndHQgdmlldyBjaGFuZ2VzLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRr by51cnN1bGluQGludGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVu QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAg ICAgfCAxNCArKysrKysrKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAg ICAgIHwgMjIgKysrKysrKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIHwgIDcgKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfb3Zl cmxheS5jIHwgIDMgKystCiA0IGZpbGVzIGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDE1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDgxZjYwYjQuLjE5YjllNjkg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjc3Miw4ICsyNzcyLDEwIEBAIGk5MTVfZ2Vt X29iamVjdF9zZXRfdG9fY3B1X2RvbWFpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq LCBib29sIHdyaXRlKTsKIGludCBfX211c3RfY2hlY2sKIGk5MTVfZ2VtX29iamVjdF9waW5fdG9f ZGlzcGxheV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJCSAgICAg dTMyIGFsaWdubWVudCwKLQkJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnBpcGVsaW5l ZCk7Ci12b2lkIGk5MTVfZ2VtX29iamVjdF91bnBpbl9mcm9tX2Rpc3BsYXlfcGxhbmUoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaik7CisJCQkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpwaXBlbGluZWQsCisJCQkJICAgICBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZp ZXcpOwordm9pZCBpOTE1X2dlbV9vYmplY3RfdW5waW5fZnJvbV9kaXNwbGF5X3BsYW5lKHN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCisJCQkJCSAgICAgIGNvbnN0IHN0cnVjdCBpOTE1 X2dndHRfdmlldyAqdmlldyk7CiBpbnQgaTkxNV9nZW1fb2JqZWN0X2F0dGFjaF9waHlzKHN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQkJaW50IGFsaWduKTsKIGludCBpOTE1X2dl bV9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CkBA IC0yODgyLDcgKzI4ODQsMTMgQEAgaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5iaW5kKHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJcmV0dXJuIGk5MTVfdm1hX3VuYmluZChpOTE1X2dl bV9vYmpfdG9fZ2d0dChvYmopKTsKIH0KIAotdm9pZCBpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBp bihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKK3ZvaWQgaTkxNV9nZW1fb2JqZWN0 X2dndHRfdW5waW5fdmlldyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAorCQkJCSAg ICAgY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3KTsKK3N0YXRpYyBpbmxpbmUgdm9p ZAoraTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaikKK3sKKwlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbl92aWV3KG9iaiwgJmk5MTVfZ2d0 dF92aWV3X25vcm1hbCk7Cit9CiAKIC8qIGk5MTVfZ2VtX2NvbnRleHQuYyAqLwogaW50IF9fbXVz dF9jaGVjayBpOTE1X2dlbV9jb250ZXh0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA1MzNlZjM3Li41ODcyM2EzIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMKQEAgLTM5NTcsNyArMzk1Nyw4IEBAIHN0YXRpYyBib29sIGlzX3Bpbl9kaXNw bGF5KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiBpbnQKIGk5MTVfZ2VtX29iamVj dF9waW5fdG9fZGlzcGxheV9wbGFuZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAog CQkJCSAgICAgdTMyIGFsaWdubWVudCwKLQkJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnBpcGVsaW5lZCkKKwkJCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnBpcGVsaW5lZCwK KwkJCQkgICAgIGNvbnN0IHN0cnVjdCBpOTE1X2dndHRfdmlldyAqdmlldykKIHsKIAl1MzIgb2xk X3JlYWRfZG9tYWlucywgb2xkX3dyaXRlX2RvbWFpbjsKIAlib29sIHdhc19waW5fZGlzcGxheTsK QEAgLTM5OTMsNyArMzk5NCw5IEBAIGk5MTVfZ2VtX29iamVjdF9waW5fdG9fZGlzcGxheV9wbGFu ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCSAqIChlLmcuIGxpYmttcyBmb3Ig dGhlIGJvb3R1cCBzcGxhc2gpLCB3ZSBoYXZlIHRvIGVuc3VyZSB0aGF0IHdlCiAJICogYWx3YXlz IHVzZSBtYXBfYW5kX2ZlbmNlYWJsZSBmb3IgYWxsIHNjYW5vdXQgYnVmZmVycy4KIAkgKi8KLQly ZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9waW4ob2JqLCBhbGlnbm1lbnQsIFBJTl9NQVBQQUJMRSk7 CisJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X2dndHRfcGluKG9iaiwgdmlldywgYWxpZ25tZW50LAor CQkJCSAgICAgICB2aWV3LT50eXBlID09IEk5MTVfR0dUVF9WSUVXX05PUk1BTCA/CisJCQkJICAg ICAgIFBJTl9NQVBQQUJMRSA6IDApOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX3VucGluX2Rpc3Bs YXk7CiAKQEAgLTQwMjEsOSArNDAyNCwxMSBAQCBlcnJfdW5waW5fZGlzcGxheToKIH0KIAogdm9p ZAotaTkxNV9nZW1fb2JqZWN0X3VucGluX2Zyb21fZGlzcGxheV9wbGFuZShzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqKQoraTkxNV9nZW1fb2JqZWN0X3VucGluX2Zyb21fZGlzcGxheV9w bGFuZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAorCQkJCQkgY29uc3Qgc3RydWN0 IGk5MTVfZ2d0dF92aWV3ICp2aWV3KQogewotCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKG9i aik7CisJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW5fdmlldyhvYmosIHZpZXcpOworCiAJb2Jq LT5waW5fZGlzcGxheSA9IGlzX3Bpbl9kaXNwbGF5KG9iaik7CiB9CiAKQEAgLTQyOTYsMTUgKzQz MDEsMTYgQEAgaTkxNV9nZW1fb2JqZWN0X2dndHRfcGluKHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmosCiB9CiAKIHZvaWQKLWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCitpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbl92aWV3 KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCisJCQkJY29uc3Qgc3RydWN0IGk5MTVf Z2d0dF92aWV3ICp2aWV3KQogewotCXN0cnVjdCBpOTE1X3ZtYSAqdm1hID0gaTkxNV9nZW1fb2Jq X3RvX2dndHQob2JqKTsKKwlzdHJ1Y3QgaTkxNV92bWEgKnZtYSA9IGk5MTVfZ2VtX29ial90b19n Z3R0X3ZpZXcob2JqLCB2aWV3KTsKIAogCUJVR19PTighdm1hKTsKIAlCVUdfT04odm1hLT5waW5f Y291bnQgPT0gMCk7Ci0JQlVHX09OKCFpOTE1X2dlbV9vYmpfZ2d0dF9ib3VuZChvYmopKTsKKwlC VUdfT04oIWk5MTVfZ2VtX29ial9nZ3R0X2JvdW5kX3ZpZXcob2JqLCB2aWV3LT50eXBlKSk7CiAK LQlpZiAoLS12bWEtPnBpbl9jb3VudCA9PSAwKQorCWlmICgtLXZtYS0+cGluX2NvdW50ID09IDAg JiYgdmlldy0+dHlwZSA9PSBJOTE1X0dHVFRfVklFV19OT1JNQUwpCiAJCW9iai0+cGluX21hcHBh YmxlID0gZmFsc2U7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBh MzA3OTc5Li4xNmYzNDQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0y MzExLDcgKzIzMTEsOCBAQCBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIAlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAKIAlkZXZfcHJp di0+bW0uaW50ZXJydXB0aWJsZSA9IGZhbHNlOwotCXJldCA9IGk5MTVfZ2VtX29iamVjdF9waW5f dG9fZGlzcGxheV9wbGFuZShvYmosIGFsaWdubWVudCwgcGlwZWxpbmVkKTsKKwlyZXQgPSBpOTE1 X2dlbV9vYmplY3RfcGluX3RvX2Rpc3BsYXlfcGxhbmUob2JqLCBhbGlnbm1lbnQsIHBpcGVsaW5l ZCwKKwkJCQkJCSAgICZpOTE1X2dndHRfdmlld19ub3JtYWwpOwogCWlmIChyZXQpCiAJCWdvdG8g ZXJyX2ludGVycnVwdGlibGU7CiAKQEAgLTIzMzEsNyArMjMzMiw3IEBAIGludGVsX3Bpbl9hbmRf ZmVuY2VfZmJfb2JqKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXJldHVybiAwOwogCiBlcnJf dW5waW46Ci0JaTkxNV9nZW1fb2JqZWN0X3VucGluX2Zyb21fZGlzcGxheV9wbGFuZShvYmopOwor CWk5MTVfZ2VtX29iamVjdF91bnBpbl9mcm9tX2Rpc3BsYXlfcGxhbmUob2JqLCAmaTkxNV9nZ3R0 X3ZpZXdfbm9ybWFsKTsKIGVycl9pbnRlcnJ1cHRpYmxlOgogCWRldl9wcml2LT5tbS5pbnRlcnJ1 cHRpYmxlID0gdHJ1ZTsKIAlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7CkBAIC0yMzQz LDcgKzIzNDQsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF91bnBpbl9mYl9vYmooc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaikKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJm9iai0+YmFz ZS5kZXYtPnN0cnVjdF9tdXRleCkpOwogCiAJaTkxNV9nZW1fb2JqZWN0X3VucGluX2ZlbmNlKG9i aik7Ci0JaTkxNV9nZW1fb2JqZWN0X3VucGluX2Zyb21fZGlzcGxheV9wbGFuZShvYmopOworCWk5 MTVfZ2VtX29iamVjdF91bnBpbl9mcm9tX2Rpc3BsYXlfcGxhbmUob2JqLCAmaTkxNV9nZ3R0X3Zp ZXdfbm9ybWFsKTsKIH0KIAogLyogQ29tcHV0ZXMgdGhlIGxpbmVhciBvZmZzZXQgdG8gdGhlIGJh c2UgdGlsZSBhbmQgYWRqdXN0cyB4LCB5LiBieXRlcyBwZXIgcGl4ZWwKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX292ZXJsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX292ZXJsYXkuYwppbmRleCA4MjNkMWQ5Li5kZDkyMTIyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9vdmVybGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfb3ZlcmxheS5jCkBAIC03MjAsNyArNzIwLDggQEAgc3RhdGljIGludCBpbnRlbF9v dmVybGF5X2RvX3B1dF9pbWFnZShzdHJ1Y3QgaW50ZWxfb3ZlcmxheSAqb3ZlcmxheSwKIAlpZiAo cmV0ICE9IDApCiAJCXJldHVybiByZXQ7CiAKLQlyZXQgPSBpOTE1X2dlbV9vYmplY3RfcGluX3Rv X2Rpc3BsYXlfcGxhbmUobmV3X2JvLCAwLCBOVUxMKTsKKwlyZXQgPSBpOTE1X2dlbV9vYmplY3Rf cGluX3RvX2Rpc3BsYXlfcGxhbmUobmV3X2JvLCAwLCBOVUxMLAorCQkJCQkJICAgJmk5MTVfZ2d0 dF92aWV3X25vcm1hbCk7CiAJaWYgKHJldCAhPSAwKQogCQlyZXR1cm4gcmV0OwogCi0tIAoyLjMu MgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK