From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 22/53] drm/i915: Update i915_switch_context() to take a request structure Date: Thu, 19 Feb 2015 17:17:34 +0000 Message-ID: <1424366285-29232-23-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 B384772087 for ; Thu, 19 Feb 2015 09:18:29 -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 IHRoZSByZXF1ZXN0IGlzIGd1YXJhbnRlZWQgdG8gc3BlY2lmeSB0aGUgY29udGV4dCwgaXQgaXMg cG9zc2libGUgdG8KdXBkYXRlIHRoZSBjb250ZXh0IHN3aXRjaCBjb2RlIHRvIHVzZSByZXF1ZXN0 cyByYXRoZXIgdGhhbiByaW5nIGFuZCBjb250ZXh0CnBhaXJzLiBUaGlzIHBhdGNoIHVwZGF0ZXMg aTkxNV9zd2l0Y2hfY29udGV4dCgpIGFjY29yZGluZ2x5LgoKQWxzbyByZW1vdmVkIHRoZSB3YXJu aW5nIHRoYXQgdGhlIHJlcXVlc3QncyBjb250ZXh0IG11c3QgbWF0Y2ggdGhlIGxhc3QgY29udGV4 dApzd2l0Y2gncyBjb250ZXh0LiBBcyB0aGUgY29udGV4dCBzd2l0Y2ggbm93IGdldHMgdGhlIGNv bnRleHQgb2JqZWN0IGZyb20gdGhlCnJlcXVlc3Qgc3RydWN0dXJlLCB0aGVyZSBpcyBubyBsb25n ZXIgYW55IHNjb3BlIGZvciB0aGUgdHdvIHRvIGJlY29tZSBvdXQgb2YKc3RlcC4KCkZvcjogVkla LTUxMTUKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgfCAg ICAzICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgIHwgICAg NCArLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAgfCAgIDE5 ICsrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNi dWZmZXIuYyB8ICAgIDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTYg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNjE4YTg0MS4uZTljYzM0 MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yOTkyLDggKzI5OTIsNyBAQCB2b2lkIGk5 MTVfZ2VtX2NvbnRleHRfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9n ZW1fY29udGV4dF9vcGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAq ZmlsZSk7CiBpbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXEpOwogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Nsb3NlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7Ci1pbnQgaTkxNV9zd2l0Y2hfY29udGV4 dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJc3RydWN0IGludGVsX2NvbnRleHQg KnRvKTsKK2ludCBpOTE1X3N3aXRjaF9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxKTsKIHN0cnVjdCBpbnRlbF9jb250ZXh0ICoKIGk5MTVfZ2VtX2NvbnRleHRfZ2V0KHN0 cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdiwgdTMyIGlkKTsKIHZvaWQgaTkx NV9nZW1fY29udGV4dF9mcmVlKHN0cnVjdCBrcmVmICpjdHhfcmVmKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCmluZGV4IDY0Mjg4ZTMuLjBjN2UxYmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpA QCAtMjQ3MCw4ICsyNDcwLDYgQEAgaW50IF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nLAogCVdBUk5fT04ocmVxdWVzdC0+YmF0Y2hfb2JqICYmIG9iaik7CiAJ cmVxdWVzdC0+YmF0Y2hfb2JqID0gb2JqOwogCi0JV0FSTl9PTihyZXF1ZXN0LT5jdHggIT0gcmlu Zy0+bGFzdF9jb250ZXh0KTsKLQogCXJlcXVlc3QtPmVtaXR0ZWRfamlmZmllcyA9IGppZmZpZXM7 CiAJbGlzdF9hZGRfdGFpbCgmcmVxdWVzdC0+bGlzdCwgJnJpbmctPnJlcXVlc3RfbGlzdCk7CiAJ cmVxdWVzdC0+ZmlsZV9wcml2ID0gTlVMTDsKQEAgLTMxMTQsNyArMzExMiw3IEBAIGludCBpOTE1 X2dwdV9pZGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlpZiAocmV0KQogCQkJCXJldHVy biByZXQ7CiAKLQkJCXJldCA9IGk5MTVfc3dpdGNoX2NvbnRleHQocmVxLT5yaW5nLCByaW5nLT5k ZWZhdWx0X2NvbnRleHQpOworCQkJcmV0ID0gaTkxNV9zd2l0Y2hfY29udGV4dChyZXEpOwogCQkJ aWYgKHJldCkgewogCQkJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxKTsKIAkJCQly ZXR1cm4gcmV0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29u dGV4dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IDA0 ZDJhMjAuLmIzMjZmOGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMK QEAgLTQxNCw3ICs0MTQsNyBAQCBpbnQgaTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAKIAkJcmV0ID0gcmluZy0+aW5pdF9jb250ZXh0KHJl cS0+cmluZywgcmluZy0+ZGVmYXVsdF9jb250ZXh0KTsKIAl9IGVsc2UKLQkJcmV0ID0gaTkxNV9z d2l0Y2hfY29udGV4dChyZXEtPnJpbmcsIHJpbmctPmRlZmF1bHRfY29udGV4dCk7CisJCXJldCA9 IGk5MTVfc3dpdGNoX2NvbnRleHQocmVxKTsKIAogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJy aW5nIGluaXQgY29udGV4dDogJWRcbiIsIHJldCk7CkBAIC02OTMsOCArNjkzLDcgQEAgdW5waW5f b3V0OgogCiAvKioKICAqIGk5MTVfc3dpdGNoX2NvbnRleHQoKSAtIHBlcmZvcm0gYSBHUFUgY29u dGV4dCBzd2l0Y2guCi0gKiBAcmluZzogcmluZyBmb3Igd2hpY2ggd2UnbGwgZXhlY3V0ZSB0aGUg Y29udGV4dCBzd2l0Y2gKLSAqIEB0bzogdGhlIGNvbnRleHQgdG8gc3dpdGNoIHRvCisgKiBAcmVx OiByZXF1ZXN0IGZvciB3aGljaCB3ZSdsbCBleGVjdXRlIHRoZSBjb250ZXh0IHN3aXRjaAogICoK ICAqIFRoZSBjb250ZXh0IGxpZmUgY3ljbGUgaXMgc2ltcGxlLiBUaGUgY29udGV4dCByZWZjb3Vu dCBpcyBpbmNyZW1lbnRlZCBhbmQKICAqIGRlY3JlbWVudGVkIGJ5IDEgYW5kIGNyZWF0ZSBhbmQg ZGVzdHJveS4gSWYgdGhlIGNvbnRleHQgaXMgaW4gdXNlIGJ5IHRoZSBHUFUsCkBAIC03MDUsMjUg KzcwNCwyNSBAQCB1bnBpbl9vdXQ6CiAgKiBzd2l0Y2hlZCBieSB3cml0aW5nIHRvIHRoZSBFTFNQ IGFuZCByZXF1ZXN0cyBrZWVwIGEgcmVmZXJlbmNlIHRvIHRoZWlyCiAgKiBjb250ZXh0LgogICov Ci1pbnQgaTkxNV9zd2l0Y2hfY29udGV4dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAot CQkJc3RydWN0IGludGVsX2NvbnRleHQgKnRvKQoraW50IGk5MTVfc3dpdGNoX2NvbnRleHQoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyA9IHJlcS0+cmluZzsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwogCiAJV0FSTl9PTihpOTE1LmVuYWJsZV9leGVjbGlz dHMpOwogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmZGV2X3ByaXYtPmRldi0+c3RydWN0X211 dGV4KSk7CiAKLQlpZiAodG8tPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlID09IE5VTEwpIHsgLyog V2UgaGF2ZSB0aGUgZmFrZSBjb250ZXh0ICovCi0JCWlmICh0byAhPSByaW5nLT5sYXN0X2NvbnRl eHQpIHsKLQkJCWk5MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNlKHRvKTsKKwlpZiAocmVxLT5jdHgt PmxlZ2FjeV9od19jdHgucmNzX3N0YXRlID09IE5VTEwpIHsgLyogV2UgaGF2ZSB0aGUgZmFrZSBj b250ZXh0ICovCisJCWlmIChyZXEtPmN0eCAhPSByaW5nLT5sYXN0X2NvbnRleHQpIHsKKwkJCWk5 MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNlKHJlcS0+Y3R4KTsKIAkJCWlmIChyaW5nLT5sYXN0X2Nv bnRleHQpCiAJCQkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShyaW5nLT5sYXN0X2NvbnRl eHQpOwotCQkJcmluZy0+bGFzdF9jb250ZXh0ID0gdG87CisJCQlyaW5nLT5sYXN0X2NvbnRleHQg PSByZXEtPmN0eDsKIAkJfQogCQlyZXR1cm4gMDsKIAl9CiAKLQlyZXR1cm4gZG9fc3dpdGNoKHJp bmcsIHRvKTsKKwlyZXR1cm4gZG9fc3dpdGNoKHJlcS0+cmluZywgcmVxLT5jdHgpOwogfQogCiBz dGF0aWMgYm9vbCBjb250ZXh0c19lbmFibGVkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKaW5kZXggMmNkMDU3OS4uMWUy ZmM4MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAt MTE5MCw3ICsxMTkwLDcgQEAgaTkxNV9nZW1fcmluZ2J1ZmZlcl9zdWJtaXNzaW9uKHN0cnVjdCBp OTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMsCiAJaWYgKHJldCkKIAkJZ290byBlcnJvcjsK IAotCXJldCA9IGk5MTVfc3dpdGNoX2NvbnRleHQocmluZywgcGFyYW1zLT5jdHgpOworCXJldCA9 IGk5MTVfc3dpdGNoX2NvbnRleHQocGFyYW1zLT5yZXF1ZXN0KTsKIAlpZiAocmV0KQogCQlnb3Rv IGVycm9yOwogCi0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=