From: Dave Gordon Subject: [PATCH 1/2] drm/i915: refactor i915_gem_object_pin_map() Date: Tue, 19 Apr 2016 18:40:07 +0100 Message-ID: <1461087608-34346-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 898F26E7FD for ; Tue, 19 Apr 2016 17:40: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 RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpUaGUgcmVjZW50bHktYWRkZWQgaTkx NV9nZW1fb2JqZWN0X3Bpbl9tYXAoKSBjYW4gYmUgZnVydGhlciBvcHRpbWlzZWQKZm9yICJzbWFs bCIgb2JqZWN0cy4gVG8gZmFjaWxpdGF0ZSB0aGlzLCBhbmQgc2ltcGxpZnkgdGhlIGVycm9yIHBh dGhzCmJlZm9yZSBhZGRpbmcgdGhlIG5ldyBjb2RlLCB0aGlzIHBhdGNoIHB1bGxzIG91dCB0aGUg Im1hcHBpbmciIHBhcnQgb2YKdGhlIG9wZXJhdGlvbiAoaW52b2x2aW5nIGxvY2FsIGFsbG9jYXRp b25zIHdoaWNoIG11c3QgYmUgdW5kb25lIGJlZm9yZQpyZXR1cm4pIGludG8gaXRzIG93biBzdWJm dW5jdGlvbi4KClRoZSBuZXh0IHBhdGNoIHdpbGwgdGhlbiBpbnNlcnQgdGhlIG5ldyBvcHRpbWlz YXRpb24gaW50byB0aGUgbWlkZGxlIG9mCnRoZSBub3ctc2VwYXJhdGVkIHN1YmZ1bmN0aW9uLgoK VGhpcyByZW9yZ2FuaXNhdGlvbiB3aWxsIHByb2JhYmx5IG5vdCBhZmZlY3QgdGhlIGdlbmVyYXRl ZCBjb2RlLCBhcyB0aGUKY29tcGlsZXIgd2lsbCBtb3N0IGxpa2VseSBpbmxpbmUgaXQgYW55d2F5 LCBidXQgaXQgbWFrZXMgdGhlIGxvZ2ljYWwKc3RydWN0dXJlIGEgYml0IGNsZWFyZXIgYW5kIGVh c2llciB0byBtb2RpZnkuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jk b25AaW50ZWwuY29tPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNv bT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCA2MSArKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQwIGluc2VydGlvbnMoKyksIDIxIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDZjZTJjMzEuLmZjNDJiZTAg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjM5Niw2ICsyMzk2LDQ1IEBAIHN0YXRpYyB2 b2lkIGk5MTVfZ2VtX29iamVjdF9mcmVlX21tYXBfb2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmopCiAJcmV0dXJuIDA7CiB9CiAKKy8qIFRoZSAnbWFwcGluZycgcGFydCBvZiBp OTE1X2dlbV9vYmplY3RfcGluX21hcCgpIGJlbG93ICovCitzdGF0aWMgdm9pZCAqaTkxNV9nZW1f b2JqZWN0X21hcChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQoreworCXVu c2lnbmVkIGxvbmcgbl9wYWdlcyA9IG9iai0+YmFzZS5zaXplID4+IFBBR0VfU0hJRlQ7CisJc3Ry dWN0IHNjYXR0ZXJsaXN0ICpzZyA9IG9iai0+cGFnZXMtPnNnbDsKKwlzdHJ1Y3Qgc2dfcGFnZV9p dGVyIHNnX2l0ZXI7CisJc3RydWN0IHBhZ2UgKipwYWdlczsKKwl1bnNpZ25lZCBsb25nIGkgPSAw OworCXZvaWQgKmFkZHIgPSBOVUxMOworCisJLyogQSBzaW5nbGUgcGFnZSBjYW4gYWx3YXlzIGJl IGttYXBwZWQgKi8KKwlpZiAobl9wYWdlcyA9PSAxKQorCQlyZXR1cm4ga21hcChzZ19wYWdlKHNn KSk7CisKKwlwYWdlcyA9IGRybV9tYWxsb2NfZ2ZwKG5fcGFnZXMsIHNpemVvZigqcGFnZXMpLCBH RlBfVEVNUE9SQVJZKTsKKwlpZiAocGFnZXMgPT0gTlVMTCkgeworCQlEUk1fREVCVUdfRFJJVkVS KCJGYWlsZWQgdG8gZ2V0IHNwYWNlIGZvciBwYWdlc1xuIik7CisJCXJldHVybiBOVUxMOworCX0K KworCWZvcl9lYWNoX3NnX3BhZ2Uoc2csICZzZ19pdGVyLCBuX3BhZ2VzLCAwKSB7CisJCXBhZ2Vz W2ldID0gc2dfcGFnZV9pdGVyX3BhZ2UoJnNnX2l0ZXIpOworCQlpZiAoKytpID09IG5fcGFnZXMp IHsKKwkJCWFkZHIgPSB2bWFwKHBhZ2VzLCBuX3BhZ2VzLCAwLCBQQUdFX0tFUk5FTCk7CisJCQli cmVhazsKKwkJfQorCX0KKworCS8qIFdlIHNob3VsZCBoYXZlIGdvdCBoZXJlIHZpYSB0aGUgJ2Jy ZWFrJyBhYm92ZSAqLworCVdBUk5fT04oaSAhPSBuX3BhZ2VzKTsKKwlpZiAoYWRkciA9PSBOVUxM KQorCQlEUk1fREVCVUdfRFJJVkVSKCJGYWlsZWQgdG8gdm1hcCBwYWdlc1xuIik7CisKKwlkcm1f ZnJlZV9sYXJnZShwYWdlcyk7CisKKwlyZXR1cm4gYWRkcjsKK30KKworLyogZ2V0LCBwaW4sIGFu ZCBtYXAgdGhlIHBhZ2VzIG9mIHRoZSBvYmplY3QgaW50byBrZXJuZWwgc3BhY2UgKi8KIHZvaWQg Kmk5MTVfZ2VtX29iamVjdF9waW5fbWFwKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmop CiB7CiAJaW50IHJldDsKQEAgLTI0MDksMjcgKzI0NDgsNyBAQCB2b2lkICppOTE1X2dlbV9vYmpl Y3RfcGluX21hcChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCWk5MTVfZ2VtX29i amVjdF9waW5fcGFnZXMob2JqKTsKIAogCWlmIChvYmotPm1hcHBpbmcgPT0gTlVMTCkgewotCQlz dHJ1Y3QgcGFnZSAqKnBhZ2VzOwotCi0JCXBhZ2VzID0gTlVMTDsKLQkJaWYgKG9iai0+YmFzZS5z aXplID09IFBBR0VfU0laRSkKLQkJCW9iai0+bWFwcGluZyA9IGttYXAoc2dfcGFnZShvYmotPnBh Z2VzLT5zZ2wpKTsKLQkJZWxzZQotCQkJcGFnZXMgPSBkcm1fbWFsbG9jX2dmcChvYmotPmJhc2Uu c2l6ZSA+PiBQQUdFX1NISUZULAotCQkJCQkgICAgICAgc2l6ZW9mKCpwYWdlcyksCi0JCQkJCSAg ICAgICBHRlBfVEVNUE9SQVJZKTsKLQkJaWYgKHBhZ2VzICE9IE5VTEwpIHsKLQkJCXN0cnVjdCBz Z19wYWdlX2l0ZXIgc2dfaXRlcjsKLQkJCWludCBuOwotCi0JCQluID0gMDsKLQkJCWZvcl9lYWNo X3NnX3BhZ2Uob2JqLT5wYWdlcy0+c2dsLCAmc2dfaXRlciwKLQkJCQkJIG9iai0+cGFnZXMtPm5l bnRzLCAwKQotCQkJCXBhZ2VzW24rK10gPSBzZ19wYWdlX2l0ZXJfcGFnZSgmc2dfaXRlcik7Ci0K LQkJCW9iai0+bWFwcGluZyA9IHZtYXAocGFnZXMsIG4sIDAsIFBBR0VfS0VSTkVMKTsKLQkJCWRy bV9mcmVlX2xhcmdlKHBhZ2VzKTsKLQkJfQorCQlvYmotPm1hcHBpbmcgPSBpOTE1X2dlbV9vYmpl Y3RfbWFwKG9iaik7CiAJCWlmIChvYmotPm1hcHBpbmcgPT0gTlVMTCkgewogCQkJaTkxNV9nZW1f b2JqZWN0X3VucGluX3BhZ2VzKG9iaik7CiAJCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKLS0g CjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK