From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH] drm/i915: simplify bind_to_vm init code Date: Fri, 18 Mar 2016 10:46:59 +0000 Message-ID: <1458298019-3755-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 E078A6E078 for ; Fri, 18 Mar 2016 10:47:18 +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 dy4KCnYyOgogICAgLSBSZW1vdmUgbG9jYWwgZmVuY2Vfc2l6ZSB2YXJpYWJsZQooVHZydGtvIFVy c3VsaW4pCiAgICAtIFJlbW92ZSByZWR1bmRhbnQgTlVMTCBnZ3R0X3ZpZXcgY2hlY2sKICAgIC0g UmV1c2Ugc2l6ZSB2YXJpYWJsZQoKU2lnbmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3 LmF1bGRAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCA1 MSArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDE0IGluc2VydGlvbnMoKyksIDM3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCmluZGV4IGY0NTg1NmQuLmU1ZDlkMGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAt MzQ2OCw1MCArMzQ2OCwyNyBAQCBpOTE1X2dlbV9vYmplY3RfYmluZF90b192bShzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCXUzMiBmZW5jZV9hbGlnbm1lbnQsIHVuZmVuY2VkX2Fs aWdubWVudDsKIAl1MzIgc2VhcmNoX2ZsYWcsIGFsbG9jX2ZsYWc7CiAJdTY0IHN0YXJ0LCBlbmQ7 Ci0JdTY0IHNpemUsIGZlbmNlX3NpemU7CisJdTY0IHNpemU7CiAJc3RydWN0IGk5MTVfdm1hICp2 bWE7CiAJaW50IHJldDsKIAotCWlmIChpOTE1X2lzX2dndHQodm0pKSB7Ci0JCXUzMiB2aWV3X3Np emU7Ci0KLQkJaWYgKFdBUk5fT04oIWdndHRfdmlldykpCi0JCQlyZXR1cm4gRVJSX1BUUigtRUlO VkFMKTsKLQotCQl2aWV3X3NpemUgPSBpOTE1X2dndHRfdmlld19zaXplKG9iaiwgZ2d0dF92aWV3 KTsKLQotCQlmZW5jZV9zaXplID0gaTkxNV9nZW1fZ2V0X2d0dF9zaXplKGRldiwKLQkJCQkJCSAg IHZpZXdfc2l6ZSwKLQkJCQkJCSAgIG9iai0+dGlsaW5nX21vZGUpOwotCQlmZW5jZV9hbGlnbm1l bnQgPSBpOTE1X2dlbV9nZXRfZ3R0X2FsaWdubWVudChkZXYsCi0JCQkJCQkJICAgICB2aWV3X3Np emUsCi0JCQkJCQkJICAgICBvYmotPnRpbGluZ19tb2RlLAotCQkJCQkJCSAgICAgdHJ1ZSk7Ci0J CXVuZmVuY2VkX2FsaWdubWVudCA9IGk5MTVfZ2VtX2dldF9ndHRfYWxpZ25tZW50KGRldiwKLQkJ CQkJCQkJdmlld19zaXplLAotCQkJCQkJCQlvYmotPnRpbGluZ19tb2RlLAotCQkJCQkJCQlmYWxz ZSk7Ci0JCXNpemUgPSBmbGFncyAmIFBJTl9NQVBQQUJMRSA/IGZlbmNlX3NpemUgOiB2aWV3X3Np emU7Ci0JfSBlbHNlIHsKLQkJZmVuY2Vfc2l6ZSA9IGk5MTVfZ2VtX2dldF9ndHRfc2l6ZShkZXYs Ci0JCQkJCQkgICBvYmotPmJhc2Uuc2l6ZSwKLQkJCQkJCSAgIG9iai0+dGlsaW5nX21vZGUpOwot CQlmZW5jZV9hbGlnbm1lbnQgPSBpOTE1X2dlbV9nZXRfZ3R0X2FsaWdubWVudChkZXYsCi0JCQkJ CQkJICAgICBvYmotPmJhc2Uuc2l6ZSwKLQkJCQkJCQkgICAgIG9iai0+dGlsaW5nX21vZGUsCi0J CQkJCQkJICAgICB0cnVlKTsKLQkJdW5mZW5jZWRfYWxpZ25tZW50ID0KLQkJCWk5MTVfZ2VtX2dl dF9ndHRfYWxpZ25tZW50KGRldiwKLQkJCQkJCSAgIG9iai0+YmFzZS5zaXplLAotCQkJCQkJICAg b2JqLT50aWxpbmdfbW9kZSwKLQkJCQkJCSAgIGZhbHNlKTsKLQkJc2l6ZSA9IGZsYWdzICYgUElO X01BUFBBQkxFID8gZmVuY2Vfc2l6ZSA6IG9iai0+YmFzZS5zaXplOwotCX0KKwlpZiAoaTkxNV9p c19nZ3R0KHZtKSkKKwkJc2l6ZSA9IGk5MTVfZ2d0dF92aWV3X3NpemUob2JqLCBnZ3R0X3ZpZXcp OworCWVsc2UKKwkJc2l6ZSA9IG9iai0+YmFzZS5zaXplOworCisJZmVuY2VfYWxpZ25tZW50ID0g aTkxNV9nZW1fZ2V0X2d0dF9hbGlnbm1lbnQoZGV2LCBzaXplLAorCQkJCQkJICAgICBvYmotPnRp bGluZ19tb2RlLCB0cnVlKTsKKwl1bmZlbmNlZF9hbGlnbm1lbnQgPSBpOTE1X2dlbV9nZXRfZ3R0 X2FsaWdubWVudChkZXYsIHNpemUsCisJCQkJCQkJb2JqLT50aWxpbmdfbW9kZSwKKwkJCQkJCQlm YWxzZSk7CiAKIAlzdGFydCA9IGZsYWdzICYgUElOX09GRlNFVF9CSUFTID8gZmxhZ3MgJiBQSU5f T0ZGU0VUX01BU0sgOiAwOwogCWVuZCA9IHZtLT50b3RhbDsKLQlpZiAoZmxhZ3MgJiBQSU5fTUFQ UEFCTEUpCisJaWYgKGZsYWdzICYgUElOX01BUFBBQkxFKSB7CiAJCWVuZCA9IG1pbl90KHU2NCwg ZW5kLCBkZXZfcHJpdi0+Z3R0Lm1hcHBhYmxlX2VuZCk7CisJCXNpemUgPSBpOTE1X2dlbV9nZXRf Z3R0X3NpemUoZGV2LCBzaXplLCBvYmotPnRpbGluZ19tb2RlKTsKKwl9CiAJaWYgKGZsYWdzICYg UElOX1pPTkVfNEcpCiAJCWVuZCA9IG1pbl90KHU2NCwgZW5kLCAoMVVMTCA8PCAzMikgLSBQQUdF X1NJWkUpOwogCi0tIAoyLjQuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==