From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 05/55] drm/i915: Set context in request from creation even in legacy mode Date: Fri, 29 May 2015 17:43:26 +0100 Message-ID: <1432917856-12261-6-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 6924B6E278 for ; Fri, 29 May 2015 09:44:23 -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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkluIGV4ZWNs aXN0IG1vZGUsIHRoZSBjb250ZXh0IG9iamVjdCBwb2ludGVyIGlzIHdyaXR0ZW4gaW4gdG8gdGhl IHJlcXVlc3QKc3RydWN0dXJlIChhbmQgcmVmZXJlbmNlIGNvdW50ZWQpIGF0IHRoZSBwb2ludCBv ZiByZXF1ZXN0IGNyZWF0aW9uLiBJbiBsZWdhY3kKbW9kZSwgdGhpcyBvbmx5IGhhcHBlbnMgaW5z aWRlIGk5MTVfYWRkX3JlcXVlc3QoKS4KClRoaXMgcGF0Y2ggdXBkYXRlcyB0aGUgbGVnYWN5IGNv ZGUgcGF0aCB0byBtYXRjaCB0aGUgZXhlY2xpc3QgdmVyc2lvbi4gVGhpcwphbGxvd3MgYWxsIHRo ZSBpbnRlcm1lZGlhdGUgY29kZSBiZXR3ZWVuIHJlcXVlc3QgY3JlYXRpb24gYW5kIHJlcXVlc3Qg c3VibWlzc2lvbgp0byBnZXQgYXQgdGhlIGNvbnRleHQgb2JqZWN0IGdpdmVuIG9ubHkgYSByZXF1 ZXN0IHN0cnVjdHVyZS4gVGh1cyBuZWdhdGluZyB0aGUKbmVlZCB0byBwYXNzIGNvbnRleHQgcG9p bnRlcnMgaGVyZSwgdGhlcmUgYW5kIGV2ZXJ5d2hlcmUuCgp2MjogTW92ZWQgdGhlIGNvbnRleHQg cmVmZXJlbmNlIHNvIGl0IGRvZXMgbm90IG5lZWQgdG8gYmUgdW5kb25lIGlmIHRoZQpnZXRfc2Vx bm8oKSBmYWlscy4KCnYzOiBGaXhlZCBleGVjbGlzdCBtb2RlIGFsd2F5cyBoaXR0aW5nIGEgd2Fy bmluZyBhYm91dCBpbnZhbGlkIGxhc3RfY29udGV4dHMKKHdoaWNoIGRvbid0IGV4aXN0IGluIGV4 ZWNsaXN0IG1vZGUpLgoKdjQ6IFVwZGF0ZWQgZm9yIG5ldyBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9j KCkgc2NoZW1lLgoKRm9yOiBWSVotNTExNQpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxK b2huLkMuSGFycmlzb25ASW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVG9tYXMgRWxmIDx0b21hcy5l bGZAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgIHwgICAy MiArKysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YyB8ICAgMTEgKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oIHwg ICAgMyArLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZGQzOWFhNS4uNDU4YTQ0OSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yNTM2LDE0ICsyNTM2LDcgQEAgdm9pZCBfX2k5MTVfYWRk X3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkgKi8KIAlyZXF1ZXN0LT5i YXRjaF9vYmogPSBvYmo7CiAKLQlpZiAoIWk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewotCQkvKiBI b2xkIGEgcmVmZXJlbmNlIHRvIHRoZSBjdXJyZW50IGNvbnRleHQgc28gdGhhdCB3ZSBjYW4gaW5z cGVjdAotCQkgKiBpdCBsYXRlciBpbiBjYXNlIGEgaGFuZ2NoZWNrIGVycm9yIGV2ZW50IGZpcmVz LgotCQkgKi8KLQkJcmVxdWVzdC0+Y3R4ID0gcmluZy0+bGFzdF9jb250ZXh0OwotCQlpZiAocmVx dWVzdC0+Y3R4KQotCQkJaTkxNV9nZW1fY29udGV4dF9yZWZlcmVuY2UocmVxdWVzdC0+Y3R4KTsK LQl9CisJV0FSTl9PTighaTkxNS5lbmFibGVfZXhlY2xpc3RzICYmIChyZXF1ZXN0LT5jdHggIT0g cmluZy0+bGFzdF9jb250ZXh0KSk7CiAKIAlyZXF1ZXN0LT5lbWl0dGVkX2ppZmZpZXMgPSBqaWZm aWVzOwogCWxpc3RfYWRkX3RhaWwoJnJlcXVlc3QtPmxpc3QsICZyaW5nLT5yZXF1ZXN0X2xpc3Qp OwpAQCAtMjY1NCwyMiArMjY0NywyNSBAQCBpbnQgaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCWlmIChyZXEgPT0gTlVMTCkKIAkJcmV0dXJuIC1F Tk9NRU07CiAKLQlrcmVmX2luaXQoJnJlcS0+cmVmKTsKLQlyZXEtPmk5MTUgPSBkZXZfcHJpdjsK LQogCXJldCA9IGk5MTVfZ2VtX2dldF9zZXFubyhyaW5nLT5kZXYsICZyZXEtPnNlcW5vKTsKIAlp ZiAocmV0KQogCQlnb3RvIGVycjsKIAorCWtyZWZfaW5pdCgmcmVxLT5yZWYpOworCXJlcS0+aTkx NSA9IGRldl9wcml2OwogCXJlcS0+cmluZyA9IHJpbmc7CiAJcmVxLT51bmlxID0gZGV2X3ByaXYt PnJlcXVlc3RfdW5pcSsrOworCXJlcS0+Y3R4ICA9IGN0eDsKKwlpOTE1X2dlbV9jb250ZXh0X3Jl ZmVyZW5jZShyZXEtPmN0eCk7CiAKIAlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQotCQlyZXQg PSBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMocmVxLCBjdHgpOworCQly ZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMocmVxKTsKIAllbHNl CiAJCXJldCA9IGludGVsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMocmVxKTsKLQlpZiAocmV0 KQorCWlmIChyZXQpIHsKKwkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShyZXEtPmN0eCk7 CiAJCWdvdG8gZXJyOworCX0KIAogCS8qCiAJICogUmVzZXJ2ZSBzcGFjZSBpbiB0aGUgcmluZyBi dWZmZXIgZm9yIGFsbCB0aGUgY29tbWFuZHMgcmVxdWlyZWQgdG8KZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMKaW5kZXggN2E3NWZjOC4uODgxY2I4NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK QEAgLTY2MCwyMCArNjYwLDE3IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0 cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCXJldHVybiBsb2dpY2FsX3JpbmdfaW52 YWxpZGF0ZV9hbGxfY2FjaGVzKHJpbmdidWYsIGN0eCk7CiB9CiAKLWludCBpbnRlbF9sb2dpY2Fs X3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXF1ZXN0LAotCQkJCQkgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKK2ludCBpbnRlbF9s b2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXF1ZXN0KQogewogCWludCByZXQ7CiAKLQlpZiAoY3R4ICE9IHJlcXVlc3QtPnJpbmct PmRlZmF1bHRfY29udGV4dCkgewotCQlyZXQgPSBpbnRlbF9scl9jb250ZXh0X3BpbihyZXF1ZXN0 LT5yaW5nLCBjdHgpOworCWlmIChyZXF1ZXN0LT5jdHggIT0gcmVxdWVzdC0+cmluZy0+ZGVmYXVs dF9jb250ZXh0KSB7CisJCXJldCA9IGludGVsX2xyX2NvbnRleHRfcGluKHJlcXVlc3QtPnJpbmcs IHJlcXVlc3QtPmN0eCk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCX0KIAotCXJlcXVl c3QtPnJpbmdidWYgPSBjdHgtPmVuZ2luZVtyZXF1ZXN0LT5yaW5nLT5pZF0ucmluZ2J1ZjsKLQly ZXF1ZXN0LT5jdHggICAgID0gY3R4OwotCWk5MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNlKHJlcXVl c3QtPmN0eCk7CisJcmVxdWVzdC0+cmluZ2J1ZiA9IHJlcXVlc3QtPmN0eC0+ZW5naW5lW3JlcXVl c3QtPnJpbmctPmlkXS5yaW5nYnVmOwogCiAJcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5oCmluZGV4IDA0ZDNhNmQuLjQxNDhkZTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5o CkBAIC0zNiw4ICszNiw3IEBACiAjZGVmaW5lIFJJTkdfQ09OVEVYVF9TVEFUVVNfUFRSKHJpbmcp CSgocmluZyktPm1taW9fYmFzZSsweDNhMCkKIAogLyogTG9naWNhbCBSaW5ncyAqLwotaW50IGlu dGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcXVlc3QsCi0JCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KTsK K2ludCBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsKIHZvaWQgaW50ZWxfbG9naWNhbF9yaW5nX3N0b3Ao c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19j bGVhbnVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogaW50IGludGVsX2xvZ2ljYWxf cmluZ3NfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKLS0gCjEuNy45LjUKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==