From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 30/53] drm/i915: Update [vma|object]_move_to_active() to take request structures Date: Thu, 19 Feb 2015 17:17:42 +0000 Message-ID: <1424366285-29232-31-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 0F37472087 for ; Thu, 19 Feb 2015 09:18:38 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0 IGV2ZXJ5dGhpbmcgYWJvdmUgaGFzIGJlZW4gY29udmVydGVkIHRvIHVzZSByZXF1ZXN0IHN0cnVj dHVyZXMsIGl0IGlzCnBvc3NpYmxlIHRvIHVwZGF0ZSB0aGUgbG93ZXIgbGV2ZWwgbW92ZV90b19h Y3RpdmUoKSBmdW5jdGlvbnMgdG8gYmUgcmVxdWVzdApiYXNlZCBhcyB3ZWxsLgoKRm9yOiBWSVot NTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgICAgIHwg ICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgICAgfCAg IDE3ICsrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250 ZXh0LmMgICAgICB8ICAgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNi dWZmZXIuYyAgIHwgICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVy X3N0YXRlLmMgfCAgICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAg ICAgICAgICB8ICAgIDIgKy0KIDYgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTQg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggOTIwNjMyOC4uZTlmZWY0 YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNzQ3LDcgKzI3NDcsNyBAQCBpbnQgX19t dXN0X2NoZWNrIGk5MTVfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwogaW50IGk5MTVfZ2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmosCiAJCQkgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICp0b19yZXEpOwogdm9p ZCBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKLQkJCSAgICAg c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CisJCQkgICAgIHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxKTsKIGludCBpOTE1X2dlbV9kdW1iX2NyZWF0ZShzdHJ1Y3QgZHJtX2Zp bGUgKmZpbGVfcHJpdiwKIAkJCSBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJIHN0cnVjdCBk cm1fbW9kZV9jcmVhdGVfZHVtYiAqYXJncyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCAy NGZiN2I5Li4wYWU5YmUyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTIyNjUsMTcgKzIy NjUsMTYgQEAgaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2JqKQogCiBzdGF0aWMgdm9pZAogaTkxNV9nZW1fb2JqZWN0X21vdmVfdG9fYWN0aXZl KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCi0JCQkgICAgICAgc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZykKKwkJCSAgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKLQlzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpvbGRfcmluZzsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpuZXdfcmlu ZywgKm9sZF9yaW5nOwogCi0JQlVHX09OKHJpbmcgPT0gTlVMTCk7CisJQlVHX09OKHJlcSA9PSBO VUxMKTsKIAotCXJlcSA9IGludGVsX3JpbmdfZ2V0X3JlcXVlc3QocmluZyk7CisJbmV3X3Jpbmcg PSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKHJlcSk7CiAJb2xkX3JpbmcgPSBpOTE1X2dlbV9y ZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFzdF9yZWFkX3JlcSk7CiAKLQlpZiAob2xkX3JpbmcgIT0g cmluZyAmJiBvYmotPmxhc3Rfd3JpdGVfcmVxKSB7CisJaWYgKG9sZF9yaW5nICE9IG5ld19yaW5n ICYmIG9iai0+bGFzdF93cml0ZV9yZXEpIHsKIAkJLyogS2VlcCB0aGUgcmVxdWVzdCByZWxhdGl2 ZSB0byB0aGUgY3VycmVudCByaW5nICovCiAJCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZvYmot Pmxhc3Rfd3JpdGVfcmVxLCByZXEpOwogCX0KQEAgLTIyODYsMTYgKzIyODUsMTYgQEAgaTkxNV9n ZW1fb2JqZWN0X21vdmVfdG9fYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmos CiAJCW9iai0+YWN0aXZlID0gMTsKIAl9CiAKLQlsaXN0X21vdmVfdGFpbCgmb2JqLT5yaW5nX2xp c3QsICZyaW5nLT5hY3RpdmVfbGlzdCk7CisJbGlzdF9tb3ZlX3RhaWwoJm9iai0+cmluZ19saXN0 LCAmbmV3X3JpbmctPmFjdGl2ZV9saXN0KTsKIAogCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZv YmotPmxhc3RfcmVhZF9yZXEsIHJlcSk7CiB9CiAKIHZvaWQgaTkxNV92bWFfbW92ZV90b19hY3Rp dmUoc3RydWN0IGk5MTVfdm1hICp2bWEsCi0JCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpCisJCQkgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCWxp c3RfbW92ZV90YWlsKCZ2bWEtPm1tX2xpc3QsICZ2bWEtPnZtLT5hY3RpdmVfbGlzdCk7Ci0JcmV0 dXJuIGk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2FjdGl2ZSh2bWEtPm9iaiwgcmluZyk7CisJcmV0 dXJuIGk5MTVfZ2VtX29iamVjdF9tb3ZlX3RvX2FjdGl2ZSh2bWEtPm9iaiwgcmVxKTsKIH0KIAog c3RhdGljIHZvaWQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2Nv bnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCA5 MzhjZDI2Li5lNGQ3NWJlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5j CkBAIC02NTIsNyArNjUyLDcgQEAgc3RhdGljIGludCBkb19zd2l0Y2goc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEpCiAJICovCiAJaWYgKGZyb20gIT0gTlVMTCkgewogCQlmcm9tLT5s ZWdhY3lfaHdfY3R4LnJjc19zdGF0ZS0+YmFzZS5yZWFkX2RvbWFpbnMgPSBJOTE1X0dFTV9ET01B SU5fSU5TVFJVQ1RJT047Ci0JCWk5MTVfdm1hX21vdmVfdG9fYWN0aXZlKGk5MTVfZ2VtX29ial90 b19nZ3R0KGZyb20tPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlKSwgcmVxLT5yaW5nKTsKKwkJaTkx NV92bWFfbW92ZV90b19hY3RpdmUoaTkxNV9nZW1fb2JqX3RvX2dndHQoZnJvbS0+bGVnYWN5X2h3 X2N0eC5yY3Nfc3RhdGUpLCByZXEpOwogCQkvKiBBcyBsb25nIGFzIE1JX1NFVF9DT05URVhUIGlz IHNlcmlhbGl6aW5nLCBpZS4gaXQgZmx1c2hlcyB0aGUKIAkJICogd2hvbGUgZGFtbiBwaXBlbGlu ZSwgd2UgZG9uJ3QgbmVlZCB0byBleHBsaWNpdGx5IG1hcmsgdGhlCiAJCSAqIG9iamVjdCBkaXJ0 eS4gVGhlIG9ubHkgZXhjZXB0aW9uIGlzIHRoYXQgdGhlIGNvbnRleHQgbXVzdCBiZQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDE1ZTMzYTkuLmRjMTM3 NTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTk2 Niw3ICs5NjYsNyBAQCBpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fYWN0aXZlKHN0cnVjdCBs aXN0X2hlYWQgKnZtYXMsCiAJCQlvYmotPmJhc2UucGVuZGluZ19yZWFkX2RvbWFpbnMgfD0gb2Jq LT5iYXNlLnJlYWRfZG9tYWluczsKIAkJb2JqLT5iYXNlLnJlYWRfZG9tYWlucyA9IG9iai0+YmFz ZS5wZW5kaW5nX3JlYWRfZG9tYWluczsKIAotCQlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZSh2bWEs IHJpbmcpOworCQlpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZSh2bWEsIHJlcSk7CiAJCWlmIChvYmot PmJhc2Uud3JpdGVfZG9tYWluKSB7CiAJCQlvYmotPmRpcnR5ID0gMTsKIAkJCWk5MTVfZ2VtX3Jl cXVlc3RfYXNzaWduKCZvYmotPmxhc3Rfd3JpdGVfcmVxLCByZXEpOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwppbmRleCA4NWNjNzQ2Li44NjYyNzRjIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuYwpAQCAtMTcx LDcgKzE3MSw3IEBAIGludCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfaW5pdChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlpZiAocmV0KQogCQlnb3RvIG91dDsKIAotCWk5MTVfdm1h X21vdmVfdG9fYWN0aXZlKGk5MTVfZ2VtX29ial90b19nZ3R0KHNvLm9iaiksIHJlcS0+cmluZyk7 CisJaTkxNV92bWFfbW92ZV90b19hY3RpdmUoaTkxNV9nZW1fb2JqX3RvX2dndHQoc28ub2JqKSwg cmVxKTsKIAogCVdBUk5fT04ocmVxLT5iYXRjaF9vYmopOwogCXJlcS0+YmF0Y2hfb2JqID0gc28u b2JqOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAzYjQzOTNjLi40NzkzNjVlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTM2NCw3ICsxMzY0LDcgQEAgc3RhdGljIGludCBp bnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxKQogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCi0JaTkxNV92bWFfbW92ZV90b19h Y3RpdmUoaTkxNV9nZW1fb2JqX3RvX2dndHQoc28ub2JqKSwgcmVxLT5yaW5nKTsKKwlpOTE1X3Zt YV9tb3ZlX3RvX2FjdGl2ZShpOTE1X2dlbV9vYmpfdG9fZ2d0dChzby5vYmopLCByZXEpOwogCiAJ V0FSTl9PTihyZXEtPmJhdGNoX29iaik7CiAJcmVxLT5iYXRjaF9vYmogPSBzby5vYmo7Ci0tIAox LjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=