From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 08/59] drm/i915: Set context in request from creation even in legacy mode Date: Thu, 19 Mar 2015 12:30:13 +0000 Message-ID: <1426768264-16996-9-git-send-email-John.C.Harrison@Intel.com> References: <1426768264-16996-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id E10EB6EA05 for ; Thu, 19 Mar 2015 05:31:15 -0700 (PDT) In-Reply-To: <1426768264-16996-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 b2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgIHwgICAxNCArKysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMgfCAgIDExICsrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu aCB8ICAgIDMgKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDE4IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGNkZjFjOWQuLmYzNWFjN2YgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMjM5MywxNCArMjM5Myw3IEBAIHZvaWQgX19pOTE1 X2FkZF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJICovCiAJcmVxdWVz dC0+YmF0Y2hfb2JqID0gb2JqOwogCi0JaWYgKCFpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKLQkJ LyogSG9sZCBhIHJlZmVyZW5jZSB0byB0aGUgY3VycmVudCBjb250ZXh0IHNvIHRoYXQgd2UgY2Fu IGluc3BlY3QKLQkJICogaXQgbGF0ZXIgaW4gY2FzZSBhIGhhbmdjaGVjayBlcnJvciBldmVudCBm aXJlcy4KLQkJICovCi0JCXJlcXVlc3QtPmN0eCA9IHJpbmctPmxhc3RfY29udGV4dDsKLQkJaWYg KHJlcXVlc3QtPmN0eCkKLQkJCWk5MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNlKHJlcXVlc3QtPmN0 eCk7Ci0JfQorCVdBUk5fT04oIWk5MTUuZW5hYmxlX2V4ZWNsaXN0cyAmJiAocmVxdWVzdC0+Y3R4 ICE9IHJpbmctPmxhc3RfY29udGV4dCkpOwogCiAJcmVxdWVzdC0+ZW1pdHRlZF9qaWZmaWVzID0g amlmZmllczsKIAlsaXN0X2FkZF90YWlsKCZyZXF1ZXN0LT5saXN0LCAmcmluZy0+cmVxdWVzdF9s aXN0KTsKQEAgLTI1NDUsMTIgKzI1MzgsMTUgQEAgaW50IGk5MTVfZ2VtX3JlcXVlc3RfYWxsb2Mo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAlrcmVmX2luaXQoJnJlcXVlc3QtPnJlZik7 CiAJcmVxdWVzdC0+cmluZyA9IHJpbmc7CiAJcmVxdWVzdC0+dW5pcSA9IGRldl9wcml2YXRlLT5y ZXF1ZXN0X3VuaXErKzsKKwlyZXF1ZXN0LT5jdHggID0gY3R4OworCWk5MTVfZ2VtX2NvbnRleHRf cmVmZXJlbmNlKHJlcXVlc3QtPmN0eCk7CiAKIAlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQot CQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMocmVxdWVzdCwg Y3R4KTsKKwkJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHJl cXVlc3QpOwogCWVsc2UKIAkJcmV0ID0gaW50ZWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhy ZXF1ZXN0KTsKIAlpZiAocmV0KSB7CisJCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UocmVx dWVzdC0+Y3R4KTsKIAkJa2ZyZWUocmVxdWVzdCk7CiAJCXJldHVybiByZXQ7CiAJfQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwppbmRleCA4ZDQ4NzYxLi5hMGNlNjViIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYwpAQCAtNjExLDIwICs2MTEsMTcgQEAgc3RhdGljIGludCBleGVjbGlzdHNfbW92 ZV90b19ncHUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJcmV0dXJuIGxvZ2lj YWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMocmluZ2J1ZiwgY3R4KTsKIH0KIAotaW50IGlu dGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcXVlc3QsCi0JCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQor aW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJaW50IHJldDsKIAotCWlmIChjdHggIT0gcmVx dWVzdC0+cmluZy0+ZGVmYXVsdF9jb250ZXh0KSB7Ci0JCXJldCA9IGludGVsX2xyX2NvbnRleHRf cGluKHJlcXVlc3QtPnJpbmcsIGN0eCk7CisJaWYgKHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0LT5y aW5nLT5kZWZhdWx0X2NvbnRleHQpIHsKKwkJcmV0ID0gaW50ZWxfbHJfY29udGV4dF9waW4ocmVx dWVzdC0+cmluZywgcmVxdWVzdC0+Y3R4KTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAJ fQogCi0JcmVxdWVzdC0+cmluZ2J1ZiA9IGN0eC0+ZW5naW5lW3JlcXVlc3QtPnJpbmctPmlkXS5y aW5nYnVmOwotCXJlcXVlc3QtPmN0eCAgICAgPSBjdHg7Ci0JaTkxNV9nZW1fY29udGV4dF9yZWZl cmVuY2UocmVxdWVzdC0+Y3R4KTsKKwlyZXF1ZXN0LT5yaW5nYnVmID0gcmVxdWVzdC0+Y3R4LT5l bmdpbmVbcmVxdWVzdC0+cmluZy0+aWRdLnJpbmdidWY7CiAKIAlyZXR1cm4gMDsKIH0KZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmgKaW5kZXggMDRkM2E2ZC4uNDE0OGRlMCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmgKQEAgLTM2LDggKzM2LDcgQEAKICNkZWZpbmUgUklOR19DT05URVhUX1NUQVRV U19QVFIocmluZykJKChyaW5nKS0+bW1pb19iYXNlKzB4M2EwKQogCiAvKiBMb2dpY2FsIFJpbmdz ICovCi1pbnQgaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCwKLQkJCQkJICAgIHN0cnVjdCBpbnRlbF9jb250 ZXh0ICpjdHgpOworaW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJhcyhz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpOwogdm9pZCBpbnRlbF9sb2dpY2Fs X3Jpbmdfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIHZvaWQgaW50ZWxfbG9n aWNhbF9yaW5nX2NsZWFudXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiBpbnQgaW50 ZWxfbG9naWNhbF9yaW5nc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotLSAKMS43Ljku NQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK