From: Dave Gordon Subject: [PATCH v4 1/2] drm/i915: refactor i915_gem_object_pin_map() Date: Tue, 17 May 2016 13:51:22 +0100 Message-ID: <1463489483-34903-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id D3B216E6CD for ; Tue, 17 May 2016 12:51:29 +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+CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50 ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyB8IDU0ICsrKysrKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwg MjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMjRjYWI4OC4uODJh MWJjNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yMzk4LDYgKzIzOTgsMzggQEAgc3Rh dGljIHZvaWQgaTkxNV9nZW1fb2JqZWN0X2ZyZWVfbW1hcF9vZmZzZXQoc3RydWN0IGRybV9pOTE1 X2dlbV9vYmplY3QgKm9iaikKIAlyZXR1cm4gMDsKIH0KIAorLyogVGhlICdtYXBwaW5nJyBwYXJ0 IG9mIGk5MTVfZ2VtX29iamVjdF9waW5fbWFwKCkgYmVsb3cgKi8KK3N0YXRpYyB2b2lkICppOTE1 X2dlbV9vYmplY3RfbWFwKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCit7 CisJdW5zaWduZWQgbG9uZyBuX3BhZ2VzID0gb2JqLT5iYXNlLnNpemUgPj4gUEFHRV9TSElGVDsK KwlzdHJ1Y3Qgc2dfdGFibGUgKnNndCA9IG9iai0+cGFnZXM7CisJc3RydWN0IHNnX3BhZ2VfaXRl ciBzZ19pdGVyOworCXN0cnVjdCBwYWdlICoqcGFnZXM7CisJdW5zaWduZWQgbG9uZyBpID0gMDsK Kwl2b2lkICphZGRyOworCisJLyogQSBzaW5nbGUgcGFnZSBjYW4gYWx3YXlzIGJlIGttYXBwZWQg Ki8KKwlpZiAobl9wYWdlcyA9PSAxKQorCQlyZXR1cm4ga21hcChzZ19wYWdlKHNndC0+c2dsKSk7 CisKKwlwYWdlcyA9IGRybV9tYWxsb2NfZ2ZwKG5fcGFnZXMsIHNpemVvZigqcGFnZXMpLCBHRlBf VEVNUE9SQVJZKTsKKwlpZiAocGFnZXMgPT0gTlVMTCkKKwkJcmV0dXJuIE5VTEw7CisKKwlmb3Jf ZWFjaF9zZ19wYWdlKHNndC0+c2dsLCAmc2dfaXRlciwgc2d0LT5uZW50cywgMCkKKwkJcGFnZXNb aSsrXSA9IHNnX3BhZ2VfaXRlcl9wYWdlKCZzZ19pdGVyKTsKKworCS8qIENoZWNrIHRoYXQgd2Ug aGF2ZSB0aGUgZXhwZWN0ZWQgbnVtYmVyIG9mIHBhZ2VzICovCisJR0VNX0JVR19PTihpICE9IG5f cGFnZXMpOworCisJYWRkciA9IHZtYXAocGFnZXMsIG5fcGFnZXMsIDAsIFBBR0VfS0VSTkVMKTsK KworCWRybV9mcmVlX2xhcmdlKHBhZ2VzKTsKKworCXJldHVybiBhZGRyOworfQorCisvKiBnZXQs IHBpbiwgYW5kIG1hcCB0aGUgcGFnZXMgb2YgdGhlIG9iamVjdCBpbnRvIGtlcm5lbCBzcGFjZSAq Lwogdm9pZCAqaTkxNV9nZW1fb2JqZWN0X3Bpbl9tYXAoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaikKIHsKIAlpbnQgcmV0OwpAQCAtMjQxMSwyNyArMjQ0Myw3IEBAIHZvaWQgKmk5MTVf Z2VtX29iamVjdF9waW5fbWFwKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiAJaTkx NV9nZW1fb2JqZWN0X3Bpbl9wYWdlcyhvYmopOwogCiAJaWYgKG9iai0+bWFwcGluZyA9PSBOVUxM KSB7Ci0JCXN0cnVjdCBwYWdlICoqcGFnZXM7Ci0KLQkJcGFnZXMgPSBOVUxMOwotCQlpZiAob2Jq LT5iYXNlLnNpemUgPT0gUEFHRV9TSVpFKQotCQkJb2JqLT5tYXBwaW5nID0ga21hcChzZ19wYWdl KG9iai0+cGFnZXMtPnNnbCkpOwotCQllbHNlCi0JCQlwYWdlcyA9IGRybV9tYWxsb2NfZ2ZwKG9i ai0+YmFzZS5zaXplID4+IFBBR0VfU0hJRlQsCi0JCQkJCSAgICAgICBzaXplb2YoKnBhZ2VzKSwK LQkJCQkJICAgICAgIEdGUF9URU1QT1JBUlkpOwotCQlpZiAocGFnZXMgIT0gTlVMTCkgewotCQkJ c3RydWN0IHNnX3BhZ2VfaXRlciBzZ19pdGVyOwotCQkJaW50IG47Ci0KLQkJCW4gPSAwOwotCQkJ Zm9yX2VhY2hfc2dfcGFnZShvYmotPnBhZ2VzLT5zZ2wsICZzZ19pdGVyLAotCQkJCQkgb2JqLT5w YWdlcy0+bmVudHMsIDApCi0JCQkJcGFnZXNbbisrXSA9IHNnX3BhZ2VfaXRlcl9wYWdlKCZzZ19p dGVyKTsKLQotCQkJb2JqLT5tYXBwaW5nID0gdm1hcChwYWdlcywgbiwgMCwgUEFHRV9LRVJORUwp OwotCQkJZHJtX2ZyZWVfbGFyZ2UocGFnZXMpOwotCQl9CisJCW9iai0+bWFwcGluZyA9IGk5MTVf Z2VtX29iamVjdF9tYXAob2JqKTsKIAkJaWYgKG9iai0+bWFwcGluZyA9PSBOVUxMKSB7CiAJCQlp OTE1X2dlbV9vYmplY3RfdW5waW5fcGFnZXMob2JqKTsKIAkJCXJldHVybiBFUlJfUFRSKC1FTk9N RU0pOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=