From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 2/6] drm/i915/execlists: Pull CSB reset under
 the timeline.lock
Date: Wed, 27 Jun 2018 12:38:39 +0100
Message-ID: <20180627113843.7257-2-chris@chris-wilson.co.uk>
References: <20180627113843.7257-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>
Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 8619D6E8BA
 for <intel-gfx@lists.freedesktop.org>; Wed, 27 Jun 2018 11:38:56 +0000 (UTC)
In-Reply-To: <20180627113843.7257-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: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

SW4gdGhlIGZvbGxvd2luZyBwYXRjaCwgd2Ugd2lsbCBwcm9jZXNzIHRoZSBDU0IgZXZlbnRzIHVu
ZGVyIHRoZQp0aW1lbGluZS5sb2NrIGFuZCBub3Qgc2VyaWFsaXNlZCBieSB0aGUgdGFza2xldC4g
VGhpcyBhbHNvIG1lYW5zIHRoYXQgd2UKd2lsbCBuZWVkIHRvIHByb3RlY3QgYWNjZXNzIHRvIGNv
bW1vbiB2YXJpYWJsZXMgc3VjaCBhcwpleGVjbGlzdHMtPmNzYl9oZWFkIHdpdGggdGhlIHRpbWVs
aW5lLmxvY2sgZHVyaW5nIHJlc2V0LgoKdjI6IE1vdmUgc3luY19pcnEgdG8gYXZvaWQgZGVhZGxv
Y2tzIGJldHdlZW4gdGFraW5nIHRpbWVsaW5lLmxvY2sgZnJvbQpvdXIgaW50ZXJydXB0IGhhbmRs
ZXIuCnYzOiBLaWxsIG9mZiB0aGUgc3luY2hyb25pemVfaGFyZGlycSBhcyBpdCByYWlzZXMgbW9y
ZSBxdWVzdGlvbnMgdGhhbgphbnN3ZXJlZDsgbm93IHdlIHVzZSB0aGUgdGltZWxpbmUubG9jayBl
bnRpcmVseSBmb3IgQ1NCIHNlcmlhbGlzYXRpb24KYmV0d2VlbiB0aGUgaXJxIGFuZCBlbHNld2hl
cmUsIHdlIGRvbid0IG5lZWQgdG8gYmUgc28gaGVhdnkgaGFuZGVkIHdpdGgKZmx1c2hpbmcKdjQ6
IFRyZWF0IHJlcXVlc3QgY2FuY2VsbGF0aW9uICh3ZWRnaW5nIGFmdGVyIGZhaWxlZCByZXNldCkg
c2ltaWxhcmx5CgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv
bi5jby51az4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClJl
dmlld2VkLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0K
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIHwgMTYgKysrKy0tLS0tLS0tLS0tLQog
MSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9scmMuYwppbmRleCAwMDlkYjkyYjY3ZDcuLjRiMzFlOGY0MmFlYiAxMDA2NDQK
LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTg3MSw3ICs4NzEsNiBAQCBzdGF0aWMgdm9pZCByZXNl
dF9pcnEoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCS8qIE1hcmsgYWxsIENT
IGludGVycnVwdHMgYXMgY29tcGxldGUgKi8KIAlzbXBfc3RvcmVfbWIoZW5naW5lLT5leGVjbGlz
dHMuYWN0aXZlLCAwKTsKLQlzeW5jaHJvbml6ZV9oYXJkaXJxKGVuZ2luZS0+aTkxNS0+ZHJtLmly
cSk7CiAKIAljbGVhcl9ndGlpcihlbmdpbmUpOwogCkBAIC05MDgsMTQgKzkwNywxMiBAQCBzdGF0
aWMgdm9pZCBleGVjbGlzdHNfY2FuY2VsX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg
KmVuZ2luZSkKIAkgKiBzdWJtaXNzaW9uJ3MgaXJxIHN0YXRlLCB3ZSBhbHNvIHdpc2ggdG8gcmVt
aW5kIG91cnNlbHZlcyB0aGF0CiAJICogaXQgaXMgaXJxIHN0YXRlLikKIAkgKi8KLQlsb2NhbF9p
cnFfc2F2ZShmbGFncyk7CisJc3Bpbl9sb2NrX2lycXNhdmUoJmVuZ2luZS0+dGltZWxpbmUubG9j
aywgZmxhZ3MpOwogCiAJLyogQ2FuY2VsIHRoZSByZXF1ZXN0cyBvbiB0aGUgSFcgYW5kIGNsZWFy
IHRoZSBFTFNQIHRyYWNrZXIuICovCiAJZXhlY2xpc3RzX2NhbmNlbF9wb3J0X3JlcXVlc3RzKGV4
ZWNsaXN0cyk7CiAJcmVzZXRfaXJxKGVuZ2luZSk7CiAKLQlzcGluX2xvY2soJmVuZ2luZS0+dGlt
ZWxpbmUubG9jayk7Ci0KIAkvKiBNYXJrIGFsbCBleGVjdXRpbmcgcmVxdWVzdHMgYXMgc2tpcHBl
ZC4gKi8KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJxLCAmZW5naW5lLT50aW1lbGluZS5yZXF1ZXN0
cywgbGluaykgewogCQlHRU1fQlVHX09OKCFycS0+Z2xvYmFsX3NlcW5vKTsKQEAgLTk0OSw5ICs5
NDYsNyBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfY2FuY2VsX3JlcXVlc3RzKHN0cnVjdCBpbnRl
bF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlleGVjbGlzdHMtPmZpcnN0ID0gTlVMTDsKIAlHRU1fQlVH
X09OKHBvcnRfaXNzZXQoZXhlY2xpc3RzLT5wb3J0KSk7CiAKLQlzcGluX3VubG9jaygmZW5naW5l
LT50aW1lbGluZS5sb2NrKTsKLQotCWxvY2FsX2lycV9yZXN0b3JlKGZsYWdzKTsKKwlzcGluX3Vu
bG9ja19pcnFyZXN0b3JlKCZlbmdpbmUtPnRpbWVsaW5lLmxvY2ssIGZsYWdzKTsKIH0KIAogc3Rh
dGljIHZvaWQgcHJvY2Vzc19jc2Ioc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQpAQCAt
MTk2OSw4ICsxOTY0LDcgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX3Jlc2V0KHN0cnVjdCBpbnRl
bF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJICBlbmdpbmUtPm5hbWUsIHJlcXVlc3QgPyByZXF1ZXN0
LT5nbG9iYWxfc2Vxbm8gOiAwLAogCQkgIGludGVsX2VuZ2luZV9nZXRfc2Vxbm8oZW5naW5lKSk7
CiAKLQkvKiBTZWUgZXhlY2xpc3RzX2NhbmNlbF9yZXF1ZXN0cygpIGZvciB0aGUgaXJxL3NwaW5s
b2NrIHNwbGl0LiAqLwotCWxvY2FsX2lycV9zYXZlKGZsYWdzKTsKKwlzcGluX2xvY2tfaXJxc2F2
ZSgmZW5naW5lLT50aW1lbGluZS5sb2NrLCBmbGFncyk7CiAKIAkvKgogCSAqIENhdGNoIHVwIHdp
dGggYW55IG1pc3NlZCBjb250ZXh0LXN3aXRjaCBpbnRlcnJ1cHRzLgpAQCAtMTk4NSwxNCArMTk3
OSwxMiBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfcmVzZXQoc3RydWN0IGludGVsX2VuZ2luZV9j
cyAqZW5naW5lLAogCXJlc2V0X2lycShlbmdpbmUpOwogCiAJLyogUHVzaCBiYWNrIGFueSBpbmNv
bXBsZXRlIHJlcXVlc3RzIGZvciByZXBsYXkgYWZ0ZXIgdGhlIHJlc2V0LiAqLwotCXNwaW5fbG9j
aygmZW5naW5lLT50aW1lbGluZS5sb2NrKTsKIAlfX3Vud2luZF9pbmNvbXBsZXRlX3JlcXVlc3Rz
KGVuZ2luZSk7Ci0Jc3Bpbl91bmxvY2soJmVuZ2luZS0+dGltZWxpbmUubG9jayk7CiAKIAkvKiBG
b2xsb3dpbmcgdGhlIHJlc2V0LCB3ZSBuZWVkIHRvIHJlbG9hZCB0aGUgQ1NCIHJlYWQvd3JpdGUg
cG9pbnRlcnMgKi8KIAllbmdpbmUtPmV4ZWNsaXN0cy5jc2JfaGVhZCA9IEdFTjhfQ1NCX0VOVFJJ
RVMgLSAxOwogCi0JbG9jYWxfaXJxX3Jlc3RvcmUoZmxhZ3MpOworCXNwaW5fdW5sb2NrX2lycXJl
c3RvcmUoJmVuZ2luZS0+dGltZWxpbmUubG9jaywgZmxhZ3MpOwogCiAJLyoKIAkgKiBJZiB0aGUg
cmVxdWVzdCB3YXMgaW5ub2NlbnQsIHdlIGxlYXZlIHRoZSByZXF1ZXN0IGluIHRoZSBFTFNQCi0t
IAoyLjE4LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo
dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=