From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 18/40] drm/i915: Hook scheduler node clean up into retire requests Date: Fri, 11 Dec 2015 13:19:57 +0000 Message-ID: <1449839997-22534-1-git-send-email-John.C.Harrison@Intel.com> References: <1448278774-31376-18-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 123276EFD3 for ; Fri, 11 Dec 2015 05:19:59 -0800 (PST) In-Reply-To: <1448278774-31376-18-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 dG8KZ3VhcmFudGVlIHNhZmUgYWNjZXNzIGxvbmcgYWZ0ZXIgdGhlIG9yaWdpbmFsIGV4ZWNidWZm IElPQ1RMIGhhcwpjb21wbGV0ZWQuIFRoaXMgaXMgZXNwZWNpYWxseSBpbXBvcnRhbnQgd2hlbiBw cmUtZW1wdGlvbiBpcyBlbmFibGVkIGFzCnRoZSBiYXRjaCBidWZmZXIgbWlnaHQgbmVlZCB0byBi ZSBzdWJtaXR0ZWQgdG8gdGhlIGhhcmR3YXJlIG11bHRpcGxlCnRpbWVzLiBUaGlzIHBhdGNoIGhv b2tzIHRoZSBjbGVhbiB1cCBvZiB0aGVzZSBsb2NrcyBpbnRvIHRoZSByZXF1ZXN0CnJldGlyZSBm dW5jdGlvbi4gVGhlIHJlcXVlc3QgY2FuIG9ubHkgYmUgcmV0aXJlZCBhZnRlciBpdCBoYXMKY29t cGxldGVkIG9uIHRoZSBoYXJkd2FyZSBhbmQgdGh1cyBpcyBubyBsb25nZXIgZWxpZ2libGUgZm9y CnJlLXN1Ym1pc3Npb24uIFRodXMgdGhlcmUgaXMgbm8gcG9pbnQgaG9sZGluZyBvbiB0byB0aGUg bG9ja3MgYmV5b25kCnRoYXQgdGltZS4KCnYzOiBVcGRhdGVkIHRvIG5vdCBXQVJOIHdoZW4gY2xl YW5pbmcgYSBub2RlIHRoYXQgaXMgYmVpbmcgY2FuY2VsbGVkLgpUaGUgY2xlYW4gd2lsbCBoYXBw ZW4gbGF0ZXIgc28gc2tpcHBpbmcgaXQgYXQgdGhlIHBvaW50IG9mCmNhbmNlbGxhdGlvbiBpcyBm aW5lLgoKRm9yOiBWSVotMTU4NwpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMu SGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg ICAgICAgfCAgMyArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYyB8IDU0 ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3NjaGVkdWxlci5oIHwgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCA0MiBpbnNlcnRpb25z KCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBkYzVmM2Zl Li4zNDlmZjU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTE0MDIsNiArMTQwMiw5IEBA IHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfcmV0aXJlKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdCkKIAkJZmVuY2Vfc2lnbmFsX2xvY2tlZCgmcmVxdWVzdC0+ZmVuY2Up OwogCX0KIAorCWlmIChyZXF1ZXN0LT5zY2hlZHVsZXJfcWUpCisJCWk5MTVfZ2VtX3NjaGVkdWxl cl9jbGVhbl9ub2RlKHJlcXVlc3QtPnNjaGVkdWxlcl9xZSk7CisKIAlpOTE1X2dlbV9yZXF1ZXN0 X3VucmVmZXJlbmNlKHJlcXVlc3QpOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3NjaGVkdWxlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVs ZXIuYwppbmRleCAzMDBjZDg5Li5mODhjODcxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3NjaGVkdWxlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2No ZWR1bGVyLmMKQEAgLTQwNiw2ICs0MDYsNDEgQEAgdm9pZCBpOTE1X3NjaGVkdWxlcl93YWtldXAo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlxdWV1ZV93b3JrKGRldl9wcml2LT53cSwgJmRldl9w cml2LT5tbS5zY2hlZHVsZXJfd29yayk7CiB9CiAKK3ZvaWQgaTkxNV9nZW1fc2NoZWR1bGVyX2Ns ZWFuX25vZGUoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpub2RlKQoreworCXVp bnQzMl90IGk7CisKKwlpZiAoIUk5MTVfU1FTX0lTX0NPTVBMRVRFKG5vZGUpKSB7CisJCVdBUk4o IW5vZGUtPnBhcmFtcy5yZXF1ZXN0LT5jYW5jZWxsZWQsCisJCSAgICAgIkNsZWFuaW5nIGFjdGl2 ZSBub2RlOiAlZCFcbiIsIG5vZGUtPnN0YXR1cyk7CisJCXJldHVybjsKKwl9CisKKwlpZiAobm9k ZS0+cGFyYW1zLmJhdGNoX29iaikgeworCQkvKiBUaGUgYmF0Y2ggYnVmZmVyIG11c3QgYmUgdW5w aW5uZWQgYmVmb3JlIGl0IGlzIHVucmVmZXJlbmNlZAorCQkgKiBvdGhlcndpc2UgdGhlIHVucGlu IGZhaWxzIHdpdGggYSBtaXNzaW5nIHZtYSE/ICovCisJCWlmIChub2RlLT5wYXJhbXMuZGlzcGF0 Y2hfZmxhZ3MgJiBJOTE1X0RJU1BBVENIX1NFQ1VSRSkKKwkJCWk5MTVfZ2VtX2V4ZWNidWZmX3Jl bGVhc2VfYmF0Y2hfb2JqKG5vZGUtPnBhcmFtcy5iYXRjaF9vYmopOworCisJCW5vZGUtPnBhcmFt cy5iYXRjaF9vYmogPSBOVUxMOworCX0KKworCS8qIFJlbGVhc2UgdGhlIGxvY2tlZCBidWZmZXJz OiAqLworCWZvciAoaSA9IDA7IGkgPCBub2RlLT5udW1fb2JqczsgaSsrKSB7CisJCWRybV9nZW1f b2JqZWN0X3VucmVmZXJlbmNlKAorCQkJCSAgICAmbm9kZS0+c2F2ZWRfb2JqZWN0c1tpXS5vYmot PmJhc2UpOworCX0KKwlrZnJlZShub2RlLT5zYXZlZF9vYmplY3RzKTsKKwlub2RlLT5zYXZlZF9v YmplY3RzID0gTlVMTDsKKwlub2RlLT5udW1fb2JqcyA9IDA7CisKKwkvKiBDb250ZXh0IHRvbzog Ki8KKwlpZiAobm9kZS0+cGFyYW1zLmN0eCkgeworCQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJl bmNlKG5vZGUtPnBhcmFtcy5jdHgpOworCQlub2RlLT5wYXJhbXMuY3R4ID0gTlVMTDsKKwl9Cit9 CisKIHN0YXRpYyBpbnQgaTkxNV9zY2hlZHVsZXJfcmVtb3ZlKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ ZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTQxNSw3ICs0NTAsNyBAQCBzdGF0aWMgaW50IGk5MTVfc2No ZWR1bGVyX3JlbW92ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCWludCAgICAgICAg ICAgICAgICAgZmx5aW5nID0gMCwgcXVldWVkID0gMDsKIAlpbnQgICAgICAgICAgICAgICAgIHJl dCA9IDA7CiAJYm9vbCAgICAgICAgICAgICAgICBkb19zdWJtaXQ7Ci0JdWludDMyX3QgICAgICAg ICAgICBpLCBtaW5fc2Vxbm87CisJdWludDMyX3QgICAgICAgICAgICBtaW5fc2Vxbm87CiAJc3Ry dWN0IGxpc3RfaGVhZCAgICByZW1vdmU7CiAKIAlpZiAobGlzdF9lbXB0eSgmc2NoZWR1bGVyLT5u b2RlX3F1ZXVlW3JpbmctPmlkXSkpCkBAIC01MTQsMjEgKzU0OSw4IEBAIHN0YXRpYyBpbnQgaTkx NV9zY2hlZHVsZXJfcmVtb3ZlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCW5vZGUg PSBsaXN0X2ZpcnN0X2VudHJ5KCZyZW1vdmUsIHR5cGVvZigqbm9kZSksIGxpbmspOwogCQlsaXN0 X2RlbCgmbm9kZS0+bGluayk7CiAKLQkJLyogVGhlIGJhdGNoIGJ1ZmZlciBtdXN0IGJlIHVucGlu bmVkIGJlZm9yZSBpdCBpcyB1bnJlZmVyZW5jZWQKLQkJICogb3RoZXJ3aXNlIHRoZSB1bnBpbiBm YWlscyB3aXRoIGEgbWlzc2luZyB2bWEhPyAqLwotCQlpZiAobm9kZS0+cGFyYW1zLmRpc3BhdGNo X2ZsYWdzICYgSTkxNV9ESVNQQVRDSF9TRUNVUkUpCi0JCQlpOTE1X2dlbV9leGVjYnVmZl9yZWxl YXNlX2JhdGNoX29iaihub2RlLT5wYXJhbXMuYmF0Y2hfb2JqKTsKLQotCQkvKiBSZWxlYXNlIHRo ZSBsb2NrZWQgYnVmZmVyczogKi8KLQkJZm9yIChpID0gMDsgaSA8IG5vZGUtPm51bV9vYmpzOyBp KyspIHsKLQkJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKAotCQkJCQkgICAgJm5vZGUtPnNh dmVkX29iamVjdHNbaV0ub2JqLT5iYXNlKTsKLQkJfQotCQlrZnJlZShub2RlLT5zYXZlZF9vYmpl Y3RzKTsKLQotCQkvKiBDb250ZXh0IHRvbzogKi8KLQkJaWYgKG5vZGUtPnBhcmFtcy5jdHgpCi0J CQlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKG5vZGUtPnBhcmFtcy5jdHgpOworCQkvKiBG cmVlIHVwIGFsbCB0aGUgRFJNIG9iamVjdCByZWZlcmVuY2VzICovCisJCWk5MTVfZ2VtX3NjaGVk dWxlcl9jbGVhbl9ub2RlKG5vZGUpOwogCiAJCS8qIEFuZCBhbnl0aGluZyBlbHNlIG93bmVkIGJ5 IHRoZSBub2RlOiAqLwogCQlub2RlLT5wYXJhbXMucmVxdWVzdC0+c2NoZWR1bGVyX3FlID0gTlVM TDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oCmluZGV4IDU2ZjY4ZTUuLjU0ZDg3 ZmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaApAQCAtODgsNiArODgsNyBA QCBib29sICAgICAgICBpOTE1X3NjaGVkdWxlcl9pc19lbmFibGVkKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwogaW50ICAgICAgICAgaTkxNV9zY2hlZHVsZXJfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KTsKIGludCAgICAgICAgIGk5MTVfc2NoZWR1bGVyX2Nsb3NlZmlsZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCQkJCSAgICAgc3RydWN0IGRybV9maWxlICpmaWxlKTsKK3ZvaWQgICAg ICAgIGk5MTVfZ2VtX3NjaGVkdWxlcl9jbGVhbl9ub2RlKHN0cnVjdCBpOTE1X3NjaGVkdWxlcl9x dWV1ZV9lbnRyeSAqbm9kZSk7CiBpbnQgICAgICAgICBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9leGVj YnVmZmVyKHN0cnVjdCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9lbnRyeSAqcWUpOwogYm9vbCAgICAg ICAgaTkxNV9zY2hlZHVsZXJfbm90aWZ5X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEpOwogdm9pZCAgICAgICAgaTkxNV9zY2hlZHVsZXJfd2FrZXVwKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==