From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [CI 4/4] drm/i915: Only track live rings for retiring Date: Fri, 27 Apr 2018 18:20:31 +0100 Message-ID: <20180427172031.21903-4-chris@chris-wilson.co.uk> References: <20180427172031.21903-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 AEA276EAA6 for ; Fri, 27 Apr 2018 17:20:42 +0000 (UTC) Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 11522227-1500050 for ; Fri, 27 Apr 2018 18:20:41 +0100 In-Reply-To: <20180427172031.21903-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 V2UgZG9uJ3QgbmVlZCB0byB0cmFjayBldmVyeSByaW5nIGZvciBpdHMgbGlmZXRpbWUgYXMgdGhl eSBhcmUgbWFuYWdlZApieSB0aGUgY29udGV4dHMvZW5naW5lcy4gV2hhdCB3ZSBkbyB3YW50IHRv IHRyYWNrIGFyZSB0aGUgbGl2ZSByaW5ncyBzbwp0aGF0IHdlIGNhbiBzcG9yYWRpY2FsbHkgY2xl YW4gdXAgcmVxdWVzdHMgaWYgdXNlcnNwYWNlIGZhbGxzIGJlaGluZC4gV2UKY2FuIHNpbXBseSBy ZXN0cmljdCB0aGUgZ3QtPnJpbmdzIGxpc3QgdG8gYmVpbmcgb25seSBndC0+bGl2ZV9yaW5ncy4K CnYyOiBzL2xpdmUvYWN0aXZlLyBmb3IgY29uc2lzdGVuY3kgd2l0aCBndC5hY3RpdmVfcmVxdWVz dHMKClN1Z2dlc3RlZC1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGxpbnV4Lmlu dGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24u Y28udWs+CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AbGludXguaW50ZWwuY29t PgpSZXZpZXdlZC1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgICAgICAgICAgfCAg MyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgICAgICAgICB8 ICA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZXF1ZXN0LmMgICAgICAgICAg ICAgIHwgMTAgKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5jICAgICAgICAgIHwgIDQgLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5oICAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9t b2NrX2VuZ2luZS5jICAgICB8ICA0IC0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0 cy9tb2NrX2dlbV9kZXZpY2UuYyB8ICA1ICsrKy0tCiA3IGZpbGVzIGNoYW5nZWQsIDE4IGluc2Vy dGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDE4 MzdjMDFkNDRkMC4uNTQzNTFjYWNlMzYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIw NjAsNyArMjA2MCw4IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAogCQlzdHJ1Y3QgaTkx NV9nZW1fdGltZWxpbmUgZ2xvYmFsX3RpbWVsaW5lOwogCQlzdHJ1Y3QgbGlzdF9oZWFkIHRpbWVs aW5lczsKLQkJc3RydWN0IGxpc3RfaGVhZCByaW5nczsKKworCQlzdHJ1Y3QgbGlzdF9oZWFkIGFj dGl2ZV9yaW5nczsKIAkJdTMyIGFjdGl2ZV9yZXF1ZXN0czsKIAkJdTMyIHJlcXVlc3Rfc2VyaWFs OwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBmMDY0NGQxZmJkNzUuLmZhMWQ5NGE0ZWI1 ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0xNDEsNiArMTQxLDcgQEAgc3RhdGljIHUz MiBfX2k5MTVfZ2VtX3Bhcmsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiB7CiAJbG9j a2RlcF9hc3NlcnRfaGVsZCgmaTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CiAJR0VNX0JVR19PTihp OTE1LT5ndC5hY3RpdmVfcmVxdWVzdHMpOworCUdFTV9CVUdfT04oIWxpc3RfZW1wdHkoJmk5MTUt Pmd0LmFjdGl2ZV9yaW5ncykpOwogCiAJaWYgKCFpOTE1LT5ndC5hd2FrZSkKIAkJcmV0dXJuIEk5 MTVfRVBPQ0hfSU5WQUxJRDsKQEAgLTU1OTksOSArNTYwMCwxMCBAQCBpbnQgaTkxNV9nZW1faW5p dF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaWYgKCFkZXZfcHJp di0+cHJpb3JpdGllcykKIAkJZ290byBlcnJfZGVwZW5kZW5jaWVzOwogCi0JbXV0ZXhfbG9jaygm ZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwotCUlOSVRfTElTVF9IRUFEKCZkZXZfcHJpdi0+ Z3QucmluZ3MpOwogCUlOSVRfTElTVF9IRUFEKCZkZXZfcHJpdi0+Z3QudGltZWxpbmVzKTsKKwlJ TklUX0xJU1RfSEVBRCgmZGV2X3ByaXYtPmd0LmFjdGl2ZV9yaW5ncyk7CisKKwltdXRleF9sb2Nr KCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CiAJZXJyID0gaTkxNV9nZW1fdGltZWxpbmVf aW5pdF9fZ2xvYmFsKGRldl9wcml2KTsKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5kcm0uc3Ry dWN0X211dGV4KTsKIAlpZiAoZXJyKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9yZXF1ZXN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlcXVlc3QuYwppbmRl eCBlNjUzNTI1NWQ0NDUuLmM4ZmM0YjMyM2U2MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9yZXF1ZXN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZXF1 ZXN0LmMKQEAgLTMyMiw2ICszMjIsNyBAQCBzdGF0aWMgdm9pZCBhZHZhbmNlX3Jpbmcoc3RydWN0 IGk5MTVfcmVxdWVzdCAqcmVxdWVzdCkKIAkJICogbm9vcHMgLSB0aGV5IGFyZSBzYWZlIHRvIGJl IHJlcGxheWVkIG9uIGEgcmVzZXQuCiAJCSAqLwogCQl0YWlsID0gUkVBRF9PTkNFKHJlcXVlc3Qt PnRhaWwpOworCQlsaXN0X2RlbCgmcmluZy0+YWN0aXZlX2xpbmspOwogCX0gZWxzZSB7CiAJCXRh aWwgPSByZXF1ZXN0LT5wb3N0Zml4OwogCX0KQEAgLTEwOTYsNiArMTA5Nyw4IEBAIHZvaWQgX19p OTE1X3JlcXVlc3RfYWRkKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJlcXVlc3QsIGJvb2wgZmx1c2hf Y2FjaGVzKQogCWk5MTVfZ2VtX2FjdGl2ZV9zZXQoJnRpbWVsaW5lLT5sYXN0X3JlcXVlc3QsIHJl cXVlc3QpOwogCiAJbGlzdF9hZGRfdGFpbCgmcmVxdWVzdC0+cmluZ19saW5rLCAmcmluZy0+cmVx dWVzdF9saXN0KTsKKwlpZiAobGlzdF9pc19maXJzdCgmcmVxdWVzdC0+cmluZ19saW5rLCAmcmlu Zy0+cmVxdWVzdF9saXN0KSkKKwkJbGlzdF9hZGQoJnJpbmctPmFjdGl2ZV9saW5rLCAmcmVxdWVz dC0+aTkxNS0+Z3QuYWN0aXZlX3JpbmdzKTsKIAlyZXF1ZXN0LT5lbWl0dGVkX2ppZmZpZXMgPSBq aWZmaWVzOwogCiAJLyoKQEAgLTE0MTgsMTQgKzE0MjEsMTcgQEAgc3RhdGljIHZvaWQgcmluZ19y ZXRpcmVfcmVxdWVzdHMoc3RydWN0IGludGVsX3JpbmcgKnJpbmcpCiAKIHZvaWQgaTkxNV9yZXRp cmVfcmVxdWVzdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiB7Ci0Jc3RydWN0IGlu dGVsX3JpbmcgKnJpbmcsICpuZXh0OworCXN0cnVjdCBpbnRlbF9yaW5nICpyaW5nLCAqdG1wOwog CiAJbG9ja2RlcF9hc3NlcnRfaGVsZCgmaTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CiAKIAlpZiAo IWk5MTUtPmd0LmFjdGl2ZV9yZXF1ZXN0cykKIAkJcmV0dXJuOwogCi0JbGlzdF9mb3JfZWFjaF9l bnRyeV9zYWZlKHJpbmcsIG5leHQsICZpOTE1LT5ndC5yaW5ncywgbGluaykKKwkvKiBBbiBvdXRz dGFuZGluZyByZXF1ZXN0IG11c3QgYmUgb24gYSBzdGlsbCBhY3RpdmUgcmluZyBzb21ld2hlcmUg Ki8KKwlHRU1fQlVHX09OKGxpc3RfZW1wdHkoJmk5MTUtPmd0LmFjdGl2ZV9yaW5ncykpOworCisJ bGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHJpbmcsIHRtcCwgJmk5MTUtPmd0LmFjdGl2ZV9yaW5n cywgYWN0aXZlX2xpbmspCiAJCXJpbmdfcmV0aXJlX3JlcXVlc3RzKHJpbmcpOwogfQogCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggYWU4OTU4MDA3ZGY1Li4wMDc0 NDljZmEyMmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTEx NTAsOCArMTE1MCw2IEBAIGludGVsX2VuZ2luZV9jcmVhdGVfcmluZyhzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUsIGludCBzaXplKQogCX0KIAlyaW5nLT52bWEgPSB2bWE7CiAKLQlsaXN0 X2FkZCgmcmluZy0+bGluaywgJmVuZ2luZS0+aTkxNS0+Z3QucmluZ3MpOwotCiAJcmV0dXJuIHJp bmc7CiB9CiAKQEAgLTExNjMsOCArMTE2MSw2IEBAIGludGVsX3JpbmdfZnJlZShzdHJ1Y3QgaW50 ZWxfcmluZyAqcmluZykKIAlpOTE1X3ZtYV9jbG9zZShyaW5nLT52bWEpOwogCV9faTkxNV9nZW1f b2JqZWN0X3JlbGVhc2VfdW5sZXNzX2FjdGl2ZShvYmopOwogCi0JbGlzdF9kZWwoJnJpbmctPmxp bmspOwotCiAJa2ZyZWUocmluZyk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuaAppbmRleCBkZWI4MGQwMWUwYmQuLmZkNjc5Y2VjOWFjNiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMTMwLDcgKzEzMCw3IEBAIHN0cnVjdCBpbnRl bF9yaW5nIHsKIAl2b2lkICp2YWRkcjsKIAogCXN0cnVjdCBsaXN0X2hlYWQgcmVxdWVzdF9saXN0 OwotCXN0cnVjdCBsaXN0X2hlYWQgbGluazsKKwlzdHJ1Y3QgbGlzdF9oZWFkIGFjdGl2ZV9saW5r OwogCiAJdTMyIGhlYWQ7CiAJdTMyIHRhaWw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9zZWxmdGVzdHMvbW9ja19lbmdpbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0 ZXN0cy9tb2NrX2VuZ2luZS5jCmluZGV4IDQyOTY3ZmMwOWViMC4uNjI5ODcwYWViNTQ3IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19lbmdpbmUuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19lbmdpbmUuYwpAQCAtMTQwLDE1 ICsxNDAsMTEgQEAgc3RhdGljIHN0cnVjdCBpbnRlbF9yaW5nICptb2NrX3Jpbmcoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCUlOSVRfTElTVF9IRUFEKCZyaW5nLT5yZXF1ZXN0X2xp c3QpOwogCWludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHJpbmcpOwogCi0JbGlzdF9hZGQoJnJpbmct PmxpbmssICZlbmdpbmUtPmk5MTUtPmd0LnJpbmdzKTsKLQogCXJldHVybiByaW5nOwogfQogCiBz dGF0aWMgdm9pZCBtb2NrX3JpbmdfZnJlZShzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZykKIHsKLQls aXN0X2RlbCgmcmluZy0+bGluayk7Ci0KIAlrZnJlZShyaW5nKTsKIH0KIApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jCmluZGV4IGFjNGJhY2Y4 YjViOS4uZjIyYTJiMzVhMjgzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxm dGVzdHMvbW9ja19nZW1fZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRl c3RzL21vY2tfZ2VtX2RldmljZS5jCkBAIC0yMjQsOSArMjI0LDEwIEBAIHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICptb2NrX2dlbV9kZXZpY2Uodm9pZCkKIAlpZiAoIWk5MTUtPnByaW9yaXRpZXMp CiAJCWdvdG8gZXJyX2RlcGVuZGVuY2llczsKIAotCW11dGV4X2xvY2soJmk5MTUtPmRybS5zdHJ1 Y3RfbXV0ZXgpOwotCUlOSVRfTElTVF9IRUFEKCZpOTE1LT5ndC5yaW5ncyk7CiAJSU5JVF9MSVNU X0hFQUQoJmk5MTUtPmd0LnRpbWVsaW5lcyk7CisJSU5JVF9MSVNUX0hFQUQoJmk5MTUtPmd0LmFj dGl2ZV9yaW5ncyk7CisKKwltdXRleF9sb2NrKCZpOTE1LT5kcm0uc3RydWN0X211dGV4KTsKIAll cnIgPSBpOTE1X2dlbV90aW1lbGluZV9pbml0X19nbG9iYWwoaTkxNSk7CiAJaWYgKGVycikgewog CQltdXRleF91bmxvY2soJmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOwotLSAKMi4xNy4wCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK