From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 2/2] drm: Fix syncobj handing of schedule()
 returning 0
Date: Tue, 18 Sep 2018 11:07:20 +0100
Message-ID: <20180918100720.8357-2-chris@chris-wilson.co.uk>
References: <20180918100720.8357-1-chris@chris-wilson.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
In-Reply-To: <20180918100720.8357-1-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

QWZ0ZXIgc2NoZWR1bGUoKSByZXR1cm5zIDAsIHdlIG11c3QgZG8gb25lIGxhc3QgY2hlY2sgb2Yg
Q09ORCB0bwpkZXRlcm1pbmUgdGhlIHJlYXNvbiBmb3IgdGhlIHdha2V1cCB3aXRoIDAgamlmZmll
cyByZW1haW5pbmcgYmVmb3JlCnJlcG9ydGluZyB0aGUgdGltZW91dCAtLSBvdGhlcndpc2Ugd2Ug
bWF5IGxvc2UgdGhlIHNpZ25hbCBkdWUgdG8Kc2NoZWR1bGVyIGRlbGF5cy4KClJlZmVyZW5jZXM6
IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNjY5MApTaWdu
ZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBk
cml2ZXJzL2dwdS9kcm0vZHJtX3N5bmNvYmouYyB8IDQxICsrKysrKysrKysrKystLS0tLS0tLS0t
LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRp
b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9zeW5jb2JqLmMgYi9kcml2
ZXJzL2dwdS9kcm0vZHJtX3N5bmNvYmouYwppbmRleCBlMjU0Zjk3ZmVkN2QuLjViY2IzZWY5YjI1
NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9zeW5jb2JqLmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2RybV9zeW5jb2JqLmMKQEAgLTY3Miw3ICs2NzIsNiBAQCBzdGF0aWMgc2lnbmVk
IGxvbmcgZHJtX3N5bmNvYmpfYXJyYXlfd2FpdF90aW1lb3V0KHN0cnVjdCBkcm1fc3luY29iaiAq
KnN5bmNvYmpzLAogewogCXN0cnVjdCBzeW5jb2JqX3dhaXRfZW50cnkgKmVudHJpZXM7CiAJc3Ry
dWN0IGRtYV9mZW5jZSAqZmVuY2U7Ci0Jc2lnbmVkIGxvbmcgcmV0OwogCXVpbnQzMl90IHNpZ25h
bGVkX2NvdW50LCBpOwogCiAJZW50cmllcyA9IGtjYWxsb2MoY291bnQsIHNpemVvZigqZW50cmll
cyksIEdGUF9LRVJORUwpOwpAQCAtNjkyLDcgKzY5MSw3IEBAIHN0YXRpYyBzaWduZWQgbG9uZyBk
cm1fc3luY29ial9hcnJheV93YWl0X3RpbWVvdXQoc3RydWN0IGRybV9zeW5jb2JqICoqc3luY29i
anMsCiAJCQlpZiAoZmxhZ3MgJiBEUk1fU1lOQ09CSl9XQUlUX0ZMQUdTX1dBSVRfRk9SX1NVQk1J
VCkgewogCQkJCWNvbnRpbnVlOwogCQkJfSBlbHNlIHsKLQkJCQlyZXQgPSAtRUlOVkFMOworCQkJ
CXRpbWVvdXQgPSAtRUlOVkFMOwogCQkJCWdvdG8gY2xlYW51cF9lbnRyaWVzOwogCQkJfQogCQl9
CkBAIC03MDQsMTIgKzcwMyw2IEBAIHN0YXRpYyBzaWduZWQgbG9uZyBkcm1fc3luY29ial9hcnJh
eV93YWl0X3RpbWVvdXQoc3RydWN0IGRybV9zeW5jb2JqICoqc3luY29ianMsCiAJCX0KIAl9CiAK
LQkvKiBJbml0aWFsaXplIHJldCB0byB0aGUgbWF4IG9mIHRpbWVvdXQgYW5kIDEuICBUaGF0IHdh
eSwgdGhlCi0JICogZGVmYXVsdCByZXR1cm4gdmFsdWUgaW5kaWNhdGVzIGEgc3VjY2Vzc2Z1bCB3
YWl0IGFuZCBub3QgYQotCSAqIHRpbWVvdXQuCi0JICovCi0JcmV0ID0gbWF4X3Qoc2lnbmVkIGxv
bmcsIHRpbWVvdXQsIDEpOwotCiAJaWYgKHNpZ25hbGVkX2NvdW50ID09IGNvdW50IHx8CiAJICAg
IChzaWduYWxlZF9jb3VudCA+IDAgJiYKIAkgICAgICEoZmxhZ3MgJiBEUk1fU1lOQ09CSl9XQUlU
X0ZMQUdTX1dBSVRfQUxMKSkpCkBAIC03NjAsMTggKzc1MywxNyBAQCBzdGF0aWMgc2lnbmVkIGxv
bmcgZHJtX3N5bmNvYmpfYXJyYXlfd2FpdF90aW1lb3V0KHN0cnVjdCBkcm1fc3luY29iaiAqKnN5
bmNvYmpzLAogCQkJZ290byBkb25lX3dhaXRpbmc7CiAKIAkJaWYgKHRpbWVvdXQgPT0gMCkgewot
CQkJLyogSWYgd2UgYXJlIGRvaW5nIGEgMCB0aW1lb3V0IHdhaXQgYW5kIHdlIGdvdAotCQkJICog
aGVyZSwgdGhlbiB3ZSBqdXN0IHRpbWVkIG91dC4KLQkJCSAqLwotCQkJcmV0ID0gMDsKKwkJCXRp
bWVvdXQgPSAtRVRJTUU7CiAJCQlnb3RvIGRvbmVfd2FpdGluZzsKIAkJfQogCi0JCXJldCA9IHNj
aGVkdWxlX3RpbWVvdXQocmV0KTsKKwkJaWYgKHNpZ25hbF9wZW5kaW5nKGN1cnJlbnQpKSB7CisJ
CQl0aW1lb3V0ID0gLUVSRVNUQVJUU1lTOworCQkJZ290byBkb25lX3dhaXRpbmc7CisJCX0KIAot
CQlpZiAocmV0ID4gMCAmJiBzaWduYWxfcGVuZGluZyhjdXJyZW50KSkKLQkJCXJldCA9IC1FUkVT
VEFSVFNZUzsKLQl9IHdoaWxlIChyZXQgPiAwKTsKKwkJdGltZW91dCA9IHNjaGVkdWxlX3RpbWVv
dXQodGltZW91dCk7CisJfSB3aGlsZSAoMSk7CiAKIGRvbmVfd2FpdGluZzoKIAlfX3NldF9jdXJy
ZW50X3N0YXRlKFRBU0tfUlVOTklORyk7CkBAIC03ODgsNyArNzgwLDcgQEAgc3RhdGljIHNpZ25l
ZCBsb25nIGRybV9zeW5jb2JqX2FycmF5X3dhaXRfdGltZW91dChzdHJ1Y3QgZHJtX3N5bmNvYmog
KipzeW5jb2JqcywKIAl9CiAJa2ZyZWUoZW50cmllcyk7CiAKLQlyZXR1cm4gcmV0OworCXJldHVy
biB0aW1lb3V0OwogfQogCiAvKioKQEAgLTgyOSwxOSArODIxLDE2IEBAIHN0YXRpYyBpbnQgZHJt
X3N5bmNvYmpfYXJyYXlfd2FpdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgc3RydWN0
IGRybV9zeW5jb2JqICoqc3luY29ianMpCiB7CiAJc2lnbmVkIGxvbmcgdGltZW91dCA9IGRybV90
aW1lb3V0X2Fic190b19qaWZmaWVzKHdhaXQtPnRpbWVvdXRfbnNlYyk7Ci0Jc2lnbmVkIGxvbmcg
cmV0ID0gMDsKIAl1aW50MzJfdCBmaXJzdCA9IH4wOwogCi0JcmV0ID0gZHJtX3N5bmNvYmpfYXJy
YXlfd2FpdF90aW1lb3V0KHN5bmNvYmpzLAotCQkJCQkgICAgIHdhaXQtPmNvdW50X2hhbmRsZXMs
Ci0JCQkJCSAgICAgd2FpdC0+ZmxhZ3MsCi0JCQkJCSAgICAgdGltZW91dCwgJmZpcnN0KTsKLQlp
ZiAocmV0IDwgMCkKLQkJcmV0dXJuIHJldDsKKwl0aW1lb3V0ID0gZHJtX3N5bmNvYmpfYXJyYXlf
d2FpdF90aW1lb3V0KHN5bmNvYmpzLAorCQkJCQkJIHdhaXQtPmNvdW50X2hhbmRsZXMsCisJCQkJ
CQkgd2FpdC0+ZmxhZ3MsCisJCQkJCQkgdGltZW91dCwgJmZpcnN0KTsKKwlpZiAodGltZW91dCA8
IDApCisJCXJldHVybiB0aW1lb3V0OwogCiAJd2FpdC0+Zmlyc3Rfc2lnbmFsZWQgPSBmaXJzdDsK
LQlpZiAocmV0ID09IDApCi0JCXJldHVybiAtRVRJTUU7CiAJcmV0dXJuIDA7CiB9CiAKLS0gCjIu
MTkuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50
ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz
Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==