From: Matthew Auld Subject: [PATCH] drm/i915: simplify bind_to_vm init code Date: Fri, 18 Mar 2016 13:54:50 +0000 Message-ID: <1458309290-15188-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 0C07C6E0C2 for ; Fri, 18 Mar 2016 13:55:01 +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 UmV1c2Ugc2l6ZSB2YXJpYWJsZQp2MzoKKENocmlzIFdpbHNvbikKICAgIC0gS2VlcCBzdGFydCwg ZW5kIGNvbXB1dGF0aW9uIHNlcGFyYXRlCiAgICAtIFNpbXBsaWZ5IGFsaWdubWVudAoKU2lnbmVk LW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCA1MiArKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDM5IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGY0NTg1NmQuLmZmYjgwMmUg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMzQ2NSw0OCArMzQ2NSwyMyBAQCBpOTE1X2dl bV9vYmplY3RfYmluZF90b192bShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogewog CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBvYmotPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0JdTMyIGZlbmNlX2FsaWdu bWVudCwgdW5mZW5jZWRfYWxpZ25tZW50OworCXUzMiBtaW5fYWxpZ25tZW50OwogCXUzMiBzZWFy Y2hfZmxhZywgYWxsb2NfZmxhZzsKIAl1NjQgc3RhcnQsIGVuZDsKLQl1NjQgc2l6ZSwgZmVuY2Vf c2l6ZTsKKwl1NjQgc2l6ZTsKIAlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKIAlpbnQgcmV0OwogCi0J aWYgKGk5MTVfaXNfZ2d0dCh2bSkpIHsKLQkJdTMyIHZpZXdfc2l6ZTsKLQotCQlpZiAoV0FSTl9P TighZ2d0dF92aWV3KSkKLQkJCXJldHVybiBFUlJfUFRSKC1FSU5WQUwpOwotCi0JCXZpZXdfc2l6 ZSA9IGk5MTVfZ2d0dF92aWV3X3NpemUob2JqLCBnZ3R0X3ZpZXcpOwotCi0JCWZlbmNlX3NpemUg PSBpOTE1X2dlbV9nZXRfZ3R0X3NpemUoZGV2LAotCQkJCQkJICAgdmlld19zaXplLAotCQkJCQkJ ICAgb2JqLT50aWxpbmdfbW9kZSk7Ci0JCWZlbmNlX2FsaWdubWVudCA9IGk5MTVfZ2VtX2dldF9n dHRfYWxpZ25tZW50KGRldiwKLQkJCQkJCQkgICAgIHZpZXdfc2l6ZSwKLQkJCQkJCQkgICAgIG9i ai0+dGlsaW5nX21vZGUsCi0JCQkJCQkJICAgICB0cnVlKTsKLQkJdW5mZW5jZWRfYWxpZ25tZW50 ID0gaTkxNV9nZW1fZ2V0X2d0dF9hbGlnbm1lbnQoZGV2LAotCQkJCQkJCQl2aWV3X3NpemUsCi0J CQkJCQkJCW9iai0+dGlsaW5nX21vZGUsCi0JCQkJCQkJCWZhbHNlKTsKLQkJc2l6ZSA9IGZsYWdz ICYgUElOX01BUFBBQkxFID8gZmVuY2Vfc2l6ZSA6IHZpZXdfc2l6ZTsKLQl9IGVsc2UgewotCQlm ZW5jZV9zaXplID0gaTkxNV9nZW1fZ2V0X2d0dF9zaXplKGRldiwKLQkJCQkJCSAgIG9iai0+YmFz ZS5zaXplLAotCQkJCQkJICAgb2JqLT50aWxpbmdfbW9kZSk7Ci0JCWZlbmNlX2FsaWdubWVudCA9 IGk5MTVfZ2VtX2dldF9ndHRfYWxpZ25tZW50KGRldiwKLQkJCQkJCQkgICAgIG9iai0+YmFzZS5z aXplLAotCQkJCQkJCSAgICAgb2JqLT50aWxpbmdfbW9kZSwKLQkJCQkJCQkgICAgIHRydWUpOwot CQl1bmZlbmNlZF9hbGlnbm1lbnQgPQotCQkJaTkxNV9nZW1fZ2V0X2d0dF9hbGlnbm1lbnQoZGV2 LAotCQkJCQkJICAgb2JqLT5iYXNlLnNpemUsCisJaWYgKGk5MTVfaXNfZ2d0dCh2bSkpCisJCXNp emUgPSBpOTE1X2dndHRfdmlld19zaXplKG9iaiwgZ2d0dF92aWV3KTsKKwllbHNlCisJCXNpemUg PSBvYmotPmJhc2Uuc2l6ZTsKKworCW1pbl9hbGlnbm1lbnQgPSBpOTE1X2dlbV9nZXRfZ3R0X2Fs aWdubWVudChkZXYsIHNpemUsCiAJCQkJCQkgICBvYmotPnRpbGluZ19tb2RlLAotCQkJCQkJICAg ZmFsc2UpOwotCQlzaXplID0gZmxhZ3MgJiBQSU5fTUFQUEFCTEUgPyBmZW5jZV9zaXplIDogb2Jq LT5iYXNlLnNpemU7Ci0JfQorCQkJCQkJICAgZmxhZ3MgJiBQSU5fTUFQUEFCTEUpOworCWlmIChm bGFncyAmIFBJTl9NQVBQQUJMRSkKKwkJc2l6ZSA9IGk5MTVfZ2VtX2dldF9ndHRfc2l6ZShkZXYs IHNpemUsIG9iai0+dGlsaW5nX21vZGUpOwogCiAJc3RhcnQgPSBmbGFncyAmIFBJTl9PRkZTRVRf QklBUyA/IGZsYWdzICYgUElOX09GRlNFVF9NQVNLIDogMDsKIAllbmQgPSB2bS0+dG90YWw7CkBA IC0zNTE2LDkgKzM0OTEsOCBAQCBpOTE1X2dlbV9vYmplY3RfYmluZF90b192bShzdHJ1Y3QgZHJt X2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQllbmQgPSBtaW5fdCh1NjQsIGVuZCwgKDFVTEwgPDwg MzIpIC0gUEFHRV9TSVpFKTsKIAogCWlmIChhbGlnbm1lbnQgPT0gMCkKLQkJYWxpZ25tZW50ID0g ZmxhZ3MgJiBQSU5fTUFQUEFCTEUgPyBmZW5jZV9hbGlnbm1lbnQgOgotCQkJCQkJdW5mZW5jZWRf YWxpZ25tZW50OwotCWlmIChmbGFncyAmIFBJTl9NQVBQQUJMRSAmJiBhbGlnbm1lbnQgJiAoZmVu Y2VfYWxpZ25tZW50IC0gMSkpIHsKKwkJYWxpZ25tZW50ID0gbWluX2FsaWdubWVudDsKKwlpZiAo ZmxhZ3MgJiBQSU5fTUFQUEFCTEUgJiYgYWxpZ25tZW50ICYgKG1pbl9hbGlnbm1lbnQgLSAxKSkg ewogCQlEUk1fREVCVUcoIkludmFsaWQgb2JqZWN0ICh2aWV3IHR5cGU9JXUpIGFsaWdubWVudCBy ZXF1ZXN0ZWQgJXVcbiIsCiAJCQkgIGdndHRfdmlldyA/IGdndHRfdmlldy0+dHlwZSA6IDAsCiAJ CQkgIGFsaWdubWVudCk7Ci0tIAoyLjQuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==