From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: [PATCH 15/20] drm/i915: Port of Added scheduler support to __wait_request() calls Date: Fri, 23 Oct 2015 02:32:37 +0100 Message-ID: <1445563962-20753-16-git-send-email-tomas.elf@intel.com> References: <1445563962-20753-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 90E4C6E7C9 for ; Thu, 22 Oct 2015 18:33:47 -0700 (PDT) In-Reply-To: <1445563962-20753-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 Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgMTYgKysrKysrKysrKy0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAgIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAgMiArLQogNCBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNl cnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDVi NTQ2NzUuLjViMTRkOTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzA1NCw3ICszMDU0 LDggQEAgaW50IF9faTkxNV93YWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXEsCiAJCQl1bnNpZ25lZCByZXNldF9jb3VudGVyLAogCQkJYm9vbCBpbnRlcnJ1cHRpYmxl LAogCQkJczY0ICp0aW1lb3V0LAotCQkJc3RydWN0IGludGVsX3Jwc19jbGllbnQgKnJwcyk7CisJ CQlzdHJ1Y3QgaW50ZWxfcnBzX2NsaWVudCAqcnBzLAorCQkJYm9vbCBpc19sb2NrZWQpOwogaW50 IF9fbXVzdF9jaGVjayBpOTE1X3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcSk7CiBpbnQgaTkxNV9nZW1fZmF1bHQoc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEs IHN0cnVjdCB2bV9mYXVsdCAqdm1mKTsKIGludCBfX211c3RfY2hlY2sKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCmluZGV4IDk1NTY5Y2MuLmUzYTA2YWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpA QCAtMTIwNiw2ICsxMjA2LDggQEAgc3RhdGljIGludCBfX2k5MTVfc3Bpbl9yZXF1ZXN0KHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogICogQHJlc2V0X2NvdW50ZXI6IHJlc2V0IHNl cXVlbmNlIGFzc29jaWF0ZWQgd2l0aCB0aGUgZ2l2ZW4gcmVxdWVzdAogICogQGludGVycnVwdGli bGU6IGRvIGFuIGludGVycnVwdGlibGUgd2FpdCAobm9ybWFsbHkgeWVzKQogICogQHRpbWVvdXQ6 IGluIC0gaG93IGxvbmcgdG8gd2FpdCAoTlVMTCBmb3JldmVyKTsgb3V0IC0gaG93IG11Y2ggdGlt ZSByZW1haW5pbmcKKyAqIEBycHM6IC4uLgorICogQGlzX2xvY2tlZDogdHJ1ZSA9IENhbGxlciBp cyBob2xkaW5nIHN0cnVjdF9tdXRleAogICoKICAqIE5vdGU6IEl0IGlzIG9mIHV0bW9zdCBpbXBv cnRhbmNlIHRoYXQgdGhlIHBhc3NlZCBpbiBzZXFubyBhbmQgcmVzZXRfY291bnRlcgogICogdmFs dWVzIGhhdmUgYmVlbiByZWFkIGJ5IHRoZSBjYWxsZXIgaW4gYW4gc21wIHNhZmUgbWFubmVyLiBX aGVyZSByZWFkLXNpZGUKQEAgLTEyMjEsNyArMTIyMyw4IEBAIGludCBfX2k5MTVfd2FpdF9yZXF1 ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAogCQkJdW5zaWduZWQgcmVzZXRf Y291bnRlciwKIAkJCWJvb2wgaW50ZXJydXB0aWJsZSwKIAkJCXM2NCAqdGltZW91dCwKLQkJCXN0 cnVjdCBpbnRlbF9ycHNfY2xpZW50ICpycHMpCisJCQlzdHJ1Y3QgaW50ZWxfcnBzX2NsaWVudCAq cnBzLAorCQkJYm9vbCBpc19sb2NrZWQpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3JpbmcocmVxKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2ID0gcmluZy0+ZGV2OwpAQCAtMTQ1NSw3ICsxNDU4LDcgQEAgaTkxNV93YWl0X3JlcXVlc3Qo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAKIAlyZXQgPSBfX2k5MTVfd2FpdF9y ZXF1ZXN0KHJlcSwKIAkJCQkgIGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0 X2NvdW50ZXIpLAotCQkJCSAgaW50ZXJydXB0aWJsZSwgTlVMTCwgTlVMTCk7CisJCQkJICBpbnRl cnJ1cHRpYmxlLCBOVUxMLCBOVUxMLCB0cnVlKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owog CkBAIC0xNTY4LDcgKzE1NzEsNyBAQCBpOTE1X2dlbV9vYmplY3Rfd2FpdF9yZW5kZXJpbmdfX25v bmJsb2NraW5nKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJbXV0ZXhfdW5sb2Nr KCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJZm9yIChpID0gMDsgcmV0ID09IDAgJiYgaSA8IG47IGkr KykKIAkJcmV0ID0gX19pOTE1X3dhaXRfcmVxdWVzdChyZXF1ZXN0c1tpXSwgcmVzZXRfY291bnRl ciwgdHJ1ZSwKLQkJCQkJICBOVUxMLCBycHMpOworCQkJCQkgIE5VTEwsIHJwcywgZmFsc2UpOwog CW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAogCWZvciAoaSA9IDA7IGkgPCBuOyBp KyspIHsKQEAgLTMwODUsNyArMzA4OCw3IEBAIGk5MTVfZ2VtX3dhaXRfaW9jdGwoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxlICpmaWxlKQogCQlpZiAo cmV0ID09IDApCiAJCQlyZXQgPSBfX2k5MTVfd2FpdF9yZXF1ZXN0KHJlcVtpXSwgcmVzZXRfY291 bnRlciwgdHJ1ZSwKIAkJCQkJCSAgYXJncy0+dGltZW91dF9ucyA+IDAgPyAmYXJncy0+dGltZW91 dF9ucyA6IE5VTEwsCi0JCQkJCQkgIGZpbGUtPmRyaXZlcl9wcml2KTsKKwkJCQkJCSAgZmlsZS0+ ZHJpdmVyX3ByaXYsIGZhbHNlKTsKIAkJaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZV9fdW5s b2NrZWQocmVxW2ldKTsKIAl9CiAJcmV0dXJuIHJldDsKQEAgLTMxMTgsNyArMzEyMSw4IEBAIF9f aTkxNV9nZW1fb2JqZWN0X3N5bmMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJ CQkJICBhdG9taWNfcmVhZCgmaTkxNS0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpLAogCQkJCQkg IGk5MTUtPm1tLmludGVycnVwdGlibGUsCiAJCQkJCSAgTlVMTCwKLQkJCQkJICAmaTkxNS0+cnBz LnNlbWFwaG9yZXMpOworCQkJCQkgICZpOTE1LT5ycHMuc2VtYXBob3JlcywKKwkJCQkJICB0cnVl KTsgLyogSXMgdGhlIG11dGV4IGFsd2F5cyBoZWxkIGJ5IHRoaXMgdGhyZWFkIGF0IHRoaXMgcG9p bnQ/ICovCiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCkBAIC00MDc3LDcgKzQwODEsNyBA QCBpOTE1X2dlbV9yaW5nX3Rocm90dGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBk cm1fZmlsZSAqZmlsZSkKIAlpZiAodGFyZ2V0ID09IE5VTEwpCiAJCXJldHVybiAwOwogCi0JcmV0 ID0gX19pOTE1X3dhaXRfcmVxdWVzdCh0YXJnZXQsIHJlc2V0X2NvdW50ZXIsIHRydWUsIE5VTEws IE5VTEwpOworCXJldCA9IF9faTkxNV93YWl0X3JlcXVlc3QodGFyZ2V0LCByZXNldF9jb3VudGVy LCB0cnVlLCBOVUxMLCBOVUxMLCBmYWxzZSk7CiAJaWYgKHJldCA9PSAwKQogCQlxdWV1ZV9kZWxh eWVkX3dvcmsoZGV2X3ByaXYtPndxLCAmZGV2X3ByaXYtPm1tLnJldGlyZV93b3JrLCAwKTsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDFmYzFkMjQuLmNmNjg0ODMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTExMTk4LDcgKzExMTk4LDggQEAg c3RhdGljIHZvaWQgaW50ZWxfbW1pb19mbGlwX3dvcmtfZnVuYyhzdHJ1Y3Qgd29ya19zdHJ1Y3Qg KndvcmspCiAJCVdBUk5fT04oX19pOTE1X3dhaXRfcmVxdWVzdChtbWlvX2ZsaXAtPnJlcSwKIAkJ CQkJICAgIG1taW9fZmxpcC0+Y3J0Yy0+cmVzZXRfY291bnRlciwKIAkJCQkJICAgIGZhbHNlLCBO VUxMLAotCQkJCQkgICAgJm1taW9fZmxpcC0+aTkxNS0+cnBzLm1taW9mbGlwcykpOworCQkJCQkg ICAgJm1taW9fZmxpcC0+aTkxNS0+cnBzLm1taW9mbGlwcywKKwkJCQkJICAgIGZhbHNlKSk7CiAJ CWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2VfX3VubG9ja2VkKG1taW9fZmxpcC0+cmVxKTsK IAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCAzNzU2ZmJi Li5hYmQyOTcyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0y MzY4LDcgKzIzNjgsNyBAQCBpbnQgaW50ZWxfcmluZ19pZGxlKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcpCiAJcmV0dXJuIF9faTkxNV93YWl0X3JlcXVlc3QocmVxLAogCQkJCSAgIGF0b21p Y19yZWFkKCZ0b19pOTE1KHJpbmctPmRldiktPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKSwKIAkJ CQkgICB0b19pOTE1KHJpbmctPmRldiktPm1tLmludGVycnVwdGlibGUsCi0JCQkJICAgTlVMTCwg TlVMTCk7CisJCQkJICAgTlVMTCwgTlVMTCwgdHJ1ZSk7IC8qIElzIHRoZSBtdXRleCBhbHdheXMg aGVsZCBieSB0aGlzIHRocmVhZCBhdCB0aGlzIHBvaW50PyAqLwogfQogCiBpbnQgaW50ZWxfcmlu Z19hbGxvY19yZXF1ZXN0X2V4dHJhcyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVl c3QpCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK