From: Eric Anholt Subject: [PATCH 1/2] Revert "drm/sched: fix timeout handling v2" Date: Thu, 8 Nov 2018 08:04:21 -0800 Message-ID: <20181108160422.17743-2-eric@anholt.net> References: <20181108160422.17743-1-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 517C4893C9 for ; Thu, 8 Nov 2018 16:04:25 +0000 (UTC) In-Reply-To: <20181108160422.17743-1-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Nayan Deshmukh , Alex Deucher , linux-kernel@vger.kernel.org, =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: dri-devel@lists.freedesktop.org VGhpcyByZXZlcnRzIGNvbW1pdCAwZWZkMmQyZjY4Y2Q1ZGJkZGY0ZWNkOTc0YzMzMTMzMjU3ZDE2 YThlLiAgRml4ZXMKdGhpcyBmYWlsdXJlIGluIFYzRCBHUFUgcmVzZXQ6CgpbIDE0MTguMjI3Nzk2 XSBVbmFibGUgdG8gaGFuZGxlIGtlcm5lbCBOVUxMIHBvaW50ZXIgZGVyZWZlcmVuY2UgYXQgdmly dHVhbCBhZGRyZXNzIDAwMDAwMDE4ClsgMTQxOC4yMzU5NDddIHBnZCA9IGRjNGM1NWNhClsgMTQx OC4yMzg2OTVdIFswMDAwMDAxOF0gKnBnZD04MDAwMDA0MDAwNDAwMywgKnBtZD0wMDAwMDAwMApb IDE0MTguMjQ0MTMyXSBJbnRlcm5hbCBlcnJvcjogT29wczogMjA2IFsjMV0gU01QIEFSTQpbIDE0 MTguMjQ4OTM0XSBNb2R1bGVzIGxpbmtlZCBpbjoKWyAxNDE4LjI1MjAwMV0gQ1BVOiAwIFBJRDog MTAyNTMgQ29tbToga3dvcmtlci8wOjAgTm90IHRhaW50ZWQgNC4xOS4wLXJjNisgIzQ4NgpbIDE0 MTguMjU5MDU4XSBIYXJkd2FyZSBuYW1lOiBCcm9hZGNvbSBTVEIgKEZsYXR0ZW5lZCBEZXZpY2Ug VHJlZSkKWyAxNDE4LjI2NTAwMl0gV29ya3F1ZXVlOiBldmVudHMgZHJtX3NjaGVkX2pvYl90aW1l ZG91dApbIDE0MTguMjY5OTg2XSBQQyBpcyBhdCBkbWFfZmVuY2VfcmVtb3ZlX2NhbGxiYWNrKzB4 OC8weDUwClsgMTQxOC4yNzUyMThdIExSIGlzIGF0IGRybV9zY2hlZF9qb2JfdGltZWRvdXQrMHg0 Yy8weDExOAouLi4KWyAxNDE4LjQxNTg5MV0gWzxjMDg2Yjc1ND5dIChkbWFfZmVuY2VfcmVtb3Zl X2NhbGxiYWNrKSBmcm9tIFs8YzA2ZTdlNmM+XSAoZHJtX3NjaGVkX2pvYl90aW1lZG91dCsweDRj LzB4MTE4KQpbIDE0MTguNDI1NTcxXSBbPGMwNmU3ZTZjPl0gKGRybV9zY2hlZF9qb2JfdGltZWRv dXQpIGZyb20gWzxjMDI0MjUwMD5dIChwcm9jZXNzX29uZV93b3JrKzB4MmM4LzB4N2JjKQpbIDE0 MTguNDM0NTUyXSBbPGMwMjQyNTAwPl0gKHByb2Nlc3Nfb25lX3dvcmspIGZyb20gWzxjMDI0MmEz OD5dICh3b3JrZXJfdGhyZWFkKzB4NDQvMHg1OTApClsgMTQxOC40NDI2NjNdIFs8YzAyNDJhMzg+ XSAod29ya2VyX3RocmVhZCkgZnJvbSBbPGMwMjQ5YjEwPl0gKGt0aHJlYWQrMHgxNjAvMHgxNjgp ClsgMTQxOC40NTAwNzZdIFs8YzAyNDliMTA+XSAoa3RocmVhZCkgZnJvbSBbPGMwMjAxMGFjPl0g KHJldF9mcm9tX2ZvcmsrMHgxNC8weDI4KQoKQ2M6IENocmlzdGlhbiBLw7ZuaWcgPGNocmlzdGlh bi5rb2VuaWdAYW1kLmNvbT4KQ2M6IE5heWFuIERlc2htdWtoIDxuYXlhbjI2ZGVzaG11a2hAZ21h aWwuY29tPgpDYzogQWxleCBEZXVjaGVyIDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBFcmljIEFuaG9sdCA8ZXJpY0BhbmhvbHQubmV0PgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9zY2hlZHVsZXIvc2NoZWRfbWFpbi5jIHwgMzAgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMjkgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3NjaGVkdWxlci9zY2hlZF9tYWluLmMgYi9kcml2ZXJz L2dwdS9kcm0vc2NoZWR1bGVyL3NjaGVkX21haW4uYwppbmRleCA0NGZlNTg3YWFlZjkuLmJkN2Qx MWM0NzIwMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3NjaGVkdWxlci9zY2hlZF9tYWlu LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3NjaGVkdWxlci9zY2hlZF9tYWluLmMKQEAgLTI0OSw0 MSArMjQ5LDEzIEBAIHN0YXRpYyB2b2lkIGRybV9zY2hlZF9qb2JfdGltZWRvdXQoc3RydWN0IHdv cmtfc3RydWN0ICp3b3JrKQogewogCXN0cnVjdCBkcm1fZ3B1X3NjaGVkdWxlciAqc2NoZWQ7CiAJ c3RydWN0IGRybV9zY2hlZF9qb2IgKmpvYjsKLQlpbnQgcjsKIAogCXNjaGVkID0gY29udGFpbmVy X29mKHdvcmssIHN0cnVjdCBkcm1fZ3B1X3NjaGVkdWxlciwgd29ya190ZHIud29yayk7Ci0KLQlz cGluX2xvY2soJnNjaGVkLT5qb2JfbGlzdF9sb2NrKTsKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5X3Jl dmVyc2Uoam9iLCAmc2NoZWQtPnJpbmdfbWlycm9yX2xpc3QsIG5vZGUpIHsKLQkJc3RydWN0IGRy bV9zY2hlZF9mZW5jZSAqZmVuY2UgPSBqb2ItPnNfZmVuY2U7Ci0KLQkJaWYgKCFkbWFfZmVuY2Vf cmVtb3ZlX2NhbGxiYWNrKGZlbmNlLT5wYXJlbnQsICZmZW5jZS0+Y2IpKQotCQkJZ290byBhbHJl YWR5X3NpZ25hbGVkOwotCX0KLQogCWpvYiA9IGxpc3RfZmlyc3RfZW50cnlfb3JfbnVsbCgmc2No ZWQtPnJpbmdfbWlycm9yX2xpc3QsCiAJCQkJICAgICAgIHN0cnVjdCBkcm1fc2NoZWRfam9iLCBu b2RlKTsKLQlzcGluX3VubG9jaygmc2NoZWQtPmpvYl9saXN0X2xvY2spOwogCiAJaWYgKGpvYikK LQkJc2NoZWQtPm9wcy0+dGltZWRvdXRfam9iKGpvYik7Ci0KLQlzcGluX2xvY2soJnNjaGVkLT5q b2JfbGlzdF9sb2NrKTsKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGpvYiwgJnNjaGVkLT5yaW5nX21p cnJvcl9saXN0LCBub2RlKSB7Ci0JCXN0cnVjdCBkcm1fc2NoZWRfZmVuY2UgKmZlbmNlID0gam9i LT5zX2ZlbmNlOwotCi0JCWlmICghZmVuY2UtPnBhcmVudCB8fCAhbGlzdF9lbXB0eSgmZmVuY2Ut PmNiLm5vZGUpKQotCQkJY29udGludWU7Ci0KLQkJciA9IGRtYV9mZW5jZV9hZGRfY2FsbGJhY2so ZmVuY2UtPnBhcmVudCwgJmZlbmNlLT5jYiwKLQkJCQkJICAgZHJtX3NjaGVkX3Byb2Nlc3Nfam9i KTsKLQkJaWYgKHIpCi0JCQlkcm1fc2NoZWRfcHJvY2Vzc19qb2IoZmVuY2UtPnBhcmVudCwgJmZl bmNlLT5jYik7Ci0KLWFscmVhZHlfc2lnbmFsZWQ6Ci0JCTsKLQl9Ci0Jc3Bpbl91bmxvY2soJnNj aGVkLT5qb2JfbGlzdF9sb2NrKTsKKwkJam9iLT5zY2hlZC0+b3BzLT50aW1lZG91dF9qb2Ioam9i KTsKIH0KIAogLyoqCi0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbAo=