From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 15/53] drm/i915: Update i915_gem_object_sync() to take a request structure Date: Thu, 19 Feb 2015 17:17:27 +0000 Message-ID: <1424366285-29232-16-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com> <1424366285-29232-1-git-send-email-John.C.Harrison@Intel.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 2535B7208C for ; Thu, 19 Feb 2015 09:18:23 -0800 (PST) In-Reply-To: <1424366285-29232-1-git-send-email-John.C.Harrison@Intel.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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBwbGFu IGlzIHRvIHBhc3MgcmVxdWVzdHMgYXJvdW5kIGFzIHRoZSBiYXNpYyBzdWJtaXNzaW9uIHRyYWNr aW5nIHN0cnVjdHVyZQpyYXRoZXIgdGhhbiByaW5ncyBhbmQgY29udGV4dHMuIFRoaXMgcGF0Y2gg dXBkYXRlcyB0aGUgaTkxNV9nZW1fb2JqZWN0X3N5bmMoKQpjb2RlIHBhdGguCgpGb3I6IFZJWi01 MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICAgIHwgICAg MiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgIHwgICAgNyAr KysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgfCAgICAy ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgICAyICst CiA0IGZpbGVzIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaAppbmRleCAzNzVkNGY5Li5iZmQ3YjQ3IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTI3NDQsNyArMjc0NCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBpOTE1X2dl bV9vYmplY3RfdW5waW5fcGFnZXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAog aW50IF9fbXVzdF9jaGVjayBpOTE1X211dGV4X2xvY2tfaW50ZXJydXB0aWJsZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKIGludCBpOTE1X2dlbV9vYmplY3Rfc3luYyhzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqLAotCQkJIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnRvKTsKKwkJCSBz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnRvX3JlcSk7CiB2b2lkIGk5MTVfdm1hX21vdmVf dG9fYWN0aXZlKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAogCQkJICAgICBzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nKTsKIGludCBpOTE1X2dlbV9kdW1iX2NyZWF0ZShzdHJ1Y3QgZHJtX2ZpbGUg KmZpbGVfcHJpdiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDU4OTdkNTQuLmM1YjliYzcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjk1Niw3ICsyOTU2LDcgQEAgb3V0OgogICog aTkxNV9nZW1fb2JqZWN0X3N5bmMgLSBzeW5jIGFuIG9iamVjdCB0byBhIHJpbmcuCiAgKgogICog QG9iajogb2JqZWN0IHdoaWNoIG1heSBiZSBpbiB1c2Ugb24gYW5vdGhlciByaW5nLgotICogQHRv OiByaW5nIHdlIHdpc2ggdG8gdXNlIHRoZSBvYmplY3Qgb24uIE1heSBiZSBOVUxMLgorICogQHRv X3JlcTogcmVxdWVzdCB3ZSB3aXNoIHRvIHVzZSB0aGUgb2JqZWN0IGZvci4gTWF5IGJlIE5VTEwu CiAgKgogICogVGhpcyBjb2RlIGlzIG1lYW50IHRvIGFic3RyYWN0IG9iamVjdCBzeW5jaHJvbml6 YXRpb24gd2l0aCB0aGUgR1BVLgogICogQ2FsbGluZyB3aXRoIE5VTEwgaW1wbGllcyBzeW5jaHJv bml6aW5nIHRoZSBvYmplY3Qgd2l0aCB0aGUgQ1BVCkBAIC0yOTY2LDggKzI5NjYsOSBAQCBvdXQ6 CiAgKi8KIGludAogaTkxNV9nZW1fb2JqZWN0X3N5bmMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaiwKLQkJICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICp0bykKKwkJICAgICBzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnRvX3JlcSkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICp0byA9IHRvX3JlcSA/IHRvX3JlcS0+cmluZyA6IE5VTEw7CiAJc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZnJvbTsKIAl1MzIgc2Vxbm87CiAJaW50IHJldCwgaWR4OwpAQCAtMzk1Myw3ICsz OTU0LDcgQEAgaTkxNV9nZW1fb2JqZWN0X3Bpbl90b19kaXNwbGF5X3BsYW5lKHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCQlpZiAocmV0KQogCQkJCXJldHVybiByZXQ7CiAKLQkJ CXJldCA9IGk5MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcmVxLT5yaW5nKTsKKwkJCXJldCA9IGk5 MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcmVxKTsKIAkJCWlmIChyZXQpCiAJCQkJcmV0dXJuIHJl dDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDc2 ZjZkY2YuLjJjZDA1NzkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVm ZmVyLmMKQEAgLTgzOCw3ICs4MzgsNyBAQCBpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fZ3B1 KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCiAJbGlzdF9mb3JfZWFjaF9lbnRy eSh2bWEsIHZtYXMsIGV4ZWNfbGlzdCkgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqID0gdm1hLT5vYmo7Ci0JCXJldCA9IGk5MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcmVxLT5y aW5nKTsKKwkJcmV0ID0gaTkxNV9nZW1fb2JqZWN0X3N5bmMob2JqLCByZXEpOwogCQlpZiAocmV0 KQogCQkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA0YjQyMzQ2 Li4wZDg4ZTljIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNTg5LDcgKzU4OSw3IEBA IHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxLAogCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCB2bWFzLCBleGVjX2xpc3QpIHsK IAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IHZtYS0+b2JqOwogCi0JCXJldCA9 IGk5MTVfZ2VtX29iamVjdF9zeW5jKG9iaiwgcmVxLT5yaW5nKTsKKwkJcmV0ID0gaTkxNV9nZW1f b2JqZWN0X3N5bmMob2JqLCByZXEpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAotLSAK MS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK