From: Matthew Auld Subject: [RFC PATCH] drm/i915: s/i915_gem_obj_to_ggtt_view/i915_ggtt_view_to_vma/ Date: Thu, 31 Mar 2016 12:46:07 +0100 Message-ID: <1459424767-29694-1-git-send-email-matthew.auld@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 022E66E231 for ; Thu, 31 Mar 2016 11:46:42 +0000 (UTC) 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 VGhpcyBzZWVtcyB0byBiZSBtb3JlIGluLWxpbmUgd2l0aCB3aGF0IHRoZSBmdW5jdGlvbiBhY3R1 YWxseSBkb2VzLCB0aGlzCmFsc28gbWFrZXMgaXQgbW9yZSBjb25zaXN0ZW50IHdpdGggaTkxNV9n ZW1fb2JqX3RvX3ZtYS4KCkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51 eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K U2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICB8IDYgKysrLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgfCA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYyAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgfCAyICstCiA0IGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgOSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA4MjBjOTFmNS4uMWNiMzhl NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zMTM2LDggKzMxMzYsOCBAQCBzdHJ1Y3Qg aTkxNV92bWEgKgogaTkxNV9nZW1fb2JqX3RvX3ZtYShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVj dCAqb2JqLAogCQkgICAgc3RydWN0IGk5MTVfYWRkcmVzc19zcGFjZSAqdm0pOwogc3RydWN0IGk5 MTVfdm1hICoKLWk5MTVfZ2VtX29ial90b19nZ3R0X3ZpZXcoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaiwKLQkJCSAgY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3KTsKK2k5 MTVfZ2d0dF92aWV3X3RvX3ZtYShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAorCQkg ICAgICBjb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcpOwogCiBzdHJ1Y3QgaTkxNV92 bWEgKgogaTkxNV9nZW1fb2JqX2xvb2t1cF9vcl9jcmVhdGVfdm1hKHN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmosCkBAIC0zMTQ5LDcgKzMxNDksNyBAQCBpOTE1X2dlbV9vYmpfbG9va3Vw X29yX2NyZWF0ZV9nZ3R0X3ZtYShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogc3Rh dGljIGlubGluZSBzdHJ1Y3QgaTkxNV92bWEgKgogaTkxNV9nZW1fb2JqX3RvX2dndHQoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsKLQlyZXR1cm4gaTkxNV9nZW1fb2JqX3RvX2dn dHRfdmlldyhvYmosICZpOTE1X2dndHRfdmlld19ub3JtYWwpOworCXJldHVybiBpOTE1X2dndHRf dmlld190b192bWEob2JqLCAmaTkxNV9nZ3R0X3ZpZXdfbm9ybWFsKTsKIH0KIGJvb2wgaTkxNV9n ZW1fb2JqX2lzX3Bpbm5lZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKTsKIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMTFhNmNjZC4uOTZkMDI2NSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCkBAIC00MjMyLDcgKzQyMzIsNyBAQCBpOTE1X2dlbV9vYmplY3RfZG9fcGluKHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJaWYgKFdBUk5fT04oaTkxNV9pc19nZ3R0 KHZtKSAhPSAhIWdndHRfdmlldykpCiAJCXJldHVybiAtRUlOVkFMOwogCi0Jdm1hID0gZ2d0dF92 aWV3ID8gaTkxNV9nZW1fb2JqX3RvX2dndHRfdmlldyhvYmosIGdndHRfdmlldykgOgorCXZtYSA9 IGdndHRfdmlldyA/IGk5MTVfZ2d0dF92aWV3X3RvX3ZtYShvYmosIGdndHRfdmlldykgOgogCQkJ ICBpOTE1X2dlbV9vYmpfdG9fdm1hKG9iaiwgdm0pOwogCiAJaWYgKHZtYSkgewpAQCAtNDMwNyw3 ICs0MzA3LDcgQEAgdm9pZAogaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW5fdmlldyhzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJCWNvbnN0IHN0cnVjdCBpOTE1X2dndHRfdmll dyAqdmlldykKIHsKLQlzdHJ1Y3QgaTkxNV92bWEgKnZtYSA9IGk5MTVfZ2VtX29ial90b19nZ3R0 X3ZpZXcob2JqLCB2aWV3KTsKKwlzdHJ1Y3QgaTkxNV92bWEgKnZtYSA9IGk5MTVfZ2d0dF92aWV3 X3RvX3ZtYShvYmosIHZpZXcpOwogCiAJQlVHX09OKCF2bWEpOwogCVdBUk5fT04odm1hLT5waW5f Y291bnQgPT0gMCk7CkBAIC00NjA4LDggKzQ2MDgsOCBAQCBzdHJ1Y3QgaTkxNV92bWEgKmk5MTVf Z2VtX29ial90b192bWEoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAlyZXR1cm4g TlVMTDsKIH0KIAotc3RydWN0IGk5MTVfdm1hICppOTE1X2dlbV9vYmpfdG9fZ2d0dF92aWV3KHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCi0JCQkJCSAgIGNvbnN0IHN0cnVjdCBpOTE1 X2dndHRfdmlldyAqdmlldykKK3N0cnVjdCBpOTE1X3ZtYSAqaTkxNV9nZ3R0X3ZpZXdfdG9fdm1h KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCisJCQkJICAgICAgIGNvbnN0IHN0cnVj dCBpOTE1X2dndHRfdmlldyAqdmlldykKIHsKIAlzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICpn Z3R0ID0gaTkxNV9vYmpfdG9fZ2d0dChvYmopOwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCBmOGYwOWQxLi4yODhjZjFjIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMzM1Myw3ICszMzUzLDcgQEAgaTkxNV9nZW1f b2JqX2xvb2t1cF9vcl9jcmVhdGVfZ2d0dF92bWEoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaiwKIAkJCQkgICAgICAgY29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3KQogewog CXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKmdndHQgPSBpOTE1X29ial90b19nZ3R0KG9iaik7 Ci0Jc3RydWN0IGk5MTVfdm1hICp2bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dF92aWV3KG9iaiwg dmlldyk7CisJc3RydWN0IGk5MTVfdm1hICp2bWEgPSBpOTE1X2dndHRfdmlld190b192bWEob2Jq LCB2aWV3KTsKIAogCWlmICghdm1hKQogCQl2bWEgPSBfX2k5MTVfZ2VtX3ZtYV9jcmVhdGUob2Jq LCBnZ3R0LCB2aWV3KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA2MGJi NDg2Li4zOTQ0MDNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yODU0 LDcgKzI4NTQsNyBAQCB1MzIgaW50ZWxfcGxhbmVfb2JqX29mZnNldChzdHJ1Y3QgaW50ZWxfcGxh bmUgKmludGVsX3BsYW5lLAogCWludGVsX2ZpbGxfZmJfZ2d0dF92aWV3KCZ2aWV3LCBpbnRlbF9w bGFuZS0+YmFzZS5zdGF0ZS0+ZmIsCiAJCQkJaW50ZWxfcGxhbmUtPmJhc2Uuc3RhdGUtPnJvdGF0 aW9uKTsKIAotCXZtYSA9IGk5MTVfZ2VtX29ial90b19nZ3R0X3ZpZXcob2JqLCAmdmlldyk7CisJ dm1hID0gaTkxNV9nZ3R0X3ZpZXdfdG9fdm1hKG9iaiwgJnZpZXcpOwogCWlmIChXQVJOKCF2bWEs ICJnZ3R0IHZtYSBmb3IgZGlzcGxheSBvYmplY3Qgbm90IGZvdW5kISAodmlldz0ldSlcbiIsCiAJ CXZpZXcudHlwZSkpCiAJCXJldHVybiAtMTsKLS0gCjIuNC4zCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK