From: John.C.Harrison@Intel.com Subject: [PATCH 36/51] drm/i915: Update switch_mm() to take a request structure Date: Fri, 13 Feb 2015 11:48:45 +0000 Message-ID: <1423828140-10653-37-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-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 58C19720E1 for ; Fri, 13 Feb 2015 03:49:40 -0800 (PST) In-Reply-To: <1423828140-10653-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 IHJpbmcuCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4u Qy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jIHwgICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMg ICAgIHwgICAyMCArKysrKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZ3R0LmggICAgIHwgICAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25z KCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0 LmMKaW5kZXggOWU2NmZhYy4uODE2YTQ0MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYwpAQCAtNTkxLDcgKzU5MSw3IEBAIHN0YXRpYyBpbnQgZG9fc3dpdGNoKHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogCiAJaWYgKHRvLT5wcGd0dCkgewogCQl0cmFj ZV9zd2l0Y2hfbW0ocmluZywgdG8pOwotCQlyZXQgPSB0by0+cHBndHQtPnN3aXRjaF9tbSh0by0+ cHBndHQsIHJlcS0+cmluZyk7CisJCXJldCA9IHRvLT5wcGd0dC0+c3dpdGNoX21tKHRvLT5wcGd0 dCwgcmVxKTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gdW5waW5fb3V0OwogCX0KZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggZTdjOTEzNy4uODliYmMyYyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTI3Niw5ICsyNzYsMTAgQEAgc3RhdGljIGdlbjZfZ3R0X3B0 ZV90IGlyaXNfcHRlX2VuY29kZShkbWFfYWRkcl90IGFkZHIsCiB9CiAKIC8qIEJyb2Fkd2VsbCBQ YWdlIERpcmVjdG9yeSBQb2ludGVyIERlc2NyaXB0b3JzICovCi1zdGF0aWMgaW50IGdlbjhfd3Jp dGVfcGRwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHVuc2lnbmVkIGVudHJ5LAotCQkJ ICAgdWludDY0X3QgdmFsKQorc3RhdGljIGludCBnZW44X3dyaXRlX3BkcChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcSwgdW5zaWduZWQgZW50cnksCisJCQkgIHVpbnQ2NF90IHZhbCkK IHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwogCWludCByZXQ7 CiAKIAlCVUdfT04oZW50cnkgPj0gNCk7CkBAIC0yOTksNyArMzAwLDcgQEAgc3RhdGljIGludCBn ZW44X3dyaXRlX3BkcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1bnNpZ25lZCBlbnRy eSwKIH0KIAogc3RhdGljIGludCBnZW44X21tX3N3aXRjaChzdHJ1Y3QgaTkxNV9od19wcGd0dCAq cHBndHQsCi0JCQkgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCisJCQkgIHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCWludCBpLCByZXQ7CiAKQEAgLTMwOCw3ICsz MDksNyBAQCBzdGF0aWMgaW50IGdlbjhfbW1fc3dpdGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpw cGd0dCwKIAogCWZvciAoaSA9IHVzZWRfcGQgLSAxOyBpID49IDA7IGktLSkgewogCQlkbWFfYWRk cl90IGFkZHIgPSBwcGd0dC0+cGRfZG1hX2FkZHJbaV07Ci0JCXJldCA9IGdlbjhfd3JpdGVfcGRw KHJpbmcsIGksIGFkZHIpOworCQlyZXQgPSBnZW44X3dyaXRlX3BkcChyZXEsIGksIGFkZHIpOwog CQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAl9CkBAIC03NzMsOCArNzc0LDkgQEAgc3RhdGlj IHVpbnQzMl90IGdldF9wZF9vZmZzZXQoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogfQog CiBzdGF0aWMgaW50IGhzd19tbV9zd2l0Y2goc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAot CQkJIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCisJCQkgc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+ cmluZzsKIAlpbnQgcmV0OwogCiAJLyogTkI6IFRMQnMgbXVzdCBiZSBmbHVzaGVkIGFuZCBpbnZh bGlkYXRlZCBiZWZvcmUgYSBzd2l0Y2ggKi8KQEAgLTc5OCw4ICs4MDAsOSBAQCBzdGF0aWMgaW50 IGhzd19tbV9zd2l0Y2goc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogfQogCiBzdGF0aWMg aW50IGdlbjdfbW1fc3dpdGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCSAgc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKKwkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsK IAlpbnQgcmV0OwogCiAJLyogTkI6IFRMQnMgbXVzdCBiZSBmbHVzaGVkIGFuZCBpbnZhbGlkYXRl ZCBiZWZvcmUgYSBzd2l0Y2ggKi8KQEAgLTgzMCw4ICs4MzMsOSBAQCBzdGF0aWMgaW50IGdlbjdf bW1fc3dpdGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIH0KIAogc3RhdGljIGludCBn ZW42X21tX3N3aXRjaChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCi0JCQkgIHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcpCisJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IHBwZ3R0LT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCkBAIC0xMjE1LDcgKzEyMTks NyBAQCBpbnQgaTkxNV9wcGd0dF9pbml0X3Jpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEpCiAJaWYgKCFwcGd0dCkKIAkJcmV0dXJuIDA7CiAKLQlyZXR1cm4gcHBndHQtPnN3aXRj aF9tbShwcGd0dCwgcmVxLT5yaW5nKTsKKwlyZXR1cm4gcHBndHQtPnN3aXRjaF9tbShwcGd0dCwg cmVxKTsKIH0KIAogc3RydWN0IGk5MTVfaHdfcHBndHQgKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuaAppbmRleCAwODA0YmJjLi45NmE1OGQ0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9ndHQuaApAQCAtMjg5LDcgKzI4OSw3IEBAIHN0cnVjdCBpOTE1X2h3X3BwZ3R0IHsKIAogCWlu dCAoKmVuYWJsZSkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KTsKIAlpbnQgKCpzd2l0Y2hf bW0pKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCSBzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nKTsKKwkJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiAJdm9p ZCAoKmRlYnVnX2R1bXApKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgc3RydWN0IHNlcV9m aWxlICptKTsKIH07CiAKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==