From: Matthew Auld Subject: [PATCH] drm/i915: simplify bind_to_vm init code Date: Wed, 16 Mar 2016 17:07:06 +0000 Message-ID: <1458148026-3057-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id DFB876E2BA for ; Wed, 16 Mar 2016 17:09:24 +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 Tm8gZnVuY3Rpb25hbCBjaGFuZ2UsIGp1c3QgbWFrZXMgdGhlIGNvZGUgZWFzaWVyIHRvIGZvbGxv dy4KClNpZ25lZC1vZmYtYnk6IE1hdHRoZXcgQXVsZCA8bWF0dGhldy5hdWxkQGludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgNDEgKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25z KCspLCAzMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBiODU0YWYy Li41YThkNjlkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTM0NzAsNDYgKzM0NzAsMjcg QEAgaTkxNV9nZW1fb2JqZWN0X2JpbmRfdG9fdm0oc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iaiwKIAl1MzIgZmVuY2VfYWxpZ25tZW50LCB1bmZlbmNlZF9hbGlnbm1lbnQ7CiAJdTMyIHNl YXJjaF9mbGFnLCBhbGxvY19mbGFnOwogCXU2NCBzdGFydCwgZW5kOwotCXU2NCBzaXplLCBmZW5j ZV9zaXplOworCXU2NCBzaXplLCBvYmpfc2l6ZSwgZmVuY2Vfc2l6ZTsKIAlzdHJ1Y3QgaTkxNV92 bWEgKnZtYTsKIAlpbnQgcmV0OwogCiAJaWYgKGk5MTVfaXNfZ2d0dCh2bSkpIHsKLQkJdTMyIHZp ZXdfc2l6ZTsKLQogCQlpZiAoV0FSTl9PTighZ2d0dF92aWV3KSkKIAkJCXJldHVybiBFUlJfUFRS KC1FSU5WQUwpOwogCi0JCXZpZXdfc2l6ZSA9IGk5MTVfZ2d0dF92aWV3X3NpemUob2JqLCBnZ3R0 X3ZpZXcpOwotCi0JCWZlbmNlX3NpemUgPSBpOTE1X2dlbV9nZXRfZ3R0X3NpemUoZGV2LAotCQkJ CQkJICAgdmlld19zaXplLAotCQkJCQkJICAgb2JqLT50aWxpbmdfbW9kZSk7Ci0JCWZlbmNlX2Fs aWdubWVudCA9IGk5MTVfZ2VtX2dldF9ndHRfYWxpZ25tZW50KGRldiwKLQkJCQkJCQkgICAgIHZp ZXdfc2l6ZSwKLQkJCQkJCQkgICAgIG9iai0+dGlsaW5nX21vZGUsCi0JCQkJCQkJICAgICB0cnVl KTsKLQkJdW5mZW5jZWRfYWxpZ25tZW50ID0gaTkxNV9nZW1fZ2V0X2d0dF9hbGlnbm1lbnQoZGV2 LAotCQkJCQkJCQl2aWV3X3NpemUsCi0JCQkJCQkJCW9iai0+dGlsaW5nX21vZGUsCi0JCQkJCQkJ CWZhbHNlKTsKLQkJc2l6ZSA9IGZsYWdzICYgUElOX01BUFBBQkxFID8gZmVuY2Vfc2l6ZSA6IHZp ZXdfc2l6ZTsKKwkJb2JqX3NpemUgPSBpOTE1X2dndHRfdmlld19zaXplKG9iaiwgZ2d0dF92aWV3 KTsKIAl9IGVsc2UgewotCQlmZW5jZV9zaXplID0gaTkxNV9nZW1fZ2V0X2d0dF9zaXplKGRldiwK LQkJCQkJCSAgIG9iai0+YmFzZS5zaXplLAotCQkJCQkJICAgb2JqLT50aWxpbmdfbW9kZSk7Ci0J CWZlbmNlX2FsaWdubWVudCA9IGk5MTVfZ2VtX2dldF9ndHRfYWxpZ25tZW50KGRldiwKLQkJCQkJ CQkgICAgIG9iai0+YmFzZS5zaXplLAotCQkJCQkJCSAgICAgb2JqLT50aWxpbmdfbW9kZSwKLQkJ CQkJCQkgICAgIHRydWUpOwotCQl1bmZlbmNlZF9hbGlnbm1lbnQgPQotCQkJaTkxNV9nZW1fZ2V0 X2d0dF9hbGlnbm1lbnQoZGV2LAotCQkJCQkJICAgb2JqLT5iYXNlLnNpemUsCi0JCQkJCQkgICBv YmotPnRpbGluZ19tb2RlLAotCQkJCQkJICAgZmFsc2UpOwotCQlzaXplID0gZmxhZ3MgJiBQSU5f TUFQUEFCTEUgPyBmZW5jZV9zaXplIDogb2JqLT5iYXNlLnNpemU7CisJCW9ial9zaXplID0gb2Jq LT5iYXNlLnNpemU7CiAJfQogCisJZmVuY2Vfc2l6ZSA9IGk5MTVfZ2VtX2dldF9ndHRfc2l6ZShk ZXYsIG9ial9zaXplLCBvYmotPnRpbGluZ19tb2RlKTsKKwlmZW5jZV9hbGlnbm1lbnQgPSBpOTE1 X2dlbV9nZXRfZ3R0X2FsaWdubWVudChkZXYsIG9ial9zaXplLAorCQkJCQkJICAgICBvYmotPnRp bGluZ19tb2RlLCB0cnVlKTsKKwl1bmZlbmNlZF9hbGlnbm1lbnQgPSBpOTE1X2dlbV9nZXRfZ3R0 X2FsaWdubWVudChkZXYsIG9ial9zaXplLAorCQkJCQkJCW9iai0+dGlsaW5nX21vZGUsCisJCQkJ CQkJZmFsc2UpOworCXNpemUgPSBmbGFncyAmIFBJTl9NQVBQQUJMRSA/IGZlbmNlX3NpemUgOiBv Ympfc2l6ZTsKKwogCXN0YXJ0ID0gZmxhZ3MgJiBQSU5fT0ZGU0VUX0JJQVMgPyBmbGFncyAmIFBJ Tl9PRkZTRVRfTUFTSyA6IDA7CiAJZW5kID0gdm0tPnRvdGFsOwogCWlmIChmbGFncyAmIFBJTl9N QVBQQUJMRSkKLS0gCjIuNC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK