From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 32/59] drm/i915: Update [vma|object]_move_to_active() to take request structures Date: Thu, 19 Mar 2015 12:30:37 +0000 Message-ID: <1426768264-16996-33-git-send-email-John.C.Harrison@Intel.com> References: <1426768264-16996-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 9A5F56EA0C for ; Thu, 19 Mar 2015 05:31:43 -0700 (PDT) In-Reply-To: <1426768264-16996-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0 IGV2ZXJ5dGhpbmcgYWJvdmUgaGFzIGJlZW4gY29udmVydGVkIHRvIHVzZSByZXF1ZXN0IHN0cnVj dHVyZXMsIGl0IGlzCnBvc3NpYmxlIHRvIHVwZGF0ZSB0aGUgbG93ZXIgbGV2ZWwgbW92ZV90b19h Y3RpdmUoKSBmdW5jdGlvbnMgdG8gYmUgcmVxdWVzdApiYXNlZCBhcyB3ZWxsLgoKRm9yOiBWSVot NTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwu Y29tPgpSZXZpZXdlZC1ieTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgICAgIHwgICAgMiArLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgICAgfCAgIDE3ICsrKysrKysr LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAgICB8 ICAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyAgIHwg ICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgfCAg ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgICB8ICAg IDIgKy0KIDYgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggN2UwYTA5NS4uM2Q1MGY0MSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCkBAIC0yNjY4LDcgKzI2NjgsNyBAQCBpbnQgaTkxNV9nZW1fb2JqZWN0 X3N5bmMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJCSBzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICp0bywKIAkJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKip0b19yZXEp Owogdm9pZCBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKLQkJ CSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CisJCQkgICAgIHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIGludCBpOTE1X2dlbV9kdW1iX2NyZWF0ZShzdHJ1Y3Qg ZHJtX2ZpbGUgKmZpbGVfcHJpdiwKIAkJCSBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJIHN0 cnVjdCBkcm1fbW9kZV9jcmVhdGVfZHVtYiAqYXJncyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpp bmRleCA5ZjYxNWJmLi5kOGY0ZjNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTIxODAs MTcgKzIxODAsMTYgQEAgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqKQogCiBzdGF0aWMgdm9pZAogaTkxNV9nZW1fb2JqZWN0X21vdmVfdG9f YWN0aXZlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCi0JCQkgICAgICAgc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZykKKwkJCSAgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKLQlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpvbGRfcmluZzsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpu ZXdfcmluZywgKm9sZF9yaW5nOwogCi0JQlVHX09OKHJpbmcgPT0gTlVMTCk7CisJQlVHX09OKHJl cSA9PSBOVUxMKTsKIAotCXJlcSA9IGludGVsX3JpbmdfZ2V0X3JlcXVlc3QocmluZyk7CisJbmV3 X3JpbmcgPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKHJlcSk7CiAJb2xkX3JpbmcgPSBpOTE1 X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3JlcSk7CiAKLQlpZiAob2xkX3Jp bmcgIT0gcmluZyAmJiBvYmotPmxhc3Rfd3JpdGVfcmVxKSB7CisJaWYgKG9sZF9yaW5nICE9IG5l d19yaW5nICYmIG9iai0+bGFzdF93cml0ZV9yZXEpIHsKIAkJLyogS2VlcCB0aGUgcmVxdWVzdCBy ZWxhdGl2ZSB0byB0aGUgY3VycmVudCByaW5nICovCiAJCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWdu KCZvYmotPmxhc3Rfd3JpdGVfcmVxLCByZXEpOwogCX0KQEAgLTIyMDEsMTYgKzIyMDAsMTYgQEAg aTkxNV9nZW1fb2JqZWN0X21vdmVfdG9fYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmosCiAJCW9iai0+YWN0aXZlID0gMTsKIAl9CiAKLQlsaXN0X21vdmVfdGFpbCgmb2JqLT5y aW5nX2xpc3QsICZyaW5nLT5hY3RpdmVfbGlzdCk7CisJbGlzdF9tb3ZlX3RhaWwoJm9iai0+cmlu Z19saXN0LCAmbmV3X3JpbmctPmFjdGl2ZV9saXN0KTsKIAogCWk5MTVfZ2VtX3JlcXVlc3RfYXNz aWduKCZvYmotPmxhc3RfcmVhZF9yZXEsIHJlcSk7CiB9CiAKIHZvaWQgaTkxNV92bWFfbW92ZV90 b19hY3RpdmUoc3RydWN0IGk5MTVfdm1hICp2bWEsCi0JCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpCisJCQkgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQog ewogCWxpc3RfbW92ZV90YWlsKCZ2bWEtPm1tX2xpc3QsICZ2bWEtPnZtLT5hY3RpdmVfbGlzdCk7 Ci0JcmV0dXJuIGk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2FjdGl2ZSh2bWEtPm9iaiwgcmluZyk7 CisJcmV0dXJuIGk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2FjdGl2ZSh2bWEtPm9iaiwgcmVxKTsK IH0KIAogc3RhdGljIHZvaWQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwpp bmRleCA3NWI5ZDc4Li44MTViNjkxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29u dGV4dC5jCkBAIC02NTYsNyArNjU2LDcgQEAgc3RhdGljIGludCBkb19zd2l0Y2goc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJICovCiAJaWYgKGZyb20gIT0gTlVMTCkgewogCQlm cm9tLT5sZWdhY3lfaHdfY3R4LnJjc19zdGF0ZS0+YmFzZS5yZWFkX2RvbWFpbnMgPSBJOTE1X0dF TV9ET01BSU5fSU5TVFJVQ1RJT047Ci0JCWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKGk5MTVfZ2Vt X29ial90b19nZ3R0KGZyb20tPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlKSwgcmluZyk7CisJCWk5 MTVfdm1hX21vdmVfdG9fYWN0aXZlKGk5MTVfZ2VtX29ial90b19nZ3R0KGZyb20tPmxlZ2FjeV9o d19jdHgucmNzX3N0YXRlKSwgcmVxKTsKIAkJLyogQXMgbG9uZyBhcyBNSV9TRVRfQ09OVEVYVCBp cyBzZXJpYWxpemluZywgaWUuIGl0IGZsdXNoZXMgdGhlCiAJCSAqIHdob2xlIGRhbW4gcGlwZWxp bmUsIHdlIGRvbid0IG5lZWQgdG8gZXhwbGljaXRseSBtYXJrIHRoZQogCQkgKiBvYmplY3QgZGly dHkuIFRoZSBvbmx5IGV4Y2VwdGlvbiBpcyB0aGF0IHRoZSBjb250ZXh0IG11c3QgYmUKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCBhZjQ3MThkLi5mYWM1 OTY2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVy LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0x MDMwLDcgKzEwMzAsNyBAQCBpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fYWN0aXZlKHN0cnVj dCBsaXN0X2hlYWQgKnZtYXMsCiAJCQlvYmotPmJhc2UucGVuZGluZ19yZWFkX2RvbWFpbnMgfD0g b2JqLT5iYXNlLnJlYWRfZG9tYWluczsKIAkJb2JqLT5iYXNlLnJlYWRfZG9tYWlucyA9IG9iai0+ YmFzZS5wZW5kaW5nX3JlYWRfZG9tYWluczsKIAotCQlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZSh2 bWEsIHJpbmcpOworCQlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZSh2bWEsIHJlcSk7CiAJCWlmIChv YmotPmJhc2Uud3JpdGVfZG9tYWluKSB7CiAJCQlvYmotPmRpcnR5ID0gMTsKIAkJCWk5MTVfZ2Vt X3JlcXVlc3RfYXNzaWduKCZvYmotPmxhc3Rfd3JpdGVfcmVxLCByZXEpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwppbmRleCA2NTk4ZjliLi5lMDRjZGE0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwpAQCAt MTcxLDcgKzE3MSw3IEBAIGludCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfaW5pdChzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlpZiAocmV0KQogCQlnb3RvIG91dDsKIAotCWk5MTVf dm1hX21vdmVfdG9fYWN0aXZlKGk5MTVfZ2VtX29ial90b19nZ3R0KHNvLm9iaiksIHJlcS0+cmlu Zyk7CisJaTkxNV92bWFfbW92ZV90b19hY3RpdmUoaTkxNV9nZW1fb2JqX3RvX2dndHQoc28ub2Jq KSwgcmVxKTsKIAogb3V0OgogCWk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9maW5pKCZzbyk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGM3Yzc2MGQuLjU0ODE1MTQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jCkBAIC0xMzQ0LDcgKzEzNDQsNyBAQCBzdGF0aWMgaW50IGludGVsX2xyX2Nv bnRleHRfcmVuZGVyX3N0YXRlX2luaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEp CiAJaWYgKHJldCkKIAkJZ290byBvdXQ7CiAKLQlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShpOTE1 X2dlbV9vYmpfdG9fZ2d0dChzby5vYmopLCByZXEtPnJpbmcpOworCWk5MTVfdm1hX21vdmVfdG9f YWN0aXZlKGk5MTVfZ2VtX29ial90b19nZ3R0KHNvLm9iaiksIHJlcSk7CiAKIG91dDoKIAlpOTE1 X2dlbV9yZW5kZXJfc3RhdGVfZmluaSgmc28pOwotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK