From: Dave Gordon Subject: [PATCH v2 1/2] drm/i915: refactor i915_gem_object_pin_map() Date: Wed, 20 Apr 2016 14:30:54 +0100 Message-ID: <1461159055-11991-1-git-send-email-david.s.gordon@intel.com> References: <20160419195015.GC14602@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id A6A0A6E224 for ; Wed, 20 Apr 2016 13:31:04 +0000 (UTC) In-Reply-To: <20160419195015.GC14602@nuc-i3427.alporthouse.com> 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 ZSBsb29wLW92ZXItcGFnZXMgJiBlcnJvciBjaGVjayAoQ2hyaXMgV2lsc29uKQoKU2lnbmVkLW9m Zi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KQ2M6IFR2cnRrbyBV cnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlz QGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j IHwgNTggKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAzNyBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYwppbmRleCA2Y2UyYzMxLi41MzQ0YjZkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK QEAgLTIzOTYsNiArMjM5Niw0MiBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9vYmplY3RfZnJlZV9t bWFwX29mZnNldChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCXJldHVybiAwOwog fQogCisvKiBUaGUgJ21hcHBpbmcnIHBhcnQgb2YgaTkxNV9nZW1fb2JqZWN0X3Bpbl9tYXAoKSBi ZWxvdyAqLworc3RhdGljIHZvaWQgKmk5MTVfZ2VtX29iamVjdF9tYXAoY29uc3Qgc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaikKK3sKKwl1bnNpZ25lZCBsb25nIG5fcGFnZXMgPSBvYmot PmJhc2Uuc2l6ZSA+PiBQQUdFX1NISUZUOworCXN0cnVjdCBzY2F0dGVybGlzdCAqc2cgPSBvYmot PnBhZ2VzLT5zZ2w7CisJc3RydWN0IHNnX3BhZ2VfaXRlciBzZ19pdGVyOworCXN0cnVjdCBwYWdl ICoqcGFnZXM7CisJdW5zaWduZWQgbG9uZyBpID0gMDsKKwl2b2lkICphZGRyID0gTlVMTDsKKwor CS8qIEEgc2luZ2xlIHBhZ2UgY2FuIGFsd2F5cyBiZSBrbWFwcGVkICovCisJaWYgKG5fcGFnZXMg PT0gMSkKKwkJcmV0dXJuIGttYXAoc2dfcGFnZShzZykpOworCisJcGFnZXMgPSBkcm1fbWFsbG9j X2dmcChuX3BhZ2VzLCBzaXplb2YoKnBhZ2VzKSwgR0ZQX1RFTVBPUkFSWSk7CisJaWYgKHBhZ2Vz ID09IE5VTEwpIHsKKwkJRFJNX0RFQlVHX0RSSVZFUigiRmFpbGVkIHRvIGdldCBzcGFjZSBmb3Ig cGFnZXNcbiIpOworCQlyZXR1cm4gTlVMTDsKKwl9CisKKwlmb3JfZWFjaF9zZ19wYWdlKHNnLCAm c2dfaXRlciwgbl9wYWdlcywgMCkKKwkJcGFnZXNbaSsrXSA9IHNnX3BhZ2VfaXRlcl9wYWdlKCZz Z19pdGVyKTsKKworCS8qIENoZWNrIHRoYXQgd2UgaGF2ZSB0aGUgZXhwZWN0ZWQgbnVtYmVyIG9m IHBhZ2VzICovCisJaWYgKCFXQVJOX09OKGkgIT0gbl9wYWdlcykpCisJCWFkZHIgPSB2bWFwKHBh Z2VzLCBuX3BhZ2VzLCAwLCBQQUdFX0tFUk5FTCk7CisKKwlpZiAoYWRkciA9PSBOVUxMKQorCQlE Uk1fREVCVUdfRFJJVkVSKCJGYWlsZWQgdG8gdm1hcCBwYWdlc1xuIik7CisKKwlkcm1fZnJlZV9s YXJnZShwYWdlcyk7CisKKwlyZXR1cm4gYWRkcjsKK30KKworLyogZ2V0LCBwaW4sIGFuZCBtYXAg dGhlIHBhZ2VzIG9mIHRoZSBvYmplY3QgaW50byBrZXJuZWwgc3BhY2UgKi8KIHZvaWQgKmk5MTVf Z2VtX29iamVjdF9waW5fbWFwKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCiB7CiAJ aW50IHJldDsKQEAgLTI0MDksMjcgKzI0NDUsNyBAQCB2b2lkICppOTE1X2dlbV9vYmplY3RfcGlu X21hcChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQogCWk5MTVfZ2VtX29iamVjdF9w aW5fcGFnZXMob2JqKTsKIAogCWlmIChvYmotPm1hcHBpbmcgPT0gTlVMTCkgewotCQlzdHJ1Y3Qg cGFnZSAqKnBhZ2VzOwotCi0JCXBhZ2VzID0gTlVMTDsKLQkJaWYgKG9iai0+YmFzZS5zaXplID09 IFBBR0VfU0laRSkKLQkJCW9iai0+bWFwcGluZyA9IGttYXAoc2dfcGFnZShvYmotPnBhZ2VzLT5z Z2wpKTsKLQkJZWxzZQotCQkJcGFnZXMgPSBkcm1fbWFsbG9jX2dmcChvYmotPmJhc2Uuc2l6ZSA+ PiBQQUdFX1NISUZULAotCQkJCQkgICAgICAgc2l6ZW9mKCpwYWdlcyksCi0JCQkJCSAgICAgICBH RlBfVEVNUE9SQVJZKTsKLQkJaWYgKHBhZ2VzICE9IE5VTEwpIHsKLQkJCXN0cnVjdCBzZ19wYWdl X2l0ZXIgc2dfaXRlcjsKLQkJCWludCBuOwotCi0JCQluID0gMDsKLQkJCWZvcl9lYWNoX3NnX3Bh Z2Uob2JqLT5wYWdlcy0+c2dsLCAmc2dfaXRlciwKLQkJCQkJIG9iai0+cGFnZXMtPm5lbnRzLCAw KQotCQkJCXBhZ2VzW24rK10gPSBzZ19wYWdlX2l0ZXJfcGFnZSgmc2dfaXRlcik7Ci0KLQkJCW9i ai0+bWFwcGluZyA9IHZtYXAocGFnZXMsIG4sIDAsIFBBR0VfS0VSTkVMKTsKLQkJCWRybV9mcmVl X2xhcmdlKHBhZ2VzKTsKLQkJfQorCQlvYmotPm1hcHBpbmcgPSBpOTE1X2dlbV9vYmplY3RfbWFw KG9iaik7CiAJCWlmIChvYmotPm1hcHBpbmcgPT0gTlVMTCkgewogCQkJaTkxNV9nZW1fb2JqZWN0 X3VucGluX3BhZ2VzKG9iaik7CiAJCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKLS0gCjEuOS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK