From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 20/55] drm/i915: Update i915_switch_context() to take a request structure Date: Fri, 29 May 2015 17:43:41 +0100 Message-ID: <1432917856-12261-21-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 98E3072140 for ; Fri, 29 May 2015 09:44:40 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCk5vdyB0aGF0 IHRoZSByZXF1ZXN0IGlzIGd1YXJhbnRlZWQgdG8gc3BlY2lmeSB0aGUgY29udGV4dCwgaXQgaXMg cG9zc2libGUgdG8KdXBkYXRlIHRoZSBjb250ZXh0IHN3aXRjaCBjb2RlIHRvIHVzZSByZXF1ZXN0 cyByYXRoZXIgdGhhbiByaW5nIGFuZCBjb250ZXh0CnBhaXJzLiBUaGlzIHBhdGNoIHVwZGF0ZXMg aTkxNV9zd2l0Y2hfY29udGV4dCgpIGFjY29yZGluZ2x5LgoKQWxzbyByZW1vdmVkIHRoZSB3YXJu aW5nIHRoYXQgdGhlIHJlcXVlc3QncyBjb250ZXh0IG11c3QgbWF0Y2ggdGhlIGxhc3QgY29udGV4 dApzd2l0Y2gncyBjb250ZXh0LiBBcyB0aGUgY29udGV4dCBzd2l0Y2ggbm93IGdldHMgdGhlIGNv bnRleHQgb2JqZWN0IGZyb20gdGhlCnJlcXVlc3Qgc3RydWN0dXJlLCB0aGVyZSBpcyBubyBsb25n ZXIgYW55IHNjb3BlIGZvciB0aGUgdHdvIHRvIGJlY29tZSBvdXQgb2YKc3RlcC4KCkZvcjogVkla LTUxMTUKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVs LmNvbT4KUmV2aWV3ZWQtYnk6IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgfCAgICAzICstLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgIHwgICAgNCArLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgICAgfCAgIDE5ICsrKysrKysrKy0t LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8ICAg IDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNjNmNTgwYy4uNjRhMTBmYSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCkBAIC0zMDE1LDggKzMwMTUsNyBAQCB2b2lkIGk5MTVfZ2VtX2NvbnRl eHRfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaTkxNV9nZW1fY29udGV4dF9v cGVuKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSk7CiBpbnQg aTkxNV9nZW1fY29udGV4dF9lbmFibGUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEp Owogdm9pZCBpOTE1X2dlbV9jb250ZXh0X2Nsb3NlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0 cnVjdCBkcm1fZmlsZSAqZmlsZSk7Ci1pbnQgaTkxNV9zd2l0Y2hfY29udGV4dChzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJc3RydWN0IGludGVsX2NvbnRleHQgKnRvKTsKK2ludCBp OTE1X3N3aXRjaF9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIHN0 cnVjdCBpbnRlbF9jb250ZXh0ICoKIGk5MTVfZ2VtX2NvbnRleHRfZ2V0KHN0cnVjdCBkcm1faTkx NV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdiwgdTMyIGlkKTsKIHZvaWQgaTkxNV9nZW1fY29udGV4 dF9mcmVlKHN0cnVjdCBrcmVmICpjdHhfcmVmKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4 IDc3YjVlZWYuLmI3ZDY2YWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjUzOSw4ICsy NTM5LDYgQEAgdm9pZCBfX2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZywKIAkgKi8KIAlyZXF1ZXN0LT5iYXRjaF9vYmogPSBvYmo7CiAKLQlXQVJOX09OKCFpOTE1 LmVuYWJsZV9leGVjbGlzdHMgJiYgKHJlcXVlc3QtPmN0eCAhPSByaW5nLT5sYXN0X2NvbnRleHQp KTsKLQogCXJlcXVlc3QtPmVtaXR0ZWRfamlmZmllcyA9IGppZmZpZXM7CiAJbGlzdF9hZGRfdGFp bCgmcmVxdWVzdC0+bGlzdCwgJnJpbmctPnJlcXVlc3RfbGlzdCk7CiAJcmVxdWVzdC0+ZmlsZV9w cml2ID0gTlVMTDsKQEAgLTMzMTUsNyArMzMxMyw3IEBAIGludCBpOTE1X2dwdV9pZGxlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJCQlpZiAocmV0KQogCQkJCXJldHVybiByZXQ7CiAKLQkJCXJl dCA9IGk5MTVfc3dpdGNoX2NvbnRleHQocmVxLT5yaW5nLCByaW5nLT5kZWZhdWx0X2NvbnRleHQp OworCQkJcmV0ID0gaTkxNV9zd2l0Y2hfY29udGV4dChyZXEpOwogCQkJaWYgKHJldCkgewogCQkJ CWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHJlcSk7CiAJCQkJcmV0dXJuIHJldDsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCBlOTM0ZGM2Li5iYWU4NTUyIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCkBAIC00MjAsNyArNDIwLDcgQEAg aW50IGk5MTVfZ2VtX2NvbnRleHRfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxKQogCiAJCXJldCA9IHJpbmctPmluaXRfY29udGV4dChyaW5nLCByaW5nLT5kZWZhdWx0X2Nv bnRleHQpOwogCX0gZWxzZQotCQlyZXQgPSBpOTE1X3N3aXRjaF9jb250ZXh0KHJpbmcsIHJpbmct PmRlZmF1bHRfY29udGV4dCk7CisJCXJldCA9IGk5MTVfc3dpdGNoX2NvbnRleHQocmVxKTsKIAog CWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJyaW5nIGluaXQgY29udGV4dDogJWRcbiIsIHJldCk7 CkBAIC03NzUsOCArNzc1LDcgQEAgdW5waW5fb3V0OgogCiAvKioKICAqIGk5MTVfc3dpdGNoX2Nv bnRleHQoKSAtIHBlcmZvcm0gYSBHUFUgY29udGV4dCBzd2l0Y2guCi0gKiBAcmluZzogcmluZyBm b3Igd2hpY2ggd2UnbGwgZXhlY3V0ZSB0aGUgY29udGV4dCBzd2l0Y2gKLSAqIEB0bzogdGhlIGNv bnRleHQgdG8gc3dpdGNoIHRvCisgKiBAcmVxOiByZXF1ZXN0IGZvciB3aGljaCB3ZSdsbCBleGVj dXRlIHRoZSBjb250ZXh0IHN3aXRjaAogICoKICAqIFRoZSBjb250ZXh0IGxpZmUgY3ljbGUgaXMg c2ltcGxlLiBUaGUgY29udGV4dCByZWZjb3VudCBpcyBpbmNyZW1lbnRlZCBhbmQKICAqIGRlY3Jl bWVudGVkIGJ5IDEgYW5kIGNyZWF0ZSBhbmQgZGVzdHJveS4gSWYgdGhlIGNvbnRleHQgaXMgaW4g dXNlIGJ5IHRoZSBHUFUsCkBAIC03ODcsMjUgKzc4NiwyNSBAQCB1bnBpbl9vdXQ6CiAgKiBzd2l0 Y2hlZCBieSB3cml0aW5nIHRvIHRoZSBFTFNQIGFuZCByZXF1ZXN0cyBrZWVwIGEgcmVmZXJlbmNl IHRvIHRoZWlyCiAgKiBjb250ZXh0LgogICovCi1pbnQgaTkxNV9zd2l0Y2hfY29udGV4dChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJc3RydWN0IGludGVsX2NvbnRleHQgKnRvKQor aW50IGk5MTVfc3dpdGNoX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEp CiB7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwogCiAJ V0FSTl9PTihpOTE1LmVuYWJsZV9leGVjbGlzdHMpOwogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tl ZCgmZGV2X3ByaXYtPmRldi0+c3RydWN0X211dGV4KSk7CiAKLQlpZiAodG8tPmxlZ2FjeV9od19j dHgucmNzX3N0YXRlID09IE5VTEwpIHsgLyogV2UgaGF2ZSB0aGUgZmFrZSBjb250ZXh0ICovCi0J CWlmICh0byAhPSByaW5nLT5sYXN0X2NvbnRleHQpIHsKLQkJCWk5MTVfZ2VtX2NvbnRleHRfcmVm ZXJlbmNlKHRvKTsKKwlpZiAocmVxLT5jdHgtPmxlZ2FjeV9od19jdHgucmNzX3N0YXRlID09IE5V TEwpIHsgLyogV2UgaGF2ZSB0aGUgZmFrZSBjb250ZXh0ICovCisJCWlmIChyZXEtPmN0eCAhPSBy aW5nLT5sYXN0X2NvbnRleHQpIHsKKwkJCWk5MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNlKHJlcS0+ Y3R4KTsKIAkJCWlmIChyaW5nLT5sYXN0X2NvbnRleHQpCiAJCQkJaTkxNV9nZW1fY29udGV4dF91 bnJlZmVyZW5jZShyaW5nLT5sYXN0X2NvbnRleHQpOwotCQkJcmluZy0+bGFzdF9jb250ZXh0ID0g dG87CisJCQlyaW5nLT5sYXN0X2NvbnRleHQgPSByZXEtPmN0eDsKIAkJfQogCQlyZXR1cm4gMDsK IAl9CiAKLQlyZXR1cm4gZG9fc3dpdGNoKHJpbmcsIHRvKTsKKwlyZXR1cm4gZG9fc3dpdGNoKHJl cS0+cmluZywgcmVxLT5jdHgpOwogfQogCiBzdGF0aWMgYm9vbCBjb250ZXh0c19lbmFibGVkKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9leGVjYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVj YnVmZmVyLmMKaW5kZXggZTI3ZjQ3Zi4uNTBiMWNlZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpAQCAtMTI0Miw3ICsxMjQyLDcgQEAgaTkxNV9nZW1fcmlu Z2J1ZmZlcl9zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMs CiAJaWYgKHJldCkKIAkJZ290byBlcnJvcjsKIAotCXJldCA9IGk5MTVfc3dpdGNoX2NvbnRleHQo cmluZywgcGFyYW1zLT5jdHgpOworCXJldCA9IGk5MTVfc3dpdGNoX2NvbnRleHQocGFyYW1zLT5y ZXF1ZXN0KTsKIAlpZiAocmV0KQogCQlnb3RvIGVycm9yOwogCi0tIAoxLjcuOS41CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=