From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 36/53] drm/i915: Update switch_mm() to take a request structure Date: Thu, 19 Feb 2015 17:17:48 +0000 Message-ID: <1424366285-29232-37-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 19BD572087 for ; Thu, 19 Feb 2015 09:18:44 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg dGhlIHN3aXRjaF9tbSgpIGNvZGUgcGF0aHMgdG8gdGFrZSBhIHJlcXVlc3QgaW5zdGVhZCBvZiBh IHJpbmcuCgp2MjogUmViYXNlZCB0byBuZXdlciB0cmVlLgoKRm9yOiBWSVotNTExNQpTaWduZWQt b2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyB8ICAgIDIgKy0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICAgICB8ICAgMjMgKysrKysrKysrKysrKystLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oICAgICB8ICAgIDIgKy0K IDMgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IDllNjZmYWMuLjgxNmE0NDIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTU5MSw3ICs1OTEs NyBAQCBzdGF0aWMgaW50IGRvX3N3aXRjaChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cSkKIAogCWlmICh0by0+cHBndHQpIHsKIAkJdHJhY2Vfc3dpdGNoX21tKHJpbmcsIHRvKTsKLQkJ cmV0ID0gdG8tPnBwZ3R0LT5zd2l0Y2hfbW0odG8tPnBwZ3R0LCByZXEtPnJpbmcpOworCQlyZXQg PSB0by0+cHBndHQtPnN3aXRjaF9tbSh0by0+cHBndHQsIHJlcSk7CiAJCWlmIChyZXQpCiAJCQln b3RvIHVucGluX291dDsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGNk MDAwODAuLmMzNDA4ZjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0yODAs OSArMjgwLDEwIEBAIHN0YXRpYyBnZW42X2d0dF9wdGVfdCBpcmlzX3B0ZV9lbmNvZGUoZG1hX2Fk ZHJfdCBhZGRyLAogfQogCiAvKiBCcm9hZHdlbGwgUGFnZSBEaXJlY3RvcnkgUG9pbnRlciBEZXNj cmlwdG9ycyAqLwotc3RhdGljIGludCBnZW44X3dyaXRlX3BkcChzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nLCB1bnNpZ25lZCBlbnRyeSwKLQkJCSAgIHVpbnQ2NF90IHZhbCkKK3N0YXRpYyBp bnQgZ2VuOF93cml0ZV9wZHAoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIHVuc2ln bmVkIGVudHJ5LAorCQkJICB1aW50NjRfdCB2YWwpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyA9IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCiAJQlVHX09OKGVudHJ5ID49IDQpOwpA QCAtMzAzLDcgKzMwNCw3IEBAIHN0YXRpYyBpbnQgZ2VuOF93cml0ZV9wZHAoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqcmluZywgdW5zaWduZWQgZW50cnksCiB9CiAKIHN0YXRpYyBpbnQgZ2VuOF9t bV9zd2l0Y2goc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAotCQkJICBzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nKQorCQkJICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkK IHsKIAlpbnQgaSwgcmV0OwogCkBAIC0zMTIsNyArMzEzLDcgQEAgc3RhdGljIGludCBnZW44X21t X3N3aXRjaChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCiAKIAlmb3IgKGkgPSB1c2VkX3Bk IC0gMTsgaSA+PSAwOyBpLS0pIHsKIAkJZG1hX2FkZHJfdCBhZGRyID0gcHBndHQtPnBkX2RtYV9h ZGRyW2ldOwotCQlyZXQgPSBnZW44X3dyaXRlX3BkcChyaW5nLCBpLCBhZGRyKTsKKwkJcmV0ID0g Z2VuOF93cml0ZV9wZHAocmVxLCBpLCBhZGRyKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7 CiAJfQpAQCAtNzc3LDggKzc3OCw5IEBAIHN0YXRpYyB1aW50MzJfdCBnZXRfcGRfb2Zmc2V0KHN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIH0KIAogc3RhdGljIGludCBoc3dfbW1fc3dpdGNo KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCSBzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nKQorCQkJIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogeworCXN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJaW50IHJldDsKIAogCS8qIE5C OiBUTEJzIG11c3QgYmUgZmx1c2hlZCBhbmQgaW52YWxpZGF0ZWQgYmVmb3JlIGEgc3dpdGNoICov CkBAIC04MDIsOCArODA0LDkgQEAgc3RhdGljIGludCBoc3dfbW1fc3dpdGNoKHN0cnVjdCBpOTE1 X2h3X3BwZ3R0ICpwcGd0dCwKIH0KIAogc3RhdGljIGludCB2Z3B1X21tX3N3aXRjaChzdHJ1Y3Qg aTkxNV9od19wcGd0dCAqcHBndHQsCi0JCQkgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcp CisJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogeworCXN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShwcGd0dC0+YmFzZS5kZXYpOwogCiAJSTkxNV9XUklURShSSU5H X1BQX0RJUl9EQ0xWKHJpbmcpLCBQUF9ESVJfRENMVl8yRyk7CkBAIC04MTIsOCArODE1LDkgQEAg c3RhdGljIGludCB2Z3B1X21tX3N3aXRjaChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsCiB9 CiAKIHN0YXRpYyBpbnQgZ2VuN19tbV9zd2l0Y2goc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0 LAotCQkJICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQorCQkJICBzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0g cmVxLT5yaW5nOwogCWludCByZXQ7CiAKIAkvKiBOQjogVExCcyBtdXN0IGJlIGZsdXNoZWQgYW5k IGludmFsaWRhdGVkIGJlZm9yZSBhIHN3aXRjaCAqLwpAQCAtODQ0LDggKzg0OCw5IEBAIHN0YXRp YyBpbnQgZ2VuN19tbV9zd2l0Y2goc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogfQogCiBz dGF0aWMgaW50IGdlbjZfbW1fc3dpdGNoKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJ CSAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKKwkJCSAgc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+ cmluZzsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcHBndHQtPmJhc2UuZGV2OwogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAKQEAgLTEy MzUsNyArMTI0MCw3IEBAIGludCBpOTE1X3BwZ3R0X2luaXRfcmluZyhzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSkKIAlpZiAoIXBwZ3R0KQogCQlyZXR1cm4gMDsKIAotCXJldHVybiBw cGd0dC0+c3dpdGNoX21tKHBwZ3R0LCByZXEtPnJpbmcpOworCXJldHVybiBwcGd0dC0+c3dpdGNo X21tKHBwZ3R0LCByZXEpOwogfQogCiBzdHJ1Y3QgaTkxNV9od19wcGd0dCAqCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5oCmluZGV4IGU3ZTIwMmYuLjA3M2JlN2YgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX2d0dC5oCkBAIC0yODksNyArMjg5LDcgQEAgc3RydWN0IGk5MTVfaHdfcHBn dHQgewogCiAJaW50ICgqZW5hYmxlKShzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpOwogCWlu dCAoKnN3aXRjaF9tbSkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAotCQkJIHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcpOworCQkJIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxKTsKIAl2b2lkICgqZGVidWdfZHVtcCkoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCBz dHJ1Y3Qgc2VxX2ZpbGUgKm0pOwogfTsKIAotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK