From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH 6/8] drm/amdgpu: properly abstract scheduler timeout handling Date: Wed, 25 May 2016 17:04:20 -0400 Message-ID: <1464210262-2912-7-git-send-email-alexander.deucher@amd.com> References: <1464210262-2912-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ig0-x243.google.com (mail-ig0-x243.google.com [IPv6:2607:f8b0:4001:c05::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7DF1F6E2A9 for ; Wed, 25 May 2016 21:04:36 +0000 (UTC) Received: by mail-ig0-x243.google.com with SMTP id lp2so6450895igb.1 for ; Wed, 25 May 2016 14:04:36 -0700 (PDT) In-Reply-To: <1464210262-2912-1-git-send-email-alexander.deucher@amd.com> 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: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKVGhlIGRy aXZlciBzaG91bGRuJ3QgbWVzcyB3aXRoIHRoZSBzY2hlZHVsZXIgaW50ZXJuYWxzLgoKU2lnbmVk LW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgpSZXZp ZXdlZC1ieTogTW9uay5MaXUgPG1vbmsubGl1QGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXgg RGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHUuaCAgICAgICAgICAgfCAgMSAtCiBkcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfY3MuYyAgICAgICAgfCAgMyArLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9qb2IuYyAgICAgICB8IDE1ICsrKysrKysrLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9zY2hlZHVsZXIvZ3B1X3NjaGVkdWxlci5jIHwgMTEgKysrKysrKysrLS0KIGRy aXZlcnMvZ3B1L2RybS9hbWQvc2NoZWR1bGVyL2dwdV9zY2hlZHVsZXIuaCB8ICAyICstCiA1IGZp bGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1LmgKaW5kZXggNmM1ZWMzMi4uZWM0MmRkNSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTc1OSw3ICs3NTksNiBAQCB2b2lkIGFtZGdwdV9qb2Jf ZnJlZV9mdW5jKHN0cnVjdCBrcmVmICpyZWZjb3VudCk7CiBpbnQgYW1kZ3B1X2pvYl9zdWJtaXQo c3RydWN0IGFtZGdwdV9qb2IgKmpvYiwgc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCQkgICAg ICBzdHJ1Y3QgYW1kX3NjaGVkX2VudGl0eSAqZW50aXR5LCB2b2lkICpvd25lciwKIAkJICAgICAg c3RydWN0IGZlbmNlICoqZik7Ci12b2lkIGFtZGdwdV9qb2JfdGltZW91dF9mdW5jKHN0cnVjdCB3 b3JrX3N0cnVjdCAqd29yayk7CiAKIHN0cnVjdCBhbWRncHVfcmluZyB7CiAJc3RydWN0IGFtZGdw dV9kZXZpY2UJCSphZGV2OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2NzLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYwppbmRl eCAyYmJlZWIwLi5kOGNhYzMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3Mu YwpAQCAtODM5LDggKzgzOSw3IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2NzX3N1Ym1pdChzdHJ1Y3Qg YW1kZ3B1X2NzX3BhcnNlciAqcCwKIAlwLT5qb2IgPSBOVUxMOwogCiAJciA9IGFtZF9zY2hlZF9q b2JfaW5pdCgmam9iLT5iYXNlLCAmcmluZy0+c2NoZWQsCi0JCQkgICAgICAgZW50aXR5LCBhbWRn cHVfam9iX3RpbWVvdXRfZnVuYywKLQkJCSAgICAgICBhbWRncHVfam9iX2ZyZWVfZnVuYywKKwkJ CSAgICAgICBlbnRpdHksIGFtZGdwdV9qb2JfZnJlZV9mdW5jLAogCQkJICAgICAgIHAtPmZpbHAs ICZmZW5jZSk7CiAJaWYgKHIpIHsKIAkJYW1kZ3B1X2pvYl9mcmVlKGpvYik7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfam9iLmMgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL2FtZGdwdS9hbWRncHVfam9iLmMKaW5kZXggYmU0Njk4Yi4uMzIxMzJmMiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2pvYi5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9qb2IuYwpAQCAtMzQsMTMgKzM0LDE0IEBAIHN0 YXRpYyB2b2lkIGFtZGdwdV9qb2JfZnJlZV9oYW5kbGVyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd3Mp CiAJYW1kX3NjaGVkX2pvYl9wdXQoJmpvYi0+YmFzZSk7CiB9CiAKLXZvaWQgYW1kZ3B1X2pvYl90 aW1lb3V0X2Z1bmMoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQorc3RhdGljIHZvaWQgYW1kZ3B1 X2pvYl90aW1lZG91dChzdHJ1Y3QgYW1kX3NjaGVkX2pvYiAqc19qb2IpCiB7Ci0Jc3RydWN0IGFt ZGdwdV9qb2IgKmpvYiA9IGNvbnRhaW5lcl9vZih3b3JrLCBzdHJ1Y3QgYW1kZ3B1X2pvYiwgYmFz ZS53b3JrX3Rkci53b3JrKTsKKwlzdHJ1Y3QgYW1kZ3B1X2pvYiAqam9iID0gY29udGFpbmVyX29m KHNfam9iLCBzdHJ1Y3QgYW1kZ3B1X2pvYiwgYmFzZSk7CisKIAlEUk1fRVJST1IoInJpbmcgJXMg dGltZW91dCwgbGFzdCBzaWduYWxlZCBzZXE9JXUsIGxhc3QgZW1pdHRlZCBzZXE9JXVcbiIsCi0J CQkJam9iLT5iYXNlLnNjaGVkLT5uYW1lLAotCQkJCSh1aW50MzJfdClhdG9taWNfcmVhZCgmam9i LT5yaW5nLT5mZW5jZV9kcnYubGFzdF9zZXEpLAotCQkJCWpvYi0+cmluZy0+ZmVuY2VfZHJ2LnN5 bmNfc2VxKTsKKwkJICBqb2ItPmJhc2Uuc2NoZWQtPm5hbWUsCisJCSAgYXRvbWljX3JlYWQoJmpv Yi0+cmluZy0+ZmVuY2VfZHJ2Lmxhc3Rfc2VxKSwKKwkJICBqb2ItPnJpbmctPmZlbmNlX2Rydi5z eW5jX3NlcSk7CiAKIAlhbWRfc2NoZWRfam9iX3B1dCgmam9iLT5iYXNlKTsKIH0KQEAgLTEyNiw4 ICsxMjcsNyBAQCBpbnQgYW1kZ3B1X2pvYl9zdWJtaXQoc3RydWN0IGFtZGdwdV9qb2IgKmpvYiwg c3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAogCQlyZXR1cm4gLUVJTlZBTDsKIAogCXIgPSBhbWRf c2NoZWRfam9iX2luaXQoJmpvYi0+YmFzZSwgJnJpbmctPnNjaGVkLAotCQkJICAgICAgIGVudGl0 eSwgYW1kZ3B1X2pvYl90aW1lb3V0X2Z1bmMsCi0JCQkgICAgICAgYW1kZ3B1X2pvYl9mcmVlX2Z1 bmMsIG93bmVyLCAmZmVuY2UpOworCQkJICAgICAgIGVudGl0eSwgYW1kZ3B1X2pvYl9mcmVlX2Z1 bmMsIG93bmVyLCAmZmVuY2UpOwogCWlmIChyKQogCQlyZXR1cm4gcjsKIApAQCAtMTk3LDQgKzE5 Nyw1IEBAIGVycjoKIGNvbnN0IHN0cnVjdCBhbWRfc2NoZWRfYmFja2VuZF9vcHMgYW1kZ3B1X3Nj aGVkX29wcyA9IHsKIAkuZGVwZW5kZW5jeSA9IGFtZGdwdV9qb2JfZGVwZW5kZW5jeSwKIAkucnVu X2pvYiA9IGFtZGdwdV9qb2JfcnVuLAorCS50aW1lZG91dF9qb2IgPSBhbWRncHVfam9iX3RpbWVk b3V0LAogfTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvc2NoZWR1bGVyL2dwdV9z Y2hlZHVsZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvc2NoZWR1bGVyL2dwdV9zY2hlZHVsZXIu YwppbmRleCBlOGVlOTBmLi5mMmVkOGM1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1k L3NjaGVkdWxlci9ncHVfc2NoZWR1bGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9zY2hl ZHVsZXIvZ3B1X3NjaGVkdWxlci5jCkBAIC0zNjIsNiArMzYyLDE0IEBAIHN0YXRpYyB2b2lkIGFt ZF9zY2hlZF9qb2JfYmVnaW4oc3RydWN0IGFtZF9zY2hlZF9qb2IgKnNfam9iKQogCX0KIH0KIAor c3RhdGljIHZvaWQgYW1kX3NjaGVkX2pvYl90aW1lZG91dChzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndv cmspCit7CisJc3RydWN0IGFtZF9zY2hlZF9qb2IgKmpvYiA9IGNvbnRhaW5lcl9vZih3b3JrLCBz dHJ1Y3QgYW1kX3NjaGVkX2pvYiwKKwkJCQkJCSB3b3JrX3Rkci53b3JrKTsKKworCWpvYi0+c2No ZWQtPm9wcy0+dGltZWRvdXRfam9iKGpvYik7Cit9CisKIC8qKgogICogU3VibWl0IGEgam9iIHRv IHRoZSBqb2IgcXVldWUKICAqCkBAIC0zODQsNyArMzkyLDYgQEAgdm9pZCBhbWRfc2NoZWRfZW50 aXR5X3B1c2hfam9iKHN0cnVjdCBhbWRfc2NoZWRfam9iICpzY2hlZF9qb2IpCiBpbnQgYW1kX3Nj aGVkX2pvYl9pbml0KHN0cnVjdCBhbWRfc2NoZWRfam9iICpqb2IsCiAJCSAgICAgICBzdHJ1Y3Qg YW1kX2dwdV9zY2hlZHVsZXIgKnNjaGVkLAogCQkgICAgICAgc3RydWN0IGFtZF9zY2hlZF9lbnRp dHkgKmVudGl0eSwKLQkJICAgICAgIHZvaWQgKCp0aW1lb3V0X2NiKShzdHJ1Y3Qgd29ya19zdHJ1 Y3QgKndvcmspLAogCQkgICAgICAgdm9pZCAoKmZyZWVfY2IpKHN0cnVjdCBrcmVmICpyZWZjb3Vu dCksCiAJCSAgICAgICB2b2lkICpvd25lciwgc3RydWN0IGZlbmNlICoqZmVuY2UpCiB7CkBAIC0z OTcsNyArNDA0LDcgQEAgaW50IGFtZF9zY2hlZF9qb2JfaW5pdChzdHJ1Y3QgYW1kX3NjaGVkX2pv YiAqam9iLAogCQlyZXR1cm4gLUVOT01FTTsKIAogCWpvYi0+c19mZW5jZS0+c19qb2IgPSBqb2I7 Ci0JSU5JVF9ERUxBWUVEX1dPUksoJmpvYi0+d29ya190ZHIsIHRpbWVvdXRfY2IpOworCUlOSVRf REVMQVlFRF9XT1JLKCZqb2ItPndvcmtfdGRyLCBhbWRfc2NoZWRfam9iX3RpbWVkb3V0KTsKIAlq b2ItPmZyZWVfY2FsbGJhY2sgPSBmcmVlX2NiOwogCiAJaWYgKGZlbmNlKQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9zY2hlZHVsZXIvZ3B1X3NjaGVkdWxlci5oIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9zY2hlZHVsZXIvZ3B1X3NjaGVkdWxlci5oCmluZGV4IDdlMzMzZmEuLmYwZGU0 NmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvc2NoZWR1bGVyL2dwdV9zY2hlZHVs ZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3NjaGVkdWxlci9ncHVfc2NoZWR1bGVyLmgK QEAgLTEwOCw2ICsxMDgsNyBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBhbWRfc2NoZWRfZmVuY2Ug KnRvX2FtZF9zY2hlZF9mZW5jZShzdHJ1Y3QgZmVuY2UgKmYpCiBzdHJ1Y3QgYW1kX3NjaGVkX2Jh Y2tlbmRfb3BzIHsKIAlzdHJ1Y3QgZmVuY2UgKigqZGVwZW5kZW5jeSkoc3RydWN0IGFtZF9zY2hl ZF9qb2IgKnNjaGVkX2pvYik7CiAJc3RydWN0IGZlbmNlICooKnJ1bl9qb2IpKHN0cnVjdCBhbWRf c2NoZWRfam9iICpzY2hlZF9qb2IpOworCXZvaWQgKCp0aW1lZG91dF9qb2IpKHN0cnVjdCBhbWRf c2NoZWRfam9iICpzY2hlZF9qb2IpOwogfTsKIAogZW51bSBhbWRfc2NoZWRfcHJpb3JpdHkgewpA QCAtMTUzLDcgKzE1NCw2IEBAIHZvaWQgYW1kX3NjaGVkX2ZlbmNlX3NpZ25hbChzdHJ1Y3QgYW1k X3NjaGVkX2ZlbmNlICpmZW5jZSk7CiBpbnQgYW1kX3NjaGVkX2pvYl9pbml0KHN0cnVjdCBhbWRf c2NoZWRfam9iICpqb2IsCiAJCSAgICAgICBzdHJ1Y3QgYW1kX2dwdV9zY2hlZHVsZXIgKnNjaGVk LAogCQkgICAgICAgc3RydWN0IGFtZF9zY2hlZF9lbnRpdHkgKmVudGl0eSwKLQkJICAgICAgIHZv aWQgKCp0aW1lb3V0X2NiKShzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspLAogCQkgICAgICAgdm9p ZCAoKmZyZWVfY2IpKHN0cnVjdCBrcmVmKiByZWZjb3VudCksCiAJCSAgICAgICB2b2lkICpvd25l ciwgc3RydWN0IGZlbmNlICoqZmVuY2UpOwogc3RhdGljIGlubGluZSB2b2lkIGFtZF9zY2hlZF9q b2JfZ2V0KHN0cnVjdCBhbWRfc2NoZWRfam9iICpqb2IpCi0tIAoyLjUuNQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==