From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 17/39] drm/i915: Hook scheduler node clean up into retire requests Date: Mon, 23 Nov 2015 11:39:12 +0000 Message-ID: <1448278774-31376-18-git-send-email-John.C.Harrison@Intel.com> References: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id AB7FB721FF for ; Mon, 23 Nov 2015 03:39:53 -0800 (PST) In-Reply-To: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com> 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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBzY2hl ZHVsZXIga2VlcHMgaXRzIG93biBsb2NrIG9uIHZhcmlvdXMgRFJNIG9iamVjdHMgaW4gb3JkZXIg dG8gZ3VhcmFudGVlCnNhZmUgYWNjZXNzIGxvbmcgYWZ0ZXIgdGhlIG9yaWdpbmFsIGV4ZWNidWZm IElPQ1RMIGhhcyBjb21wbGV0ZWQuIFRoaXMgaXMKZXNwZWNpYWxseSBpbXBvcnRhbnQgd2hlbiBw cmUtZW1wdGlvbiBpcyBlbmFibGVkIGFzIHRoZSBiYXRjaCBidWZmZXIgbWlnaHQgbmVlZAp0byBi ZSBzdWJtaXR0ZWQgdG8gdGhlIGhhcmR3YXJlIG11bHRpcGxlIHRpbWVzLiBUaGlzIHBhdGNoIGhv b2tzIHRoZSBjbGVhbiB1cCBvZgp0aGVzZSBsb2NrcyBpbnRvIHRoZSByZXF1ZXN0IHJldGlyZSBm dW5jdGlvbi4gVGhlIHJlcXVlc3QgY2FuIG9ubHkgYmUgcmV0aXJlZAphZnRlciBpdCBoYXMgY29t cGxldGVkIG9uIHRoZSBoYXJkd2FyZSBhbmQgdGh1cyBpcyBubyBsb25nZXIgZWxpZ2libGUgZm9y CnJlLXN1Ym1pc3Npb24uIFRodXMgdGhlcmUgaXMgbm8gcG9pbnQgaG9sZGluZyBvbiB0byB0aGUg bG9ja3MgYmV5b25kIHRoYXQgdGltZS4KCkZvcjogVklaLTE1ODcKU2lnbmVkLW9mZi1ieTogSm9o biBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jICAgICAgIHwgIDMgKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3NjaGVkdWxlci5jIHwgNTEgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmggfCAgMSArCiAzIGZpbGVzIGNo YW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCmluZGV4IGY2MjVkODguLjQ1MWFlNmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpA QCAtMTQwMiw2ICsxNDAyLDkgQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9yZXRpcmUo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCQlmZW5jZV9zaWduYWxfbG9j a2VkKCZyZXF1ZXN0LT5mZW5jZSk7CiAJfQogCisJaWYgKHJlcXVlc3QtPnNjaGVkdWxlcl9xZSkK KwkJaTkxNV9nZW1fc2NoZWR1bGVyX2NsZWFuX25vZGUocmVxdWVzdC0+c2NoZWR1bGVyX3FlKTsK KwogCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxdWVzdCk7CiB9CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCmluZGV4IGNkNjlmNTMuLjVkYzM0OTcgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwpAQCAtMzgzLDYgKzM4MywzOCBAQCB2b2lkIGk5 MTVfc2NoZWR1bGVyX3dha2V1cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXF1ZXVlX3dvcmso ZGV2X3ByaXYtPndxLCAmZGV2X3ByaXYtPm1tLnNjaGVkdWxlcl93b3JrKTsKIH0KIAordm9pZCBp OTE1X2dlbV9zY2hlZHVsZXJfY2xlYW5fbm9kZShzdHJ1Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVf ZW50cnkgKm5vZGUpCit7CisJdWludDMyX3QgaTsKKworCWlmIChXQVJOKCFJOTE1X1NRU19JU19D T01QTEVURShub2RlKSwgIkluY29tcGxldGUgbm9kZTogJWQhXG4iLCBub2RlLT5zdGF0dXMpKQor CQlyZXR1cm47CisKKwlpZiAobm9kZS0+cGFyYW1zLmJhdGNoX29iaikgeworCQkvKiBUaGUgYmF0 Y2ggYnVmZmVyIG11c3QgYmUgdW5waW5uZWQgYmVmb3JlIGl0IGlzIHVucmVmZXJlbmNlZAorCQkg KiBvdGhlcndpc2UgdGhlIHVucGluIGZhaWxzIHdpdGggYSBtaXNzaW5nIHZtYSE/ICovCisJCWlm IChub2RlLT5wYXJhbXMuZGlzcGF0Y2hfZmxhZ3MgJiBJOTE1X0RJU1BBVENIX1NFQ1VSRSkKKwkJ CWk5MTVfZ2VtX2V4ZWNidWZmX3JlbGVhc2VfYmF0Y2hfb2JqKG5vZGUtPnBhcmFtcy5iYXRjaF9v YmopOworCisJCW5vZGUtPnBhcmFtcy5iYXRjaF9vYmogPSBOVUxMOworCX0KKworCS8qIFJlbGVh c2UgdGhlIGxvY2tlZCBidWZmZXJzOiAqLworCWZvciAoaSA9IDA7IGkgPCBub2RlLT5udW1fb2Jq czsgaSsrKSB7CisJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKAorCQkJCSAgICAmbm9kZS0+ c2F2ZWRfb2JqZWN0c1tpXS5vYmotPmJhc2UpOworCX0KKwlrZnJlZShub2RlLT5zYXZlZF9vYmpl Y3RzKTsKKwlub2RlLT5zYXZlZF9vYmplY3RzID0gTlVMTDsKKwlub2RlLT5udW1fb2JqcyA9IDA7 CisKKwkvKiBDb250ZXh0IHRvbzogKi8KKwlpZiAobm9kZS0+cGFyYW1zLmN0eCkgeworCQlpOTE1 X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKG5vZGUtPnBhcmFtcy5jdHgpOworCQlub2RlLT5wYXJh bXMuY3R4ID0gTlVMTDsKKwl9Cit9CisKIHN0YXRpYyBpbnQgaTkxNV9zY2hlZHVsZXJfcmVtb3Zl KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gcmluZy0+ZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTM5Miw3ICs0MjQsNyBA QCBzdGF0aWMgaW50IGk5MTVfc2NoZWR1bGVyX3JlbW92ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nKQogCWludCAgICAgICAgICAgICAgICAgZmx5aW5nID0gMCwgcXVldWVkID0gMDsKIAlp bnQgICAgICAgICAgICAgICAgIHJldCA9IDA7CiAJYm9vbCAgICAgICAgICAgICAgICBkb19zdWJt aXQ7Ci0JdWludDMyX3QgICAgICAgICAgICBpLCBtaW5fc2Vxbm87CisJdWludDMyX3QgICAgICAg ICAgICBtaW5fc2Vxbm87CiAJc3RydWN0IGxpc3RfaGVhZCAgICByZW1vdmU7CiAKIAlpZiAobGlz dF9lbXB0eSgmc2NoZWR1bGVyLT5ub2RlX3F1ZXVlW3JpbmctPmlkXSkpCkBAIC00OTEsMjEgKzUy Myw4IEBAIHN0YXRpYyBpbnQgaTkxNV9zY2hlZHVsZXJfcmVtb3ZlKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpCiAJCW5vZGUgPSBsaXN0X2ZpcnN0X2VudHJ5KCZyZW1vdmUsIHR5cGVvZigq bm9kZSksIGxpbmspOwogCQlsaXN0X2RlbCgmbm9kZS0+bGluayk7CiAKLQkJLyogVGhlIGJhdGNo IGJ1ZmZlciBtdXN0IGJlIHVucGlubmVkIGJlZm9yZSBpdCBpcyB1bnJlZmVyZW5jZWQKLQkJICog b3RoZXJ3aXNlIHRoZSB1bnBpbiBmYWlscyB3aXRoIGEgbWlzc2luZyB2bWEhPyAqLwotCQlpZiAo bm9kZS0+cGFyYW1zLmRpc3BhdGNoX2ZsYWdzICYgSTkxNV9ESVNQQVRDSF9TRUNVUkUpCi0JCQlp OTE1X2dlbV9leGVjYnVmZl9yZWxlYXNlX2JhdGNoX29iaihub2RlLT5wYXJhbXMuYmF0Y2hfb2Jq KTsKLQotCQkvKiBSZWxlYXNlIHRoZSBsb2NrZWQgYnVmZmVyczogKi8KLQkJZm9yIChpID0gMDsg aSA8IG5vZGUtPm51bV9vYmpzOyBpKyspIHsKLQkJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNl KAotCQkJCQkgICAgJm5vZGUtPnNhdmVkX29iamVjdHNbaV0ub2JqLT5iYXNlKTsKLQkJfQotCQlr ZnJlZShub2RlLT5zYXZlZF9vYmplY3RzKTsKLQotCQkvKiBDb250ZXh0IHRvbzogKi8KLQkJaWYg KG5vZGUtPnBhcmFtcy5jdHgpCi0JCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKG5vZGUt PnBhcmFtcy5jdHgpOworCQkvKiBGcmVlIHVwIGFsbCB0aGUgRFJNIG9iamVjdCByZWZlcmVuY2Vz ICovCisJCWk5MTVfZ2VtX3NjaGVkdWxlcl9jbGVhbl9ub2RlKG5vZGUpOwogCiAJCS8qIEFuZCBh bnl0aGluZyBlbHNlIG93bmVkIGJ5IHRoZSBub2RlOiAqLwogCQlub2RlLT5wYXJhbXMucmVxdWVz dC0+c2NoZWR1bGVyX3FlID0gTlVMTDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfc2NoZWR1bGVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5o CmluZGV4IGRhMDk1ZjkuLjg0NjkyNzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfc2NoZWR1bGVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVs ZXIuaApAQCAtODcsNiArODcsNyBAQCBib29sICAgICAgICBpOTE1X3NjaGVkdWxlcl9pc19lbmFi bGVkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50ICAgICAgICAgaTkxNV9zY2hlZHVsZXJf aW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCAgICAgICAgIGk5MTVfc2NoZWR1bGVy X2Nsb3NlZmlsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgICAgc3RydWN0IGRybV9m aWxlICpmaWxlKTsKK3ZvaWQgICAgICAgIGk5MTVfZ2VtX3NjaGVkdWxlcl9jbGVhbl9ub2RlKHN0 cnVjdCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9lbnRyeSAqbm9kZSk7CiBpbnQgICAgICAgICBpOTE1 X3NjaGVkdWxlcl9xdWV1ZV9leGVjYnVmZmVyKHN0cnVjdCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9l bnRyeSAqcWUpOwogYm9vbCAgICAgICAgaTkxNV9zY2hlZHVsZXJfbm90aWZ5X3JlcXVlc3Qoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpOwogdm9pZCAgICAgICAgaTkxNV9zY2hlZHVs ZXJfd2FrZXVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwotLSAKMS45LjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==