From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 35/55] drm/i915: Update switch_mm() to take a request structure Date: Fri, 29 May 2015 17:43:56 +0100 Message-ID: <1432917856-12261-36-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: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id AEEE46EDF7 for ; Fri, 29 May 2015 09:44:56 -0700 (PDT) In-Reply-To: <1432917856-12261-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg dGhlIHN3aXRjaF9tbSgpIGNvZGUgcGF0aHMgdG8gdGFrZSBhIHJlcXVlc3QgaW5zdGVhZCBvZiBh IHJpbmcuIFRoaXMKaW5jbHVkZXMgdGhlIG15cmlhZCAqX21tX3N3aXRjaCBmdW5jdGlvbnMgdGhl bXNlbHZlcyBhbmQgYSBidW5jaCBvZiBQRFAgcmVsYXRlZApoZWxwZXIgZnVuY3Rpb25zLgoKdjI6 IFJlYmFzZWQgdG8gbmV3ZXIgdHJlZS4KCkZvcjogVklaLTUxMTUKU2lnbmVkLW9mZi1ieTogSm9o biBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFRvbWFz IEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9jb250ZXh0LmMgfCAgICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jICAgICB8ICAgMjEgKysrKysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9ndHQuaCAgICAgfCAgICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDE2IGlu c2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYwppbmRleCA1ZjMxNTg0Li43NTczZjRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fY29udGV4dC5jCkBAIC02NTIsNyArNjUyLDcgQEAgc3RhdGljIGludCBkb19zd2l0 Y2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJCSAqIFJlZ2lzdGVyIEltbWVk aWF0ZSBjb21tYW5kcyBpbiBSaW5nIEJ1ZmZlciBiZWZvcmUgc3VibWl0dGluZwogCQkgKiBhIGNv bnRleHQuIiovCiAJCXRyYWNlX3N3aXRjaF9tbShyaW5nLCB0byk7Ci0JCXJldCA9IHRvLT5wcGd0 dC0+c3dpdGNoX21tKHRvLT5wcGd0dCwgcmluZyk7CisJCXJldCA9IHRvLT5wcGd0dC0+c3dpdGNo X21tKHRvLT5wcGd0dCwgcmVxKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gdW5waW5fb3V0OwogCkBA IC03MDMsNyArNzAzLDcgQEAgc3RhdGljIGludCBkb19zd2l0Y2goc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEpCiAJICovCiAJaWYgKG5lZWRzX3BkX2xvYWRfcG9zdChyaW5nLCB0bywg aHdfZmxhZ3MpKSB7CiAJCXRyYWNlX3N3aXRjaF9tbShyaW5nLCB0byk7Ci0JCXJldCA9IHRvLT5w cGd0dC0+c3dpdGNoX21tKHRvLT5wcGd0dCwgcmluZyk7CisJCXJldCA9IHRvLT5wcGd0dC0+c3dp dGNoX21tKHRvLT5wcGd0dCwgcmVxKTsKIAkJLyogVGhlIGhhcmR3YXJlIGNvbnRleHQgc3dpdGNo IGlzIGVtaXR0ZWQsIGJ1dCB3ZSBoYXZlbid0CiAJCSAqIGFjdHVhbGx5IGNoYW5nZWQgdGhlIHN0 YXRlIC0gc28gaXQncyBwcm9iYWJseSBzYWZlIHRvIGJhaWwKIAkJICogaGVyZS4gU3RpbGwsIGxl dCB0aGUgdXNlciBrbm93IHNvbWV0aGluZyBkYW5nZXJvdXMgaGFzCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCmluZGV4IDczZDZmOWUuLjZhNTBjMTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCkBAIC00NTIsMTAgKzQ1MiwxMSBAQCBmcmVlX3BkOgogfQogCiAvKiBCcm9h ZHdlbGwgUGFnZSBEaXJlY3RvcnkgUG9pbnRlciBEZXNjcmlwdG9ycyAqLwotc3RhdGljIGludCBn ZW44X3dyaXRlX3BkcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAorc3RhdGljIGludCBn ZW44X3dyaXRlX3BkcChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCSAgdW5z aWduZWQgZW50cnksCiAJCQkgIGRtYV9hZGRyX3QgYWRkcikKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwogCWludCByZXQ7CiAKIAlCVUdfT04oZW50cnkgPj0g NCk7CkBAIC00NzYsNyArNDc3LDcgQEAgc3RhdGljIGludCBnZW44X3dyaXRlX3BkcChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nLAogfQogCiBzdGF0aWMgaW50IGdlbjhfbW1fc3dpdGNoKHN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCSAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZykKKwkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CiAJaW50IGks IHJldDsKIApAQCAtNDg1LDcgKzQ4Niw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9tbV9zd2l0Y2goc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCQlkbWFfYWRkcl90IHBkX2RhZGRyID0gcGQgPyBw ZC0+ZGFkZHIgOiBwcGd0dC0+c2NyYXRjaF9wZC0+ZGFkZHI7CiAJCS8qIFRoZSBwYWdlIGRpcmVj dG9yeSBtaWdodCBiZSBOVUxMLCBidXQgd2UgbmVlZCB0byBjbGVhciBvdXQKIAkJICogd2hhdGV2 ZXIgdGhlIHByZXZpb3VzIGNvbnRleHQgbWlnaHQgaGF2ZSB1c2VkLiAqLwotCQlyZXQgPSBnZW44 X3dyaXRlX3BkcChyaW5nLCBpLCBwZF9kYWRkcik7CisJCXJldCA9IGdlbjhfd3JpdGVfcGRwKHJl cSwgaSwgcGRfZGFkZHIpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAl9CkBAIC0xMDU1 LDggKzEwNTYsOSBAQCBzdGF0aWMgdWludDMyX3QgZ2V0X3BkX29mZnNldChzdHJ1Y3QgaTkxNV9o d19wcGd0dCAqcHBndHQpCiB9CiAKIHN0YXRpYyBpbnQgaHN3X21tX3N3aXRjaChzdHJ1Y3QgaTkx NV9od19wcGd0dCAqcHBndHQsCi0JCQkgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKKwkJ CSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwogCWludCByZXQ7CiAKIAkvKiBOQjogVExCcyBtdXN0 IGJlIGZsdXNoZWQgYW5kIGludmFsaWRhdGVkIGJlZm9yZSBhIHN3aXRjaCAqLwpAQCAtMTA4MCw4 ICsxMDgyLDkgQEAgc3RhdGljIGludCBoc3dfbW1fc3dpdGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0 ICpwcGd0dCwKIH0KIAogc3RhdGljIGludCB2Z3B1X21tX3N3aXRjaChzdHJ1Y3QgaTkxNV9od19w cGd0dCAqcHBndHQsCi0JCQkgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCisJCQkgIHN0 cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShwcGd0dC0+YmFzZS5kZXYpOwogCiAJSTkxNV9XUklURShSSU5HX1BQX0RJUl9E Q0xWKHJpbmcpLCBQUF9ESVJfRENMVl8yRyk7CkBAIC0xMDkwLDggKzEwOTMsOSBAQCBzdGF0aWMg aW50IHZncHVfbW1fc3dpdGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIH0KIAogc3Rh dGljIGludCBnZW43X21tX3N3aXRjaChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCi0JCQkg IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCisJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJp bmc7CiAJaW50IHJldDsKIAogCS8qIE5COiBUTEJzIG11c3QgYmUgZmx1c2hlZCBhbmQgaW52YWxp ZGF0ZWQgYmVmb3JlIGEgc3dpdGNoICovCkBAIC0xMTIyLDggKzExMjYsOSBAQCBzdGF0aWMgaW50 IGdlbjdfbW1fc3dpdGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIH0KIAogc3RhdGlj IGludCBnZW42X21tX3N3aXRjaChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCi0JCQkgIHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCisJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7 CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBwZ3R0LT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCkBAIC0xNTc1LDcg KzE1ODAsNyBAQCBpbnQgaTkxNV9wcGd0dF9pbml0X3Jpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXEpCiAJaWYgKCFwcGd0dCkKIAkJcmV0dXJuIDA7CiAKLQlyZXR1cm4gcHBndHQt PnN3aXRjaF9tbShwcGd0dCwgcmVxLT5yaW5nKTsKKwlyZXR1cm4gcHBndHQtPnN3aXRjaF9tbShw cGd0dCwgcmVxKTsKIH0KIAogc3RydWN0IGk5MTVfaHdfcHBndHQgKgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuaAppbmRleCA3NWRmYTA1Li43MzVmMTE5IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuaApAQCAtMzM4LDcgKzMzOCw3IEBAIHN0cnVjdCBpOTE1X2h3X3BwZ3R0IHsK IAogCWludCAoKmVuYWJsZSkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KTsKIAlpbnQgKCpz d2l0Y2hfbW0pKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCSBzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nKTsKKwkJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7 CiAJdm9pZCAoKmRlYnVnX2R1bXApKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgc3RydWN0 IHNlcV9maWxlICptKTsKIH07CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==