From: Arun Siluvery Subject: [PATCH 15/20] drm/i915: Port of Added scheduler support to __wait_request() calls Date: Wed, 13 Jan 2016 17:28:27 +0000 Message-ID: <1452706112-8617-16-git-send-email-arun.siluvery@linux.intel.com> References: <1452706112-8617-1-git-send-email-arun.siluvery@linux.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 317E17A076 for ; Wed, 13 Jan 2016 09:29:03 -0800 (PST) In-Reply-To: <1452706112-8617-1-git-send-email-arun.siluvery@linux.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 Cc: Tomas Elf List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgoKVGhpcyBpcyBhIHBhcnRpYWwg cG9ydCBvZiB0aGUgZm9sbG93aW5nIHBhdGNoIGZyb20gSm9obiBIYXJyaXNvbidzIEdQVQpzY2hl ZHVsZXIgcGF0Y2ggc2VyaWVzOiAocGF0Y2ggc2VudCB0byBJbnRlbC1HRlggd2l0aCB0aGUgc3Vi amVjdCBsaW5lCiJbSW50ZWwtZ2Z4XSBbUkZDIDE5LzM5XSBkcm0vaTkxNTogQWRkZWQgc2NoZWR1 bGVyIHN1cHBvcnQgdG8gX193YWl0X3JlcXVlc3QoKQpjYWxscyIgb24gRnJpIDE3IEp1bHkgMjAx NSkKCglBdXRob3I6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+CglE YXRlOiAgIFRodSBBcHIgMTAgMTA6NDg6NTUgMjAxNCArMDEwMAoJU3ViamVjdDogZHJtL2k5MTU6 IEFkZGVkIHNjaGVkdWxlciBzdXBwb3J0IHRvIF9fd2FpdF9yZXF1ZXN0KCkgY2FsbHMKClJlbW92 ZWQgYWxsIHNjaGVkdWxlciByZWZlcmVuY2VzIGFuZCBiYWNrcG9ydGVkIGl0IHRvIHRoaXMgYmFz ZWxpbmUuIFRoZSByZWFzb24Kd2UgbmVlZCB0aGlzIGlzIGJlY2F1c2UgQ2hyaXMgV2lsc29uIGhh cyBwb2ludGVkIG91dCB0aGF0IHRocmVhZHMgdGhhdCBkb24ndApob2xkIHRoZSBzdHJ1Y3RfbXV0 ZXggc2hvdWxkIG5vdCBiZSB0aHJvd24gb3V0IG9mIF9faTkxNV93YWl0X3JlcXVlc3QgZHVyaW5n ClREUiBoYW5nIHJlY292ZXJ5LiBUaGVyZWZvcmUgd2UgbmVlZCBhIHdheSB0byBkZXRlcm1pbmUg d2hpY2ggdGhyZWFkcyBhcmUKaG9sZGluZyB0aGUgbXV0ZXggYW5kIHdoaWNoIGFyZSBub3QuCgpT aWduZWQtb2ZmLWJ5OiBUb21hcyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IEpvaG4gSGFycmlzb24gPGpvaG4uYy5oYXJyaXNvbkBpbnRlbC5jb20+CkNjOiBDaHJpcyBX aWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eu a3VvcHBhbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBcnVuIFNpbHV2ZXJ5IDxh cnVuLnNpbHV2ZXJ5QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oICAgICAgICAgfCAgMyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgICAgICAgICB8IDE2ICsrKysrKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyAgICB8ICA1ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMgfCAgMiArLQogNCBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAx MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBhNjU3MjJkLi5mMWM1 NmIzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMxMDIsNyArMzEwMiw4IEBAIGludCBf X2k5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJ dW5zaWduZWQgcmVzZXRfY291bnRlciwKIAkJCWJvb2wgaW50ZXJydXB0aWJsZSwKIAkJCXM2NCAq dGltZW91dCwKLQkJCXN0cnVjdCBpbnRlbF9ycHNfY2xpZW50ICpycHMpOworCQkJc3RydWN0IGlu dGVsX3Jwc19jbGllbnQgKnJwcywKKwkJCWJvb2wgaXNfbG9ja2VkKTsKIGludCBfX211c3RfY2hl Y2sgaTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwog aW50IGk5MTVfZ2VtX2ZhdWx0KHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hLCBzdHJ1Y3Qgdm1f ZmF1bHQgKnZtZik7CiBpbnQgX19tdXN0X2NoZWNrCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRl eCBlNmViNDVkLi43MTIyMzE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTEyNTcsNiAr MTI1Nyw4IEBAIHN0YXRpYyBpbnQgX19pOTE1X3NwaW5fcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJlcSwgaW50IHN0YXRlKQogICogQHJlc2V0X2NvdW50ZXI6IHJlc2V0IHNl cXVlbmNlIGFzc29jaWF0ZWQgd2l0aCB0aGUgZ2l2ZW4gcmVxdWVzdAogICogQGludGVycnVwdGli bGU6IGRvIGFuIGludGVycnVwdGlibGUgd2FpdCAobm9ybWFsbHkgeWVzKQogICogQHRpbWVvdXQ6 IGluIC0gaG93IGxvbmcgdG8gd2FpdCAoTlVMTCBmb3JldmVyKTsgb3V0IC0gaG93IG11Y2ggdGlt ZSByZW1haW5pbmcKKyAqIEBycHM6IC4uLgorICogQGlzX2xvY2tlZDogdHJ1ZSA9IENhbGxlciBp cyBob2xkaW5nIHN0cnVjdF9tdXRleAogICoKICAqIE5vdGU6IEl0IGlzIG9mIHV0bW9zdCBpbXBv cnRhbmNlIHRoYXQgdGhlIHBhc3NlZCBpbiBzZXFubyBhbmQgcmVzZXRfY291bnRlcgogICogdmFs dWVzIGhhdmUgYmVlbiByZWFkIGJ5IHRoZSBjYWxsZXIgaW4gYW4gc21wIHNhZmUgbWFubmVyLiBX aGVyZSByZWFkLXNpZGUKQEAgLTEyNzIsNyArMTI3NCw4IEBAIGludCBfX2k5MTVfd2FpdF9yZXF1 ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJdW5zaWduZWQgcmVzZXRf Y291bnRlciwKIAkJCWJvb2wgaW50ZXJydXB0aWJsZSwKIAkJCXM2NCAqdGltZW91dCwKLQkJCXN0 cnVjdCBpbnRlbF9ycHNfY2xpZW50ICpycHMpCisJCQlzdHJ1Y3QgaW50ZWxfcnBzX2NsaWVudCAq cnBzLAorCQkJYm9vbCBpc19sb2NrZWQpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcocmVxKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gcmluZy0+ZGV2OwpAQCAtMTUxNCw3ICsxNTE3LDcgQEAgaTkxNV93YWl0X3JlcXVlc3Qo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAKIAlyZXQgPSBfX2k5MTVfd2FpdF9y ZXF1ZXN0KHJlcSwKIAkJCQkgIGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0 X2NvdW50ZXIpLAotCQkJCSAgaW50ZXJydXB0aWJsZSwgTlVMTCwgTlVMTCk7CisJCQkJICBpbnRl cnJ1cHRpYmxlLCBOVUxMLCBOVUxMLCB0cnVlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owog CkBAIC0xNjI3LDcgKzE2MzAsNyBAQCBpOTE1X2dlbV9vYmplY3Rfd2FpdF9yZW5kZXJpbmdfX25v bmJsb2NraW5nKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJbXV0ZXhfdW5sb2Nr KCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJZm9yIChpID0gMDsgcmV0ID09IDAgJiYgaSA8IG47IGkr KykKIAkJcmV0ID0gX19pOTE1X3dhaXRfcmVxdWVzdChyZXF1ZXN0c1tpXSwgcmVzZXRfY291bnRl ciwgdHJ1ZSwKLQkJCQkJICBOVUxMLCBycHMpOworCQkJCQkgIE5VTEwsIHJwcywgZmFsc2UpOwog CW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAogCWZvciAoaSA9IDA7IGkgPCBuOyBp KyspIHsKQEAgLTMxNjAsNyArMzE2Myw3IEBAIGk5MTVfZ2VtX3dhaXRfaW9jdGwoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCQlpZiAo cmV0ID09IDApCiAJCQlyZXQgPSBfX2k5MTVfd2FpdF9yZXF1ZXN0KHJlcVtpXSwgcmVzZXRfY291 bnRlciwgdHJ1ZSwKIAkJCQkJCSAgYXJncy0+dGltZW91dF9ucyA+IDAgPyAmYXJncy0+dGltZW91 dF9ucyA6IE5VTEwsCi0JCQkJCQkgIHRvX3Jwc19jbGllbnQoZmlsZSkpOworCQkJCQkJICB0b19y cHNfY2xpZW50KGZpbGUpLCBmYWxzZSk7CiAJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2Vf X3VubG9ja2VkKHJlcVtpXSk7CiAJfQogCXJldHVybiByZXQ7CkBAIC0zMTkzLDcgKzMxOTYsOCBA QCBfX2k5MTVfZ2VtX29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmos CiAJCQkJCSAgYXRvbWljX3JlYWQoJmk5MTUtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKSwKIAkJ CQkJICBpOTE1LT5tbS5pbnRlcnJ1cHRpYmxlLAogCQkJCQkgIE5VTEwsCi0JCQkJCSAgJmk5MTUt PnJwcy5zZW1hcGhvcmVzKTsKKwkJCQkJICAmaTkxNS0+cnBzLnNlbWFwaG9yZXMsCisJCQkJCSAg dHJ1ZSk7IC8qIElzIHRoZSBtdXRleCBhbHdheXMgaGVsZCBieSB0aGlzIHRocmVhZCBhdCB0aGlz IHBvaW50PyAqLwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIApAQCAtNDE3Miw3ICs0MTc2 LDcgQEAgaTkxNV9nZW1fcmluZ190aHJvdHRsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1 Y3QgZHJtX2ZpbGUgKmZpbGUpCiAJaWYgKHRhcmdldCA9PSBOVUxMKQogCQlyZXR1cm4gMDsKIAot CXJldCA9IF9faTkxNV93YWl0X3JlcXVlc3QodGFyZ2V0LCByZXNldF9jb3VudGVyLCB0cnVlLCBO VUxMLCBOVUxMKTsKKwlyZXQgPSBfX2k5MTVfd2FpdF9yZXF1ZXN0KHRhcmdldCwgcmVzZXRfY291 bnRlciwgdHJ1ZSwgTlVMTCwgTlVMTCwgZmFsc2UpOwogCWlmIChyZXQgPT0gMCkKIAkJcXVldWVf ZGVsYXllZF93b3JrKGRldl9wcml2LT53cSwgJmRldl9wcml2LT5tbS5yZXRpcmVfd29yaywgMCk7 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBhYmZiNWJhLi43NGU5N2Q1 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMTQ2OCw3ICsxMTQ2OCw4 IEBAIHN0YXRpYyB2b2lkIGludGVsX21taW9fZmxpcF93b3JrX2Z1bmMoc3RydWN0IHdvcmtfc3Ry dWN0ICp3b3JrKQogCQlXQVJOX09OKF9faTkxNV93YWl0X3JlcXVlc3QobW1pb19mbGlwLT5yZXEs CiAJCQkJCSAgICBtbWlvX2ZsaXAtPmNydGMtPnJlc2V0X2NvdW50ZXIsCiAJCQkJCSAgICBmYWxz ZSwgTlVMTCwKLQkJCQkJICAgICZtbWlvX2ZsaXAtPmk5MTUtPnJwcy5tbWlvZmxpcHMpKTsKKwkJ CQkJICAgICZtbWlvX2ZsaXAtPmk5MTUtPnJwcy5tbWlvZmxpcHMsCisJCQkJCSAgICBmYWxzZSkp OwogCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlX191bmxvY2tlZChtbWlvX2ZsaXAtPnJl cSk7CiAJfQogCkBAIC0xMzUyMyw3ICsxMzUyNCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWlj X3ByZXBhcmVfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAkJCXJldCA9IF9faTkx NV93YWl0X3JlcXVlc3QoaW50ZWxfcGxhbmVfc3RhdGUtPndhaXRfcmVxLAogCQkJCQkJICByZXNl dF9jb3VudGVyLCB0cnVlLAotCQkJCQkJICBOVUxMLCBOVUxMKTsKKwkJCQkJCSAgTlVMTCwgTlVM TCwgZmFsc2UpOwogCiAJCQkvKiBTd2FsbG93IC1FSU8gZXJyb3JzIHRvIGFsbG93IHVwZGF0ZXMg ZHVyaW5nIGh3IGxvY2t1cC4gKi8KIAkJCWlmIChyZXQgPT0gLUVJTykKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBmOTU5MzI2Li5lYzFiODVmIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0yMzcyLDcgKzIzNzIsNyBAQCBpbnQg aW50ZWxfcmluZ19pZGxlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJcmV0dXJuIF9f aTkxNV93YWl0X3JlcXVlc3QocmVxLAogCQkJCSAgIGF0b21pY19yZWFkKCZ0b19pOTE1KHJpbmct PmRldiktPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKSwKIAkJCQkgICB0b19pOTE1KHJpbmctPmRl diktPm1tLmludGVycnVwdGlibGUsCi0JCQkJICAgTlVMTCwgTlVMTCk7CisJCQkJICAgTlVMTCwg TlVMTCwgdHJ1ZSk7IC8qIElzIHRoZSBtdXRleCBhbHdheXMgaGVsZCBieSB0aGlzIHRocmVhZCBh dCB0aGlzIHBvaW50PyAqLwogfQogCiBpbnQgaW50ZWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJh cyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCi0tIAoxLjkuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK