From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v2] drm/i915: Remove local timeline var from submit/unsubmit Date: Thu, 22 Mar 2018 12:55:52 +0000 Message-ID: <20180322125552.11569-1-chris@chris-wilson.co.uk> References: <20180322124803.22663-1-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 663E56E1C6 for ; Thu, 22 Mar 2018 12:56:04 +0000 (UTC) In-Reply-To: <20180322124803.22663-1-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 Qm90aCByZXF1ZXN0X3N1Ym1pdCBhbmQgcmVxdWVzdF91bnN1Ym1pdCBkZWFsIHdpdGggdHJhbnNm ZXJyaW5nIHRoZQpyZXF1ZXN0IGZyb20gdGhlIGNsaWVudCdzIHRpbWVsaW5lIG9udG8gdGhlIGV4 ZWN1dGlvbiB0aW1lbGluZSBhbmQgYmFjawphZ2Fpbi4gQXMgYm90aCBmdW5jdGlvbnMgZGVhbCB3 aXRoIGEgcGFpciBvZiB0aW1lbGluZSdzLCB1c2luZyBhCnNob3J0aGFuZCBmb3IganVzdCBvbmUg b2YgdGhlbSBpcyBzbGlnaHRseSBjb25mdXNpbmcsIGVzcGVjaWFsbHkgYXMgdGhlCmRpZmZlcmVu dCBmdW5jdGlvbnMgdXNlIHRoZSBzaG9ydGhhbmQgZm9yIHRoZSBhbHRlcm5hdGUgdGltZWxpbmUu Ckluc3RlYWQsIHVzZSB0aGUgZnVsbCB2ZXJzaW9uIG9mIGVhY2ggdGltZWxpbmUgc28gaXQgc2hv dWxkIGJlIGVhc2llciB0bwprZWVwIHRyYWNrIG9mIHRoZSB0cmFuc2ZlciBiZXR3ZWVuIHRoZSBy ZXF1ZXN0L2NsaWVudCBhbmQgdGhlIGVuZ2luZS4KCnYyOiBSZWZhY3RvciB0aGUgY29tbW9uIGxv Y2srbGlzdF9tb3ZlCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVxdWVzdC5jIHwgMjkgKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCsp LCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3JlcXVlc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVxdWVzdC5jCmluZGV4IDIz MjU4ODZkMWQ1NS4uY2M0ZjAxZWEyYTAzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3JlcXVlc3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlcXVlc3Qu YwpAQCAtNDkyLDEwICs0OTIsMTkgQEAgc3RhdGljIHUzMiB0aW1lbGluZV9nZXRfc2Vxbm8oc3Ry dWN0IGludGVsX3RpbWVsaW5lICp0bCkKIAlyZXR1cm4gKyt0bC0+c2Vxbm87CiB9CiAKK3N0YXRp YyB2b2lkIG1vdmVfdG9fdGltZWxpbmUoc3RydWN0IGk5MTVfcmVxdWVzdCAqcmVxdWVzdCwKKwkJ CSAgICAgc3RydWN0IGludGVsX3RpbWVsaW5lICp0aW1lbGluZSkKK3sKKwlHRU1fQlVHX09OKHJl cXVlc3QtPnRpbWVsaW5lID09IHJlcXVlc3QtPmVuZ2luZS0+dGltZWxpbmUpOworCisJc3Bpbl9s b2NrKCZyZXF1ZXN0LT50aW1lbGluZS0+bG9jayk7CisJbGlzdF9tb3ZlX3RhaWwoJnJlcXVlc3Qt PmxpbmssICZ0aW1lbGluZS0+cmVxdWVzdHMpOworCXNwaW5fdW5sb2NrKCZyZXF1ZXN0LT50aW1l bGluZS0+bG9jayk7Cit9CisKIHZvaWQgX19pOTE1X3JlcXVlc3Rfc3VibWl0KHN0cnVjdCBpOTE1 X3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0g cmVxdWVzdC0+ZW5naW5lOwotCXN0cnVjdCBpbnRlbF90aW1lbGluZSAqdGltZWxpbmU7CiAJdTMy IHNlcW5vOwogCiAJR0VNX1RSQUNFKCIlcyBmZW5jZSAlbGx4OiVkIC0+IGdsb2JhbF9zZXFubyAl ZFxuIiwKQEAgLTUwNiwxMiArNTE1LDkgQEAgdm9pZCBfX2k5MTVfcmVxdWVzdF9zdWJtaXQoc3Ry dWN0IGk5MTVfcmVxdWVzdCAqcmVxdWVzdCkKIAlHRU1fQlVHX09OKCFpcnFzX2Rpc2FibGVkKCkp OwogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmVuZ2luZS0+dGltZWxpbmUtPmxvY2spOwogCi0JLyog VHJhbnNmZXIgZnJvbSBwZXItY29udGV4dCBvbnRvIHRoZSBnbG9iYWwgcGVyLWVuZ2luZSB0aW1l bGluZSAqLwotCXRpbWVsaW5lID0gZW5naW5lLT50aW1lbGluZTsKLQlHRU1fQlVHX09OKHRpbWVs aW5lID09IHJlcXVlc3QtPnRpbWVsaW5lKTsKIAlHRU1fQlVHX09OKHJlcXVlc3QtPmdsb2JhbF9z ZXFubyk7CiAKLQlzZXFubyA9IHRpbWVsaW5lX2dldF9zZXFubyh0aW1lbGluZSk7CisJc2Vxbm8g PSB0aW1lbGluZV9nZXRfc2Vxbm8oZW5naW5lLT50aW1lbGluZSk7CiAJR0VNX0JVR19PTighc2Vx bm8pOwogCUdFTV9CVUdfT04oaTkxNV9zZXFub19wYXNzZWQoaW50ZWxfZW5naW5lX2dldF9zZXFu byhlbmdpbmUpLCBzZXFubykpOwogCkBAIC01MjUsOSArNTMxLDggQEAgdm9pZCBfX2k5MTVfcmVx dWVzdF9zdWJtaXQoc3RydWN0IGk5MTVfcmVxdWVzdCAqcmVxdWVzdCkKIAllbmdpbmUtPmVtaXRf YnJlYWRjcnVtYihyZXF1ZXN0LAogCQkJCXJlcXVlc3QtPnJpbmctPnZhZGRyICsgcmVxdWVzdC0+ cG9zdGZpeCk7CiAKLQlzcGluX2xvY2soJnJlcXVlc3QtPnRpbWVsaW5lLT5sb2NrKTsKLQlsaXN0 X21vdmVfdGFpbCgmcmVxdWVzdC0+bGluaywgJnRpbWVsaW5lLT5yZXF1ZXN0cyk7Ci0Jc3Bpbl91 bmxvY2soJnJlcXVlc3QtPnRpbWVsaW5lLT5sb2NrKTsKKwkvKiBUcmFuc2ZlciBmcm9tIHBlci1j b250ZXh0IG9udG8gdGhlIGdsb2JhbCBwZXItZW5naW5lIHRpbWVsaW5lICovCisJbW92ZV90b190 aW1lbGluZShyZXF1ZXN0LCBlbmdpbmUtPnRpbWVsaW5lKTsKIAogCXRyYWNlX2k5MTVfcmVxdWVz dF9leGVjdXRlKHJlcXVlc3QpOwogCkBAIC01NTAsNyArNTU1LDYgQEAgdm9pZCBpOTE1X3JlcXVl c3Rfc3VibWl0KHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJlcXVlc3QpCiB2b2lkIF9faTkxNV9yZXF1 ZXN0X3Vuc3VibWl0KHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lID0gcmVxdWVzdC0+ZW5naW5lOwotCXN0cnVjdCBpbnRlbF90 aW1lbGluZSAqdGltZWxpbmU7CiAKIAlHRU1fVFJBQ0UoIiVzIGZlbmNlICVsbHg6JWQgPC0gZ2xv YmFsX3NlcW5vICVkXG4iLAogCQkgIHJlcXVlc3QtPmVuZ2luZS0+bmFtZSwKQEAgLTU3OCwxMiAr NTgyLDcgQEAgdm9pZCBfX2k5MTVfcmVxdWVzdF91bnN1Ym1pdChzdHJ1Y3QgaTkxNV9yZXF1ZXN0 ICpyZXF1ZXN0KQogCXNwaW5fdW5sb2NrKCZyZXF1ZXN0LT5sb2NrKTsKIAogCS8qIFRyYW5zZmVy IGJhY2sgZnJvbSB0aGUgZ2xvYmFsIHBlci1lbmdpbmUgdGltZWxpbmUgdG8gcGVyLWNvbnRleHQg Ki8KLQl0aW1lbGluZSA9IHJlcXVlc3QtPnRpbWVsaW5lOwotCUdFTV9CVUdfT04odGltZWxpbmUg PT0gZW5naW5lLT50aW1lbGluZSk7Ci0KLQlzcGluX2xvY2soJnRpbWVsaW5lLT5sb2NrKTsKLQls aXN0X21vdmUoJnJlcXVlc3QtPmxpbmssICZ0aW1lbGluZS0+cmVxdWVzdHMpOwotCXNwaW5fdW5s b2NrKCZ0aW1lbGluZS0+bG9jayk7CisJbW92ZV90b190aW1lbGluZShyZXF1ZXN0LCByZXF1ZXN0 LT50aW1lbGluZSk7CiAKIAkvKgogCSAqIFdlIGRvbid0IG5lZWQgdG8gd2FrZV91cCBhbnkgd2Fp dGVycyBvbiByZXF1ZXN0LT5leGVjdXRlLCB0aGV5Ci0tIAoyLjE2LjIKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=