From: Dave Gordon Subject: [PATCH v4 1/4] drm/i915: refactor i915_gem_object_pin_map() Date: Fri, 20 May 2016 01:31:27 +0100 Message-ID: <1463704290-3491-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B8106EA1A for ; Fri, 20 May 2016 00:31:43 +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 VGhlIHJlY2VudGx5LWFkZGVkIGk5MTVfZ2VtX29iamVjdF9waW5fbWFwKCkgY2FuIGJlIGZ1cnRo ZXIgb3B0aW1pc2VkCmZvciAic21hbGwiIG9iamVjdHMuIFRvIGZhY2lsaXRhdGUgdGhpcywgYW5k IHNpbXBsaWZ5IHRoZSBlcnJvciBwYXRocwpiZWZvcmUgYWRkaW5nIHRoZSBuZXcgY29kZSwgdGhp cyBwYXRjaCBwdWxscyBvdXQgdGhlICJtYXBwaW5nIiBwYXJ0IG9mCnRoZSBvcGVyYXRpb24gKGlu dm9sdmluZyBsb2NhbCBhbGxvY2F0aW9ucyB3aGljaCBtdXN0IGJlIHVuZG9uZSBiZWZvcmUKcmV0 dXJuKSBpbnRvIGl0cyBvd24gc3ViZnVuY3Rpb24uCgpUaGUgbmV4dCBwYXRjaCB3aWxsIHRoZW4g aW5zZXJ0IHRoZSBuZXcgb3B0aW1pc2F0aW9uIGludG8gdGhlIG1pZGRsZSBvZgp0aGUgbm93LXNl cGFyYXRlZCBzdWJmdW5jdGlvbi4KClRoaXMgcmVvcmdhbmlzYXRpb24gd2lsbCBwcm9iYWJseSBu b3QgYWZmZWN0IHRoZSBnZW5lcmF0ZWQgY29kZSwgYXMgdGhlCmNvbXBpbGVyIHdpbGwgbW9zdCBs aWtlbHkgaW5saW5lIGl0IGFueXdheSwgYnV0IGl0IG1ha2VzIHRoZSBsb2dpY2FsCnN0cnVjdHVy ZSBhIGJpdCBjbGVhcmVyIGFuZCBlYXNpZXIgdG8gbW9kaWZ5LgoKdjI6CiAgICBSZXN0cnVjdHVy ZSBsb29wLW92ZXItcGFnZXMgJiBlcnJvciBjaGVjayBbQ2hyaXMgV2lsc29uXQoKdjM6CiAgICBB ZGQgcGFnZSBjb3VudCB0byBkZWJ1ZyBtZXNzYWdlcyBbQ2hyaXMgV2lsc29uXQogICAgQ29udmVy dCBXQVJOX09OKCkgdG8gR0VNX0JVR19PTigpCgp2NDoKICAgIERyb3AgdGhlIERFQlVHIG1lc3Nh Z2VzIFtUdnJ0a28gVXJzdWxpbl0KClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5z LmdvcmRvbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVy c3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCA1 NCArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDMzIGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCmluZGV4IDZhMzE0NDUuLmFjNWZiZjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAt MjM5OCw2ICsyMzk4LDM4IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX29iamVjdF9mcmVlX21tYXBf b2Zmc2V0KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJcmV0dXJuIDA7CiB9CiAK Ky8qIFRoZSAnbWFwcGluZycgcGFydCBvZiBpOTE1X2dlbV9vYmplY3RfcGluX21hcCgpIGJlbG93 ICovCitzdGF0aWMgdm9pZCAqaTkxNV9nZW1fb2JqZWN0X21hcChjb25zdCBzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqKQoreworCXVuc2lnbmVkIGxvbmcgbl9wYWdlcyA9IG9iai0+YmFz ZS5zaXplID4+IFBBR0VfU0hJRlQ7CisJc3RydWN0IHNnX3RhYmxlICpzZ3QgPSBvYmotPnBhZ2Vz OworCXN0cnVjdCBzZ19wYWdlX2l0ZXIgc2dfaXRlcjsKKwlzdHJ1Y3QgcGFnZSAqKnBhZ2VzOwor CXVuc2lnbmVkIGxvbmcgaSA9IDA7CisJdm9pZCAqYWRkcjsKKworCS8qIEEgc2luZ2xlIHBhZ2Ug Y2FuIGFsd2F5cyBiZSBrbWFwcGVkICovCisJaWYgKG5fcGFnZXMgPT0gMSkKKwkJcmV0dXJuIGtt YXAoc2dfcGFnZShzZ3QtPnNnbCkpOworCisJcGFnZXMgPSBkcm1fbWFsbG9jX2dmcChuX3BhZ2Vz LCBzaXplb2YoKnBhZ2VzKSwgR0ZQX1RFTVBPUkFSWSk7CisJaWYgKHBhZ2VzID09IE5VTEwpCisJ CXJldHVybiBOVUxMOworCisJZm9yX2VhY2hfc2dfcGFnZShzZ3QtPnNnbCwgJnNnX2l0ZXIsIHNn dC0+bmVudHMsIDApCisJCXBhZ2VzW2krK10gPSBzZ19wYWdlX2l0ZXJfcGFnZSgmc2dfaXRlcik7 CisKKwkvKiBDaGVjayB0aGF0IHdlIGhhdmUgdGhlIGV4cGVjdGVkIG51bWJlciBvZiBwYWdlcyAq LworCUdFTV9CVUdfT04oaSAhPSBuX3BhZ2VzKTsKKworCWFkZHIgPSB2bWFwKHBhZ2VzLCBuX3Bh Z2VzLCAwLCBQQUdFX0tFUk5FTCk7CisKKwlkcm1fZnJlZV9sYXJnZShwYWdlcyk7CisKKwlyZXR1 cm4gYWRkcjsKK30KKworLyogZ2V0LCBwaW4sIGFuZCBtYXAgdGhlIHBhZ2VzIG9mIHRoZSBvYmpl Y3QgaW50byBrZXJuZWwgc3BhY2UgKi8KIHZvaWQgKmk5MTVfZ2VtX29iamVjdF9waW5fbWFwKHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiB7CiAJaW50IHJldDsKQEAgLTI0MTEsMjcg KzI0NDMsNyBAQCB2b2lkICppOTE1X2dlbV9vYmplY3RfcGluX21hcChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqKQogCWk5MTVfZ2VtX29iamVjdF9waW5fcGFnZXMob2JqKTsKIAogCWlm IChvYmotPm1hcHBpbmcgPT0gTlVMTCkgewotCQlzdHJ1Y3QgcGFnZSAqKnBhZ2VzOwotCi0JCXBh Z2VzID0gTlVMTDsKLQkJaWYgKG9iai0+YmFzZS5zaXplID09IFBBR0VfU0laRSkKLQkJCW9iai0+ bWFwcGluZyA9IGttYXAoc2dfcGFnZShvYmotPnBhZ2VzLT5zZ2wpKTsKLQkJZWxzZQotCQkJcGFn ZXMgPSBkcm1fbWFsbG9jX2dmcChvYmotPmJhc2Uuc2l6ZSA+PiBQQUdFX1NISUZULAotCQkJCQkg ICAgICAgc2l6ZW9mKCpwYWdlcyksCi0JCQkJCSAgICAgICBHRlBfVEVNUE9SQVJZKTsKLQkJaWYg KHBhZ2VzICE9IE5VTEwpIHsKLQkJCXN0cnVjdCBzZ19wYWdlX2l0ZXIgc2dfaXRlcjsKLQkJCWlu dCBuOwotCi0JCQluID0gMDsKLQkJCWZvcl9lYWNoX3NnX3BhZ2Uob2JqLT5wYWdlcy0+c2dsLCAm c2dfaXRlciwKLQkJCQkJIG9iai0+cGFnZXMtPm5lbnRzLCAwKQotCQkJCXBhZ2VzW24rK10gPSBz Z19wYWdlX2l0ZXJfcGFnZSgmc2dfaXRlcik7Ci0KLQkJCW9iai0+bWFwcGluZyA9IHZtYXAocGFn ZXMsIG4sIDAsIFBBR0VfS0VSTkVMKTsKLQkJCWRybV9mcmVlX2xhcmdlKHBhZ2VzKTsKLQkJfQor CQlvYmotPm1hcHBpbmcgPSBpOTE1X2dlbV9vYmplY3RfbWFwKG9iaik7CiAJCWlmIChvYmotPm1h cHBpbmcgPT0gTlVMTCkgewogCQkJaTkxNV9nZW1fb2JqZWN0X3VucGluX3BhZ2VzKG9iaik7CiAJ CQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK