From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v4 17/38] drm/i915: Hook scheduler node clean up into retire requests Date: Mon, 11 Jan 2016 18:42:46 +0000 Message-ID: <1452537788-32136-18-git-send-email-John.C.Harrison@Intel.com> References: <1448278774-31376-1-git-send-email-John.C.Harrison@Intel.com> <1452537788-32136-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D32D6E516 for ; Mon, 11 Jan 2016 10:43:27 -0800 (PST) In-Reply-To: <1452537788-32136-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 dG8KZ3VhcmFudGVlIHNhZmUgYWNjZXNzIGxvbmcgYWZ0ZXIgdGhlIG9yaWdpbmFsIGV4ZWNidWZm IElPQ1RMIGhhcwpjb21wbGV0ZWQuIFRoaXMgaXMgZXNwZWNpYWxseSBpbXBvcnRhbnQgd2hlbiBw cmUtZW1wdGlvbiBpcyBlbmFibGVkIGFzCnRoZSBiYXRjaCBidWZmZXIgbWlnaHQgbmVlZCB0byBi ZSBzdWJtaXR0ZWQgdG8gdGhlIGhhcmR3YXJlIG11bHRpcGxlCnRpbWVzLiBUaGlzIHBhdGNoIGhv b2tzIHRoZSBjbGVhbiB1cCBvZiB0aGVzZSBsb2NrcyBpbnRvIHRoZSByZXF1ZXN0CnJldGlyZSBm dW5jdGlvbi4gVGhlIHJlcXVlc3QgY2FuIG9ubHkgYmUgcmV0aXJlZCBhZnRlciBpdCBoYXMKY29t cGxldGVkIG9uIHRoZSBoYXJkd2FyZSBhbmQgdGh1cyBpcyBubyBsb25nZXIgZWxpZ2libGUgZm9y CnJlLXN1Ym1pc3Npb24uIFRodXMgdGhlcmUgaXMgbm8gcG9pbnQgaG9sZGluZyBvbiB0byB0aGUg bG9ja3MgYmV5b25kCnRoYXQgdGltZS4KCnYzOiBVcGRhdGVkIHRvIG5vdCBXQVJOIHdoZW4gY2xl YW5pbmcgYSBub2RlIHRoYXQgaXMgYmVpbmcgY2FuY2VsbGVkLgpUaGUgY2xlYW4gd2lsbCBoYXBw ZW4gbGF0ZXIgc28gc2tpcHBpbmcgaXQgYXQgdGhlIHBvaW50IG9mCmNhbmNlbGxhdGlvbiBpcyBm aW5lLgoKRm9yOiBWSVotMTU4NwpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMu SGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg ICAgICAgfCAgMyArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYyB8IDU4 ICsrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3NjaGVkdWxlci5oIHwgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25z KCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBmMzk2Mzkz Li5jZTA1NTFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTE0MzUsNiArMTQzNSw5IEBA IHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfcmV0aXJlKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxdWVzdCkKIAkJZmVuY2Vfc2lnbmFsX2xvY2tlZCgmcmVxdWVzdC0+ZmVuY2Up OwogCX0KIAorCWlmIChyZXF1ZXN0LT5zY2hlZHVsZXJfcWUpCisJCWk5MTVfZ2VtX3NjaGVkdWxl cl9jbGVhbl9ub2RlKHJlcXVlc3QtPnNjaGVkdWxlcl9xZSk7CisKIAlpOTE1X2dlbV9yZXF1ZXN0 X3VucmVmZXJlbmNlKHJlcXVlc3QpOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3NjaGVkdWxlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVs ZXIuYwppbmRleCAwNjdlZjMzLi4wYjdmMWRmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3NjaGVkdWxlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2No ZWR1bGVyLmMKQEAgLTQxNCw2ICs0MTQsNDMgQEAgdm9pZCBpOTE1X3NjaGVkdWxlcl93YWtldXAo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlxdWV1ZV93b3JrKGRldl9wcml2LT53cSwgJmRldl9w cml2LT5tbS5zY2hlZHVsZXJfd29yayk7CiB9CiAKK3ZvaWQgaTkxNV9nZW1fc2NoZWR1bGVyX2Ns ZWFuX25vZGUoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpub2RlKQoreworCXVp bnQzMl90IGk7CisKKwlpZiAoIUk5MTVfU1FTX0lTX0NPTVBMRVRFKG5vZGUpKSB7CisJCVdBUk4o IW5vZGUtPnBhcmFtcy5yZXF1ZXN0LT5jYW5jZWxsZWQsCisJCSAgICAgIkNsZWFuaW5nIGFjdGl2 ZSBub2RlOiAlZCFcbiIsIG5vZGUtPnN0YXR1cyk7CisJCXJldHVybjsKKwl9CisKKwlpZiAobm9k ZS0+cGFyYW1zLmJhdGNoX29iaikgeworCQkvKgorCQkgKiBUaGUgYmF0Y2ggYnVmZmVyIG11c3Qg YmUgdW5waW5uZWQgYmVmb3JlIGl0IGlzIHVucmVmZXJlbmNlZAorCQkgKiBvdGhlcndpc2UgdGhl IHVucGluIGZhaWxzIHdpdGggYSBtaXNzaW5nIHZtYSE/CisJCSAqLworCQlpZiAobm9kZS0+cGFy YW1zLmRpc3BhdGNoX2ZsYWdzICYgSTkxNV9ESVNQQVRDSF9TRUNVUkUpCisJCQlpOTE1X2dlbV9l eGVjYnVmZl9yZWxlYXNlX2JhdGNoX29iaihub2RlLT5wYXJhbXMuYmF0Y2hfb2JqKTsKKworCQlu b2RlLT5wYXJhbXMuYmF0Y2hfb2JqID0gTlVMTDsKKwl9CisKKwkvKiBSZWxlYXNlIHRoZSBsb2Nr ZWQgYnVmZmVyczogKi8KKwlmb3IgKGkgPSAwOyBpIDwgbm9kZS0+bnVtX29ianM7IGkrKykgewor CQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgKKwkJCQkgICAgJm5vZGUtPnNhdmVkX29iamVj dHNbaV0ub2JqLT5iYXNlKTsKKwl9CisJa2ZyZWUobm9kZS0+c2F2ZWRfb2JqZWN0cyk7CisJbm9k ZS0+c2F2ZWRfb2JqZWN0cyA9IE5VTEw7CisJbm9kZS0+bnVtX29ianMgPSAwOworCisJLyogQ29u dGV4dCB0b286ICovCisJaWYgKG5vZGUtPnBhcmFtcy5jdHgpIHsKKwkJaTkxNV9nZW1fY29udGV4 dF91bnJlZmVyZW5jZShub2RlLT5wYXJhbXMuY3R4KTsKKwkJbm9kZS0+cGFyYW1zLmN0eCA9IE5V TEw7CisJfQorfQorCiBzdGF0aWMgaW50IGk5MTVfc2NoZWR1bGVyX3JlbW92ZShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CkBAIC00MjMsNyArNDYwLDcgQEAgc3RhdGljIGlu dCBpOTE1X3NjaGVkdWxlcl9yZW1vdmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAlp bnQgICAgICAgICAgICAgICAgIGZseWluZyA9IDAsIHF1ZXVlZCA9IDA7CiAJaW50ICAgICAgICAg ICAgICAgICByZXQgPSAwOwogCWJvb2wgICAgICAgICAgICAgICAgZG9fc3VibWl0OwotCXVpbnQz Ml90ICAgICAgICAgICAgaSwgbWluX3NlcW5vOworCXVpbnQzMl90ICAgICAgICAgICAgbWluX3Nl cW5vOwogCXN0cnVjdCBsaXN0X2hlYWQgICAgcmVtb3ZlOwogCiAJaWYgKGxpc3RfZW1wdHkoJnNj aGVkdWxlci0+bm9kZV9xdWV1ZVtyaW5nLT5pZF0pKQpAQCAtNTIxLDIzICs1NTgsOCBAQCBzdGF0 aWMgaW50IGk5MTVfc2NoZWR1bGVyX3JlbW92ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n KQogCQlub2RlID0gbGlzdF9maXJzdF9lbnRyeSgmcmVtb3ZlLCB0eXBlb2YoKm5vZGUpLCBsaW5r KTsKIAkJbGlzdF9kZWwoJm5vZGUtPmxpbmspOwogCi0JCS8qCi0JCSAqIFRoZSBiYXRjaCBidWZm ZXIgbXVzdCBiZSB1bnBpbm5lZCBiZWZvcmUgaXQgaXMgdW5yZWZlcmVuY2VkCi0JCSAqIG90aGVy d2lzZSB0aGUgdW5waW4gZmFpbHMgd2l0aCBhIG1pc3Npbmcgdm1hIT8KLQkJICovCi0JCWlmIChu b2RlLT5wYXJhbXMuZGlzcGF0Y2hfZmxhZ3MgJiBJOTE1X0RJU1BBVENIX1NFQ1VSRSkKLQkJCWk5 MTVfZ2VtX2V4ZWNidWZmX3JlbGVhc2VfYmF0Y2hfb2JqKG5vZGUtPnBhcmFtcy5iYXRjaF9vYmop OwotCi0JCS8qIFJlbGVhc2UgdGhlIGxvY2tlZCBidWZmZXJzOiAqLwotCQlmb3IgKGkgPSAwOyBp IDwgbm9kZS0+bnVtX29ianM7IGkrKykgewotCQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2Uo Ci0JCQkJCSAgICAmbm9kZS0+c2F2ZWRfb2JqZWN0c1tpXS5vYmotPmJhc2UpOwotCQl9Ci0JCWtm cmVlKG5vZGUtPnNhdmVkX29iamVjdHMpOwotCi0JCS8qIENvbnRleHQgdG9vOiAqLwotCQlpZiAo bm9kZS0+cGFyYW1zLmN0eCkKLQkJCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2Uobm9kZS0+ cGFyYW1zLmN0eCk7CisJCS8qIEZyZWUgdXAgYWxsIHRoZSBEUk0gb2JqZWN0IHJlZmVyZW5jZXMg Ki8KKwkJaTkxNV9nZW1fc2NoZWR1bGVyX2NsZWFuX25vZGUobm9kZSk7CiAKIAkJLyogQW5kIGFu eXRoaW5nIGVsc2Ugb3duZWQgYnkgdGhlIG5vZGU6ICovCiAJCW5vZGUtPnBhcmFtcy5yZXF1ZXN0 LT5zY2hlZHVsZXJfcWUgPSBOVUxMOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9zY2hlZHVsZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmgK aW5kZXggNTZmNjhlNS4uNTRkODdmYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9zY2hlZHVsZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxl ci5oCkBAIC04OCw2ICs4OCw3IEBAIGJvb2wgICAgICAgIGk5MTVfc2NoZWR1bGVyX2lzX2VuYWJs ZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgICAgICAgICBpOTE1X3NjaGVkdWxlcl9p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50ICAgICAgICAgaTkxNV9zY2hlZHVsZXJf Y2xvc2VmaWxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICAgICBzdHJ1Y3QgZHJtX2Zp bGUgKmZpbGUpOwordm9pZCAgICAgICAgaTkxNV9nZW1fc2NoZWR1bGVyX2NsZWFuX25vZGUoc3Ry dWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpub2RlKTsKIGludCAgICAgICAgIGk5MTVf c2NoZWR1bGVyX3F1ZXVlX2V4ZWNidWZmZXIoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2Vu dHJ5ICpxZSk7CiBib29sICAgICAgICBpOTE1X3NjaGVkdWxlcl9ub3RpZnlfcmVxdWVzdChzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSk7CiB2b2lkICAgICAgICBpOTE1X3NjaGVkdWxl cl93YWtldXAoc3RydWN0IGRybV9kZXZpY2UgKmRldik7Ci0tIAoxLjkuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK