From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v3] drm/i915: Add to timeline requires the timeline mutex Date: Mon, 8 Jul 2019 12:39:09 +0100 Message-ID: <20190708113909.18117-1-chris@chris-wilson.co.uk> References: <20190708111944.20095-2-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0916B893ED for ; Mon, 8 Jul 2019 11:39:21 +0000 (UTC) In-Reply-To: <20190708111944.20095-2-chris@chris-wilson.co.uk> 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 TW9kaWZ5aW5nIGEgcmVtb3RlIGNvbnRleHQgcmVxdWlyZXMgY2FyZWZ1bCBzZXJpYWxpc2F0aW9u IHdpdGggcmVxdWVzdHMKb24gdGhhdCBjb250ZXh0LCBhbmQgdGhhdCBzZXJpYWxpc2F0aW9uIHJl cXVpcmVzIHVzIHRvIHRha2UgdGhlaXIKdGltZWxpbmUtPm11dGV4LiBNYWtlIGl0IHNvLgoKTm90 ZSB0aGF0IHdoaWxlIHN0cnVjdF9tdXRleCBydWxlcywgd2UgY2FuJ3QgY3JlYXRlIG1vcmUgdGhh biBvbmUKcmVxdWVzdCBpbiBwYXJhbGxlbCwgYnV0IHRoYXQgYWdlIGlzIHNvb24gY29taW5nIHRv IGFuIGVuZC4KCnYyOiBUaG91Z2ggaXQgZG9lc24ndCBhZmZlY3QgdGhlIGN1cnJlbnQgdXNlcnMs IGNvbnRleHRzIG1heSBzaGFyZQp0aW1lbGluZXMgc28gY2hlY2sgaWYgd2UgYWxyZWFkeSBob2xk IHRoZSByaWdodCBtdXRleC4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fY29udGV4dC5jIHwg MTYgKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9jb250ZXh0LmMgICAg IHwgMzggKysrKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRl bF9jb250ZXh0LmggICAgIHwgIDMgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5j ICAgICAgICAgICAgfCAgNyArLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDQ0IGluc2VydGlvbnMoKyks IDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2dlbS9p OTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fY29u dGV4dC5jCmluZGV4IDFmMGQxMGJiODhjMS4uNjAwMDE3NzQ3MmVlIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9nZW0vaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2dlbS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTExOTIsMjAgKzExOTIsOCBAQCBn ZW44X21vZGlmeV9ycGNzKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSwgc3RydWN0IGludGVsX3Nz ZXUgc3NldSkKIAlpZiAoSVNfRVJSKHJxKSkKIAkJcmV0dXJuIFBUUl9FUlIocnEpOwogCi0JLyog UXVldWUgdGhpcyBzd2l0Y2ggYWZ0ZXIgYWxsIG90aGVyIGFjdGl2aXR5IGJ5IHRoaXMgY29udGV4 dC4gKi8KLQlyZXQgPSBpOTE1X2FjdGl2ZV9yZXF1ZXN0X3NldCgmY2UtPnJpbmctPnRpbWVsaW5l LT5sYXN0X3JlcXVlc3QsIHJxKTsKLQlpZiAocmV0KQotCQlnb3RvIG91dF9hZGQ7Ci0KLQkvKgot CSAqIEd1YXJhbnRlZSBjb250ZXh0IGltYWdlIGFuZCB0aGUgdGltZWxpbmUgcmVtYWlucyBwaW5u ZWQgdW50aWwgdGhlCi0JICogbW9kaWZ5aW5nIHJlcXVlc3QgaXMgcmV0aXJlZCBieSBzZXR0aW5n IHRoZSBjZSBhY3Rpdml0eSB0cmFja2VyLgotCSAqCi0JICogQnV0IHdlIG9ubHkgbmVlZCB0byB0 YWtlIG9uZSBwaW4gb24gdGhlIGFjY291bnQgb2YgaXQuIE9yIGluIG90aGVyCi0JICogd29yZHMg dHJhbnNmZXIgdGhlIHBpbm5lZCBjZSBvYmplY3QgdG8gdHJhY2tlZCBhY3RpdmUgcmVxdWVzdC4K LQkgKi8KLQlHRU1fQlVHX09OKGk5MTVfYWN0aXZlX2lzX2lkbGUoJmNlLT5hY3RpdmUpKTsKLQly ZXQgPSBpOTE1X2FjdGl2ZV9yZWYoJmNlLT5hY3RpdmUsIHJxLT5mZW5jZS5jb250ZXh0LCBycSk7 CisJLyogU2VyaWFsaXNlIHdpdGggdGhlIHJlbW90ZSBjb250ZXh0ICovCisJcmV0ID0gaW50ZWxf Y29udGV4dF9wcmVwYXJlX3JlbW90ZV9yZXF1ZXN0KGNlLCBycSk7CiAJaWYgKHJldCkKIAkJZ290 byBvdXRfYWRkOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9j b250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9jb250ZXh0LmMKaW5kZXgg MTExMGZjOGY2NTdhLi5iMWUyZTRiNjAwMjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2d0L2ludGVsX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRl bF9jb250ZXh0LmMKQEAgLTIzOSw2ICsyMzksNDQgQEAgdm9pZCBpbnRlbF9jb250ZXh0X2V4aXRf ZW5naW5lKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSkKIAlpbnRlbF9lbmdpbmVfcG1fcHV0KGNl LT5lbmdpbmUpOwogfQogCitpbnQgaW50ZWxfY29udGV4dF9wcmVwYXJlX3JlbW90ZV9yZXF1ZXN0 KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSwKKwkJCQkJIHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJx KQoreworCXN0cnVjdCBpbnRlbF90aW1lbGluZSAqdGwgPSBjZS0+cmluZy0+dGltZWxpbmU7CisJ aW50IGVycjsKKworCS8qIE9ubHkgc3VpdGFibGUgZm9yIHVzZSBpbiByZW1vdGVseSBtb2RpZnlp bmcgdGhpcyBjb250ZXh0ICovCisJR0VNX0JVR19PTihycS0+aHdfY29udGV4dCA9PSBjZSk7CisK KwlpZiAocnEtPnRpbWVsaW5lICE9IHRsKSB7IC8qIGJld2FyZSB0aW1lbGluZSBzaGFyaW5nICov CisJCWVyciA9IG11dGV4X2xvY2tfaW50ZXJydXB0aWJsZV9uZXN0ZWQoJnRsLT5tdXRleCwKKwkJ CQkJCSAgICAgIFNJTkdMRV9ERVBUSF9ORVNUSU5HKTsKKwkJaWYgKGVycikKKwkJCXJldHVybiBl cnI7CisJfQorCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJnRsLT5tdXRleCk7CisKKwkvKiBRdWV1ZSB0 aGlzIHN3aXRjaCBhZnRlciBhbGwgb3RoZXIgYWN0aXZpdHkgYnkgdGhpcyBjb250ZXh0LiAqLwor CWVyciA9IGk5MTVfYWN0aXZlX3JlcXVlc3Rfc2V0KCZ0bC0+bGFzdF9yZXF1ZXN0LCBycSk7CisJ aWYgKGVycikKKwkJZ290byB1bmxvY2s7CisKKwkvKgorCSAqIEd1YXJhbnRlZSBjb250ZXh0IGlt YWdlIGFuZCB0aGUgdGltZWxpbmUgcmVtYWlucyBwaW5uZWQgdW50aWwgdGhlCisJICogbW9kaWZ5 aW5nIHJlcXVlc3QgaXMgcmV0aXJlZCBieSBzZXR0aW5nIHRoZSBjZSBhY3Rpdml0eSB0cmFja2Vy LgorCSAqCisJICogQnV0IHdlIG9ubHkgbmVlZCB0byB0YWtlIG9uZSBwaW4gb24gdGhlIGFjY291 bnQgb2YgaXQuIE9yIGluIG90aGVyCisJICogd29yZHMgdHJhbnNmZXIgdGhlIHBpbm5lZCBjZSBv YmplY3QgdG8gdHJhY2tlZCBhY3RpdmUgcmVxdWVzdC4KKwkgKi8KKwlHRU1fQlVHX09OKGk5MTVf YWN0aXZlX2lzX2lkbGUoJmNlLT5hY3RpdmUpKTsKKwllcnIgPSBpOTE1X2FjdGl2ZV9yZWYoJmNl LT5hY3RpdmUsIHJxLT5mZW5jZS5jb250ZXh0LCBycSk7CisKK3VubG9jazoKKwlpZiAocnEtPnRp bWVsaW5lICE9IHRsKQorCQltdXRleF91bmxvY2soJnRsLT5tdXRleCk7CisJcmV0dXJuIGVycjsK K30KKwogc3RydWN0IGk5MTVfcmVxdWVzdCAqaW50ZWxfY29udGV4dF9jcmVhdGVfcmVxdWVzdChz dHJ1Y3QgaW50ZWxfY29udGV4dCAqY2UpCiB7CiAJc3RydWN0IGk5MTVfcmVxdWVzdCAqcnE7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9jb250ZXh0LmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9jb250ZXh0LmgKaW5kZXggNDBjZDgzMjBmY2MzLi5i NDFjNjEwYzJjZTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX2Nv bnRleHQuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9jb250ZXh0LmgKQEAg LTEzOSw2ICsxMzksOSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaW50ZWxfY29udGV4dF90aW1lbGlu ZV91bmxvY2soc3RydWN0IGludGVsX2NvbnRleHQgKmNlKQogCW11dGV4X3VubG9jaygmY2UtPnJp bmctPnRpbWVsaW5lLT5tdXRleCk7CiB9CiAKK2ludCBpbnRlbF9jb250ZXh0X3ByZXBhcmVfcmVt b3RlX3JlcXVlc3Qoc3RydWN0IGludGVsX2NvbnRleHQgKmNlLAorCQkJCQkgc3RydWN0IGk5MTVf cmVxdWVzdCAqcnEpOworCiBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICppbnRlbF9jb250ZXh0X2NyZWF0 ZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSk7CiAKICNlbmRpZiAvKiBfX0lOVEVM X0NPTlRFWFRfSF9fICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bl cmYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jCmluZGV4IDI1YzM0YTBiNTIx ZS4uNmY3NzAxNDY0MGI4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bl cmYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BlcmYuYwpAQCAtMTc2MiwxMiAr MTc2Miw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9tb2RpZnlfY29udGV4dChzdHJ1Y3QgaW50ZWxfY29u dGV4dCAqY2UsCiAJCXJldHVybiBQVFJfRVJSKHJxKTsKIAogCS8qIFNlcmlhbGlzZSB3aXRoIHRo ZSByZW1vdGUgY29udGV4dCAqLwotCWVyciA9IGk5MTVfYWN0aXZlX3JlcXVlc3Rfc2V0KCZjZS0+ cmluZy0+dGltZWxpbmUtPmxhc3RfcmVxdWVzdCwgcnEpOwotCWlmIChlcnIpCi0JCWdvdG8gb3V0 X2FkZDsKLQotCS8qIEtlZXAgdGhlIHJlbW90ZSBjb250ZXh0IGFsaXZlIHVudGlsIGFmdGVyIHdl IGZpbmlzaCBlZGl0aW5nICovCi0JZXJyID0gaTkxNV9hY3RpdmVfcmVmKCZjZS0+YWN0aXZlLCBy cS0+ZmVuY2UuY29udGV4dCwgcnEpOworCWVyciA9IGludGVsX2NvbnRleHRfcHJlcGFyZV9yZW1v dGVfcmVxdWVzdChjZSwgcnEpOwogCWlmIChlcnIpCiAJCWdvdG8gb3V0X2FkZDsKIAotLSAKMi4y MC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=