From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [PATCH 29/55] drm/i915: Update
	[vma|object]_move_to_active() to take request structures
Date: Fri, 29 May 2015 17:43:50 +0100
Message-ID: <1432917856-12261-30-git-send-email-John.C.Harrison@Intel.com>
References: <1432917856-12261-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id 14C727214A
 for <Intel-GFX@lists.freedesktop.org>; Fri, 29 May 2015 09:44:50 -0700 (PDT)
In-Reply-To: <1432917856-12261-1-git-send-email-John.C.Harrison@Intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Intel-GFX@Lists.FreeDesktop.Org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0
IGV2ZXJ5dGhpbmcgYWJvdmUgaGFzIGJlZW4gY29udmVydGVkIHRvIHVzZSByZXF1ZXN0IHN0cnVj
dHVyZXMsIGl0IGlzCnBvc3NpYmxlIHRvIHVwZGF0ZSB0aGUgbG93ZXIgbGV2ZWwgbW92ZV90b19h
Y3RpdmUoKSBmdW5jdGlvbnMgdG8gYmUgcmVxdWVzdApiYXNlZCBhcyB3ZWxsLgoKRm9yOiBWSVot
NTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwu
Y29tPgpSZXZpZXdlZC1ieTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgICAgIHwgICAgMiArLQogZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgICAgfCAgICA4ICsrKysrLS0t
CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAgICB8ICAgIDIgKy0K
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyAgIHwgICAgMiArLQog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgfCAgICAyICstCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgICB8ICAgIDIgKy0KIDYg
ZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaTkxNV9kcnYuaAppbmRleCBmNTE3ZmNjLi5hZGJkM2RkIDEwMDY0NAotLS0gYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
ZHJ2LmgKQEAgLTI3ODEsNyArMjc4MSw3IEBAIGludCBpOTE1X2dlbV9vYmplY3Rfc3luYyhzdHJ1
Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkJIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg
KnRvLAogCQkJIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqKnRvX3JlcSk7CiB2b2lkIGk5
MTVfdm1hX21vdmVfdG9fYWN0aXZlKHN0cnVjdCBpOTE1X3ZtYSAqdm1hLAotCQkJICAgICBzdHJ1
Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKKwkJCSAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9y
ZXF1ZXN0ICpyZXEpOwogaW50IGk5MTVfZ2VtX2R1bWJfY3JlYXRlKHN0cnVjdCBkcm1fZmlsZSAq
ZmlsZV9wcml2LAogCQkJIHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkgc3RydWN0IGRybV9t
b2RlX2NyZWF0ZV9kdW1iICphcmdzKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDEyMDc4
YmQuLjg3NzAyZmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjM0MCw5ICsyMzQwLDEy
IEBAIGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZXMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg
Km9iaikKIH0KIAogdm9pZCBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShzdHJ1Y3QgaTkxNV92bWEg
KnZtYSwKLQkJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKKwkJCSAgICAgc3Ry
dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9v
YmplY3QgKm9iaiA9IHZtYS0+b2JqOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CisK
KwlyaW5nID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZyhyZXEpOwogCiAJLyogQWRkIGEgcmVm
ZXJlbmNlIGlmIHdlJ3JlIG5ld2x5IGVudGVyaW5nIHRoZSBhY3RpdmUgbGlzdC4gKi8KIAlpZiAo
b2JqLT5hY3RpdmUgPT0gMCkKQEAgLTIzNTAsOCArMjM1Myw3IEBAIHZvaWQgaTkxNV92bWFfbW92
ZV90b19hY3RpdmUoc3RydWN0IGk5MTVfdm1hICp2bWEsCiAJb2JqLT5hY3RpdmUgfD0gaW50ZWxf
cmluZ19mbGFnKHJpbmcpOwogCiAJbGlzdF9tb3ZlX3RhaWwoJm9iai0+cmluZ19saXN0W3Jpbmct
PmlkXSwgJnJpbmctPmFjdGl2ZV9saXN0KTsKLQlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmb2Jq
LT5sYXN0X3JlYWRfcmVxW3JpbmctPmlkXSwKLQkJCQlpbnRlbF9yaW5nX2dldF9yZXF1ZXN0KHJp
bmcpKTsKKwlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmb2JqLT5sYXN0X3JlYWRfcmVxW3Jpbmct
PmlkXSwgcmVxKTsKIAogCWxpc3RfbW92ZV90YWlsKCZ2bWEtPm1tX2xpc3QsICZ2bWEtPnZtLT5h
Y3RpdmVfbGlzdCk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl
bV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5k
ZXggYzY2NDBkNC4uOWE4ZjRhMTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250
ZXh0LmMKQEAgLTczNiw3ICs3MzYsNyBAQCBzdGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1Y3QgZHJt
X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAkgKi8KIAlpZiAoZnJvbSAhPSBOVUxMKSB7CiAJCWZy
b20tPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlLT5iYXNlLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VN
X0RPTUFJTl9JTlNUUlVDVElPTjsKLQkJaTkxNV92bWFfbW92ZV90b19hY3RpdmUoaTkxNV9nZW1f
b2JqX3RvX2dndHQoZnJvbS0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUpLCByaW5nKTsKKwkJaTkx
NV92bWFfbW92ZV90b19hY3RpdmUoaTkxNV9nZW1fb2JqX3RvX2dndHQoZnJvbS0+bGVnYWN5X2h3
X2N0eC5yY3Nfc3RhdGUpLCByZXEpOwogCQkvKiBBcyBsb25nIGFzIE1JX1NFVF9DT05URVhUIGlz
IHNlcmlhbGl6aW5nLCBpZS4gaXQgZmx1c2hlcyB0aGUKIAkJICogd2hvbGUgZGFtbiBwaXBlbGlu
ZSwgd2UgZG9uJ3QgbmVlZCB0byBleHBsaWNpdGx5IG1hcmsgdGhlCiAJCSAqIG9iamVjdCBkaXJ0
eS4gVGhlIG9ubHkgZXhjZXB0aW9uIGlzIHRoYXQgdGhlIGNvbnRleHQgbXVzdCBiZQpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDc1MzNmYjMuLmEyNGRl
OWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIu
YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTEw
MjgsNyArMTAyOCw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19hY3RpdmUoc3RydWN0
IGxpc3RfaGVhZCAqdm1hcywKIAkJCW9iai0+YmFzZS5wZW5kaW5nX3JlYWRfZG9tYWlucyB8PSBv
YmotPmJhc2UucmVhZF9kb21haW5zOwogCQlvYmotPmJhc2UucmVhZF9kb21haW5zID0gb2JqLT5i
YXNlLnBlbmRpbmdfcmVhZF9kb21haW5zOwogCi0JCWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKHZt
YSwgcmluZyk7CisJCWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKHZtYSwgcmVxKTsKIAkJaWYgKG9i
ai0+YmFzZS53cml0ZV9kb21haW4pIHsKIAkJCW9iai0+ZGlydHkgPSAxOwogCQkJaTkxNV9nZW1f
cmVxdWVzdF9hc3NpZ24oJm9iai0+bGFzdF93cml0ZV9yZXEsIHJlcSk7CmRpZmYgLS1naXQgYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCmluZGV4IDY1OThmOWIuLmUwNGNkYTQg
MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5j
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jCkBAIC0x
NzEsNyArMTcxLDcgQEAgaW50IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBkcm1f
aTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCi0JaTkxNV92
bWFfbW92ZV90b19hY3RpdmUoaTkxNV9nZW1fb2JqX3RvX2dndHQoc28ub2JqKSwgcmVxLT5yaW5n
KTsKKwlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShpOTE1X2dlbV9vYmpfdG9fZ2d0dChzby5vYmop
LCByZXEpOwogCiBvdXQ6CiAJaTkxNV9nZW1fcmVuZGVyX3N0YXRlX2ZpbmkoJnNvKTsKZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNTIxZWNmZC4uNDgxMTgyNiAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfbHJjLmMKQEAgLTEzNjUsNyArMTM2NSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfbHJfY29u
dGV4dF9yZW5kZXJfc3RhdGVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkK
IAlpZiAocmV0KQogCQlnb3RvIG91dDsKIAotCWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKGk5MTVf
Z2VtX29ial90b19nZ3R0KHNvLm9iaiksIHJlcS0+cmluZyk7CisJaTkxNV92bWFfbW92ZV90b19h
Y3RpdmUoaTkxNV9nZW1fb2JqX3RvX2dndHQoc28ub2JqKSwgcmVxKTsKIAogb3V0OgogCWk5MTVf
Z2VtX3JlbmRlcl9zdGF0ZV9maW5pKCZzbyk7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu
dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y
Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=