From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: [RFCv2 10/12] drm/i915: Port of Added scheduler support to __wait_request() calls Date: Tue, 21 Jul 2015 14:58:53 +0100 Message-ID: <1437487135-32520-11-git-send-email-tomas.elf@intel.com> References: <1437487135-32520-1-git-send-email-tomas.elf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 9BE126E93B for ; Tue, 21 Jul 2015 07:00:46 -0700 (PDT) In-Reply-To: <1437487135-32520-1-git-send-email-tomas.elf@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 VGhpcyBpcyBhIHBhcnRpYWwgcG9ydCBvZiB0aGUgZm9sbG93aW5nIHBhdGNoIGZyb20gSm9obiBI YXJyaXNvbidzIEdQVQpzY2hlZHVsZXIgcGF0Y2ggc2VyaWVzOiAocGF0Y2ggc2VudCB0byBJbnRl bC1HRlggd2l0aCB0aGUgc3ViamVjdCBsaW5lCiJbSW50ZWwtZ2Z4XSBbUkZDIDE5LzM5XSBkcm0v aTkxNTogQWRkZWQgc2NoZWR1bGVyIHN1cHBvcnQgdG8gX193YWl0X3JlcXVlc3QoKQpjYWxscyIg b24gRnJpIDE3IEp1bHkgMjAxNSkKCglBdXRob3I6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJy aXNvbkBJbnRlbC5jb20+CglEYXRlOiAgIFRodSBBcHIgMTAgMTA6NDg6NTUgMjAxNCArMDEwMAoJ U3ViamVjdDogZHJtL2k5MTU6IEFkZGVkIHNjaGVkdWxlciBzdXBwb3J0IHRvIF9fd2FpdF9yZXF1 ZXN0KCkgY2FsbHMKClJlbW92ZWQgYWxsIHNjaGVkdWxlciByZWZlcmVuY2VzIGFuZCBiYWNrcG9y dGVkIGl0IHRvIHRoaXMgYmFzZWxpbmUuIFRoZSByZWFzb24Kd2UgbmVlZCB0aGlzIGlzIGJlY2F1 c2UgQ2hyaXMgV2lsc29uIGhhcyBwb2ludGVkIG91dCB0aGF0IHRocmVhZHMgdGhhdCBkb24ndApo b2xkIHRoZSBzdHJ1Y3RfbXV0ZXggc2hvdWxkIG5vdCBiZSB0aHJvd24gb3V0IG9mIF9faTkxNV93 YWl0X3JlcXVlc3QgZHVyaW5nClREUiBoYW5nIHJlY292ZXJ5LiBUaGVyZWZvcmUgd2UgbmVlZCBh IHdheSB0byBkZXRlcm1pbmUgd2hpY2ggdGhyZWFkcyBhcmUKaG9sZGluZyB0aGUgbXV0ZXggYW5k IHdoaWNoIGFyZSBub3QuCgpTaWduZWQtb2ZmLWJ5OiBUb21hcyBFbGYgPHRvbWFzLmVsZkBpbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPGpvaG4uYy5oYXJyaXNvbkBpbnRl bC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IE1p a2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYyAgICAgIHwgMTEgKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyB8ICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygr KSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA5ZjM3Y2JhLi4y Y2Y4YjM4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI4NjQsNyArMjg2NCw4IEBAIGlu dCBfX2k5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAog CQkJdW5zaWduZWQgcmVzZXRfY291bnRlciwKIAkJCWJvb2wgaW50ZXJydXB0aWJsZSwKIAkJCXM2 NCAqdGltZW91dCwKLQkJCXN0cnVjdCBkcm1faTkxNV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdik7 CisJCQlzdHJ1Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXYsCisJCQlib29sIGlz X2xvY2tlZCk7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIGludCBpOTE1X2dlbV9mYXVsdChzdHJ1Y3Qgdm1fYXJl YV9zdHJ1Y3QgKnZtYSwgc3RydWN0IHZtX2ZhdWx0ICp2bWYpOwogaW50IF9fbXVzdF9jaGVjawpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggMDM2NzM1Yi4uMzQwNDE4YiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbS5jCkBAIC0xMjMzLDcgKzEyMzMsOCBAQCBpbnQgX19pOTE1X3dhaXRfcmVxdWVz dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCXVuc2lnbmVkIHJlc2V0X2Nv dW50ZXIsCiAJCQlib29sIGludGVycnVwdGlibGUsCiAJCQlzNjQgKnRpbWVvdXQsCi0JCQlzdHJ1 Y3QgZHJtX2k5MTVfZmlsZV9wcml2YXRlICpmaWxlX3ByaXYpCisJCQlzdHJ1Y3QgZHJtX2k5MTVf ZmlsZV9wcml2YXRlICpmaWxlX3ByaXYsCisJCQlib29sIGlzX2xvY2tlZCkKIHsKIAlzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfcmluZyhyZXEpOwog CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CkBAIC0xMzc2LDcgKzEzNzcsNyBA QCBpOTE1X3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAly ZXNldF9jb3VudGVyID0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291 bnRlcik7CiAJaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVuY2UocmVxKTsKIAlyZXQgPSBfX2k5MTVf d2FpdF9yZXF1ZXN0KHJlcSwgcmVzZXRfY291bnRlciwKLQkJCQkgIGludGVycnVwdGlibGUsIE5V TEwsIE5VTEwpOworCQkJCSAgaW50ZXJydXB0aWJsZSwgTlVMTCwgTlVMTCwgdHJ1ZSk7CiAJaTkx NV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZShyZXEpOwogCXJldHVybiByZXQ7CiB9CkBAIC0xNDU2 LDcgKzE0NTcsNyBAQCBpOTE1X2dlbV9vYmplY3Rfd2FpdF9yZW5kZXJpbmdfX25vbmJsb2NraW5n KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJcmVzZXRfY291bnRlciA9IGF0b21p Y19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpOwogCWk5MTVfZ2VtX3Jl cXVlc3RfcmVmZXJlbmNlKHJlcSk7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7 Ci0JcmV0ID0gX19pOTE1X3dhaXRfcmVxdWVzdChyZXEsIHJlc2V0X2NvdW50ZXIsIHRydWUsIE5V TEwsIGZpbGVfcHJpdik7CisJcmV0ID0gX19pOTE1X3dhaXRfcmVxdWVzdChyZXEsIHJlc2V0X2Nv dW50ZXIsIHRydWUsIE5VTEwsIGZpbGVfcHJpdiwgZmFsc2UpOwogCW11dGV4X2xvY2soJmRldi0+ c3RydWN0X211dGV4KTsKIAlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcSk7CiAJaWYg KHJldCkKQEAgLTI5NTAsNyArMjk1MSw3IEBAIGk5MTVfZ2VtX3dhaXRfaW9jdGwoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCiAJcmV0 ID0gX19pOTE1X3dhaXRfcmVxdWVzdChyZXEsIHJlc2V0X2NvdW50ZXIsIHRydWUsCiAJCQkJICBh cmdzLT50aW1lb3V0X25zID4gMCA/ICZhcmdzLT50aW1lb3V0X25zIDogTlVMTCwKLQkJCQkgIGZp bGUtPmRyaXZlcl9wcml2KTsKKwkJCQkgIGZpbGUtPmRyaXZlcl9wcml2LCBmYWxzZSk7CiAJaTkx NV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZV9fdW5sb2NrZWQocmVxKTsKIAlyZXR1cm4gcmV0Owog CkBAIC00MTM5LDcgKzQxNDAsNyBAQCBpOTE1X2dlbV9yaW5nX3Rocm90dGxlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIAlpZiAodGFyZ2V0ID09IE5VTEwp CiAJCXJldHVybiAwOwogCi0JcmV0ID0gX19pOTE1X3dhaXRfcmVxdWVzdCh0YXJnZXQsIHJlc2V0 X2NvdW50ZXIsIHRydWUsIE5VTEwsIE5VTEwpOworCXJldCA9IF9faTkxNV93YWl0X3JlcXVlc3Qo dGFyZ2V0LCByZXNldF9jb3VudGVyLCB0cnVlLCBOVUxMLCBOVUxMLCBmYWxzZSk7CiAJaWYgKHJl dCA9PSAwKQogCQlxdWV1ZV9kZWxheWVkX3dvcmsoZGV2X3ByaXYtPndxLCAmZGV2X3ByaXYtPm1t LnJldGlyZV93b3JrLCAwKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4 IDk3OTIyZmIuLjNlMWRiOTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAg LTEwMzU4LDcgKzEwMzU4LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW1pb19mbGlwX3dvcmtfZnVu YyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJaWYgKG1taW9fZmxpcC0+cmVxKQogCQlXQVJO X09OKF9faTkxNV93YWl0X3JlcXVlc3QobW1pb19mbGlwLT5yZXEsCiAJCQkJCSAgICBjcnRjLT5y ZXNldF9jb3VudGVyLAotCQkJCQkgICAgZmFsc2UsIE5VTEwsIE5VTEwpICE9IDApOworCQkJCQkg ICAgZmFsc2UsIE5VTEwsIE5VTEwsIGZhbHNlKSAhPSAwKTsKIAogCWludGVsX2RvX21taW9fZmxp cChjcnRjKTsKIAlpZiAobW1pb19mbGlwLT5yZXEpIHsKLS0gCjEuOS4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=