From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 4/7] drm/i915: Only track live rings for retiring Date: Thu, 26 Apr 2018 18:49:29 +0100 Message-ID: <20180426174932.23127-4-chris@chris-wilson.co.uk> References: <20180426174932.23127-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 1AE586E664 for ; Thu, 26 Apr 2018 17:49:49 +0000 (UTC) In-Reply-To: <20180426174932.23127-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 PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgICAgICAgICB8 ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgICAgICAgICAg IHwgIDYgKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlcXVlc3QuYyAgICAgICAg ICAgICAgfCAxMCArKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMgICAgICAgICAgfCAgNCAtLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmggICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3Rz L21vY2tfZW5naW5lLmMgICAgIHwgIDQgLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRl c3RzL21vY2tfZ2VtX2RldmljZS5jIHwgIDUgKysrLS0KIDcgZmlsZXMgY2hhbmdlZCwgMTggaW5z ZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg MTgzN2MwMWQ0NGQwLi41NDM1MWNhY2UzNjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAt MjA2MCw3ICsyMDYwLDggQEAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgewogCiAJCXN0cnVjdCBp OTE1X2dlbV90aW1lbGluZSBnbG9iYWxfdGltZWxpbmU7CiAJCXN0cnVjdCBsaXN0X2hlYWQgdGlt ZWxpbmVzOwotCQlzdHJ1Y3QgbGlzdF9oZWFkIHJpbmdzOworCisJCXN0cnVjdCBsaXN0X2hlYWQg YWN0aXZlX3JpbmdzOwogCQl1MzIgYWN0aXZlX3JlcXVlc3RzOwogCQl1MzIgcmVxdWVzdF9zZXJp YWw7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGYwNjQ0ZDFmYmQ3NS4uZmExZDk0YTRl YjVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTE0MSw2ICsxNDEsNyBAQCBzdGF0aWMg dTMyIF9faTkxNV9nZW1fcGFyayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKIAls b2NrZGVwX2Fzc2VydF9oZWxkKCZpOTE1LT5kcm0uc3RydWN0X211dGV4KTsKIAlHRU1fQlVHX09O KGk5MTUtPmd0LmFjdGl2ZV9yZXF1ZXN0cyk7CisJR0VNX0JVR19PTighbGlzdF9lbXB0eSgmaTkx NS0+Z3QuYWN0aXZlX3JpbmdzKSk7CiAKIAlpZiAoIWk5MTUtPmd0LmF3YWtlKQogCQlyZXR1cm4g STkxNV9FUE9DSF9JTlZBTElEOwpAQCAtNTU5OSw5ICs1NjAwLDEwIEBAIGludCBpOTE1X2dlbV9p bml0X2Vhcmx5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAoIWRldl9w cml2LT5wcmlvcml0aWVzKQogCQlnb3RvIGVycl9kZXBlbmRlbmNpZXM7CiAKLQltdXRleF9sb2Nr KCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7Ci0JSU5JVF9MSVNUX0hFQUQoJmRldl9wcml2 LT5ndC5yaW5ncyk7CiAJSU5JVF9MSVNUX0hFQUQoJmRldl9wcml2LT5ndC50aW1lbGluZXMpOwor CUlOSVRfTElTVF9IRUFEKCZkZXZfcHJpdi0+Z3QuYWN0aXZlX3JpbmdzKTsKKworCW11dGV4X2xv Y2soJmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIAllcnIgPSBpOTE1X2dlbV90aW1lbGlu ZV9pbml0X19nbG9iYWwoZGV2X3ByaXYpOwogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmRybS5z dHJ1Y3RfbXV0ZXgpOwogCWlmIChlcnIpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3JlcXVlc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVxdWVzdC5jCmlu ZGV4IGU2NTM1MjU1ZDQ0NS4uYzhmYzRiMzIzZTYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3JlcXVlc3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Jl cXVlc3QuYwpAQCAtMzIyLDYgKzMyMiw3IEBAIHN0YXRpYyB2b2lkIGFkdmFuY2VfcmluZyhzdHJ1 Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0KQogCQkgKiBub29wcyAtIHRoZXkgYXJlIHNhZmUgdG8g YmUgcmVwbGF5ZWQgb24gYSByZXNldC4KIAkJICovCiAJCXRhaWwgPSBSRUFEX09OQ0UocmVxdWVz dC0+dGFpbCk7CisJCWxpc3RfZGVsKCZyaW5nLT5hY3RpdmVfbGluayk7CiAJfSBlbHNlIHsKIAkJ dGFpbCA9IHJlcXVlc3QtPnBvc3RmaXg7CiAJfQpAQCAtMTA5Niw2ICsxMDk3LDggQEAgdm9pZCBf X2k5MTVfcmVxdWVzdF9hZGQoc3RydWN0IGk5MTVfcmVxdWVzdCAqcmVxdWVzdCwgYm9vbCBmbHVz aF9jYWNoZXMpCiAJaTkxNV9nZW1fYWN0aXZlX3NldCgmdGltZWxpbmUtPmxhc3RfcmVxdWVzdCwg cmVxdWVzdCk7CiAKIAlsaXN0X2FkZF90YWlsKCZyZXF1ZXN0LT5yaW5nX2xpbmssICZyaW5nLT5y ZXF1ZXN0X2xpc3QpOworCWlmIChsaXN0X2lzX2ZpcnN0KCZyZXF1ZXN0LT5yaW5nX2xpbmssICZy aW5nLT5yZXF1ZXN0X2xpc3QpKQorCQlsaXN0X2FkZCgmcmluZy0+YWN0aXZlX2xpbmssICZyZXF1 ZXN0LT5pOTE1LT5ndC5hY3RpdmVfcmluZ3MpOwogCXJlcXVlc3QtPmVtaXR0ZWRfamlmZmllcyA9 IGppZmZpZXM7CiAKIAkvKgpAQCAtMTQxOCwxNCArMTQyMSwxNyBAQCBzdGF0aWMgdm9pZCByaW5n X3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZykKIAogdm9pZCBpOTE1X3Jl dGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKLQlzdHJ1Y3Qg aW50ZWxfcmluZyAqcmluZywgKm5leHQ7CisJc3RydWN0IGludGVsX3JpbmcgKnJpbmcsICp0bXA7 CiAKIAlsb2NrZGVwX2Fzc2VydF9oZWxkKCZpOTE1LT5kcm0uc3RydWN0X211dGV4KTsKIAogCWlm ICghaTkxNS0+Z3QuYWN0aXZlX3JlcXVlc3RzKQogCQlyZXR1cm47CiAKLQlsaXN0X2Zvcl9lYWNo X2VudHJ5X3NhZmUocmluZywgbmV4dCwgJmk5MTUtPmd0LnJpbmdzLCBsaW5rKQorCS8qIEFuIG91 dHN0YW5kaW5nIHJlcXVlc3QgbXVzdCBiZSBvbiBhIHN0aWxsIGFjdGl2ZSByaW5nIHNvbWV3aGVy ZSAqLworCUdFTV9CVUdfT04obGlzdF9lbXB0eSgmaTkxNS0+Z3QuYWN0aXZlX3JpbmdzKSk7CisK KwlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUocmluZywgdG1wLCAmaTkxNS0+Z3QuYWN0aXZlX3Jp bmdzLCBhY3RpdmVfbGluaykKIAkJcmluZ19yZXRpcmVfcmVxdWVzdHMocmluZyk7CiB9CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBhZTg5NTgwMDdkZjUuLjAw NzQ0OWNmYTIyYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAt MTE1MCw4ICsxMTUwLDYgQEAgaW50ZWxfZW5naW5lX2NyZWF0ZV9yaW5nKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSwgaW50IHNpemUpCiAJfQogCXJpbmctPnZtYSA9IHZtYTsKIAotCWxp c3RfYWRkKCZyaW5nLT5saW5rLCAmZW5naW5lLT5pOTE1LT5ndC5yaW5ncyk7Ci0KIAlyZXR1cm4g cmluZzsKIH0KIApAQCAtMTE2Myw4ICsxMTYxLDYgQEAgaW50ZWxfcmluZ19mcmVlKHN0cnVjdCBp bnRlbF9yaW5nICpyaW5nKQogCWk5MTVfdm1hX2Nsb3NlKHJpbmctPnZtYSk7CiAJX19pOTE1X2dl bV9vYmplY3RfcmVsZWFzZV91bmxlc3NfYWN0aXZlKG9iaik7CiAKLQlsaXN0X2RlbCgmcmluZy0+ bGluayk7Ci0KIAlrZnJlZShyaW5nKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5oCmluZGV4IGRlYjgwZDAxZTBiZC4uZmQ2NzljZWM5YWM2IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0xMzAsNyArMTMwLDcgQEAgc3RydWN0IGlu dGVsX3JpbmcgewogCXZvaWQgKnZhZGRyOwogCiAJc3RydWN0IGxpc3RfaGVhZCByZXF1ZXN0X2xp c3Q7Ci0Jc3RydWN0IGxpc3RfaGVhZCBsaW5rOworCXN0cnVjdCBsaXN0X2hlYWQgYWN0aXZlX2xp bms7CiAKIAl1MzIgaGVhZDsKIAl1MzIgdGFpbDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2VuZ2luZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2Vs ZnRlc3RzL21vY2tfZW5naW5lLmMKaW5kZXggNDI5NjdmYzA5ZWIwLi42Mjk4NzBhZWI1NDcgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2VuZ2luZS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2VuZ2luZS5jCkBAIC0xNDAs MTUgKzE0MCwxMSBAQCBzdGF0aWMgc3RydWN0IGludGVsX3JpbmcgKm1vY2tfcmluZyhzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJSU5JVF9MSVNUX0hFQUQoJnJpbmctPnJlcXVlc3Rf bGlzdCk7CiAJaW50ZWxfcmluZ191cGRhdGVfc3BhY2UocmluZyk7CiAKLQlsaXN0X2FkZCgmcmlu Zy0+bGluaywgJmVuZ2luZS0+aTkxNS0+Z3QucmluZ3MpOwotCiAJcmV0dXJuIHJpbmc7CiB9CiAK IHN0YXRpYyB2b2lkIG1vY2tfcmluZ19mcmVlKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nKQogewot CWxpc3RfZGVsKCZyaW5nLT5saW5rKTsKLQogCWtmcmVlKHJpbmcpOwogfQogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19nZW1fZGV2aWNlLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19nZW1fZGV2aWNlLmMKaW5kZXggYWM0YmFj ZjhiNWI5Li5mMjJhMmIzNWEyODMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3Nl bGZ0ZXN0cy9tb2NrX2dlbV9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxm dGVzdHMvbW9ja19nZW1fZGV2aWNlLmMKQEAgLTIyNCw5ICsyMjQsMTAgQEAgc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKm1vY2tfZ2VtX2RldmljZSh2b2lkKQogCWlmICghaTkxNS0+cHJpb3JpdGll cykKIAkJZ290byBlcnJfZGVwZW5kZW5jaWVzOwogCi0JbXV0ZXhfbG9jaygmaTkxNS0+ZHJtLnN0 cnVjdF9tdXRleCk7Ci0JSU5JVF9MSVNUX0hFQUQoJmk5MTUtPmd0LnJpbmdzKTsKIAlJTklUX0xJ U1RfSEVBRCgmaTkxNS0+Z3QudGltZWxpbmVzKTsKKwlJTklUX0xJU1RfSEVBRCgmaTkxNS0+Z3Qu YWN0aXZlX3JpbmdzKTsKKworCW11dGV4X2xvY2soJmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOwog CWVyciA9IGk5MTVfZ2VtX3RpbWVsaW5lX2luaXRfX2dsb2JhbChpOTE1KTsKIAlpZiAoZXJyKSB7 CiAJCW11dGV4X3VubG9jaygmaTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7Ci0tIAoyLjE3LjAKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=