From mboxrd@z Thu Jan  1 00:00:00 1970
From: John.C.Harrison@Intel.com
Subject: [RFC 17/39] drm/i915: Hook scheduler node clean up into
	retire requests
Date: Fri, 17 Jul 2015 15:33:26 +0100
Message-ID: <1437143628-6329-18-git-send-email-John.C.Harrison@Intel.com>
References: <1437143628-6329-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 090CE6E4E6
 for <Intel-GFX@lists.freedesktop.org>; Fri, 17 Jul 2015 07:34:11 -0700 (PDT)
In-Reply-To: <1437143628-6329-1-git-send-email-John.C.Harrison@Intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
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
X2dlbS5jCmluZGV4IDc3YTNiMjcuLmNiNWFmNWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpA
QCAtMTQwNSw2ICsxNDA1LDkgQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9yZXRpcmUo
c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCWlmICghbGlzdF9lbXB0eSgm
cmVxdWVzdC0+c2lnbmFsX2xpc3QpKQogCQlyZXF1ZXN0LT5jYW5jZWxsZWQgPSB0cnVlOwogCisJ
aWYgKHJlcXVlc3QtPnNjaGVkdWxlcl9xZSkKKwkJaTkxNV9nZW1fc2NoZWR1bGVyX2NsZWFuX25v
ZGUocmVxdWVzdC0+c2NoZWR1bGVyX3FlKTsKKwogCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVu
Y2UocmVxdWVzdCk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
c2NoZWR1bGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCmluZGV4
IGY1ZmE5NjguLmRmMmUyN2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf
c2NoZWR1bGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuYwpA
QCAtNDMyLDYgKzQzMiwzOCBAQCBpbnQgaTkxNV9zY2hlZHVsZXJfaGFuZGxlX2lycShzdHJ1Y3Qg
aW50ZWxfZW5naW5lX2NzICpyaW5nKQogCXJldHVybiAwOwogfQogCit2b2lkIGk5MTVfZ2VtX3Nj
aGVkdWxlcl9jbGVhbl9ub2RlKHN0cnVjdCBpOTE1X3NjaGVkdWxlcl9xdWV1ZV9lbnRyeSAqbm9k
ZSkKK3sKKwl1aW50MzJfdCBpOworCisJaWYgKFdBUk5fT04oIUk5MTVfU1FTX0lTX0NPTVBMRVRF
KG5vZGUpKSkKKwkJcmV0dXJuOworCisJaWYgKG5vZGUtPnBhcmFtcy5iYXRjaF9vYmopIHsKKwkJ
LyogVGhlIGJhdGNoIGJ1ZmZlciBtdXN0IGJlIHVucGlubmVkIGJlZm9yZSBpdCBpcyB1bnJlZmVy
ZW5jZWQKKwkJICogb3RoZXJ3aXNlIHRoZSB1bnBpbiBmYWlscyB3aXRoIGEgbWlzc2luZyB2bWEh
PyAqLworCQlpZiAobm9kZS0+cGFyYW1zLmRpc3BhdGNoX2ZsYWdzICYgSTkxNV9ESVNQQVRDSF9T
RUNVUkUpCisJCQlpOTE1X2dlbV9leGVjYnVmZl9yZWxlYXNlX2JhdGNoX29iaihub2RlLT5wYXJh
bXMuYmF0Y2hfb2JqKTsKKworCQlub2RlLT5wYXJhbXMuYmF0Y2hfb2JqID0gTlVMTDsKKwl9CisK
KwkvKiBSZWxlYXNlIHRoZSBsb2NrZWQgYnVmZmVyczogKi8KKwlmb3IgKGkgPSAwOyBpIDwgbm9k
ZS0+bnVtX29ianM7IGkrKykgeworCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgKKwkJCQkg
ICAgJm5vZGUtPnNhdmVkX29iamVjdHNbaV0ub2JqLT5iYXNlKTsKKwl9CisJa2ZyZWUobm9kZS0+
c2F2ZWRfb2JqZWN0cyk7CisJbm9kZS0+c2F2ZWRfb2JqZWN0cyA9IE5VTEw7CisJbm9kZS0+bnVt
X29ianMgPSAwOworCisJLyogQ29udGV4dCB0b286ICovCisJaWYgKG5vZGUtPnBhcmFtcy5jdHgp
IHsKKwkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShub2RlLT5wYXJhbXMuY3R4KTsKKwkJ
bm9kZS0+cGFyYW1zLmN0eCA9IE5VTEw7CisJfQorfQorCiBzdGF0aWMgaW50IGk5MTVfc2NoZWR1
bGVyX3JlbW92ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewogCXN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ZGV2X3ByaXZhdGU7CkBAIC00NDEs
NyArNDczLDcgQEAgc3RhdGljIGludCBpOTE1X3NjaGVkdWxlcl9yZW1vdmUoc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqcmluZykKIAlpbnQgICAgICAgICAgICAgICAgIGZseWluZyA9IDAsIHF1ZXVl
ZCA9IDA7CiAJaW50ICAgICAgICAgICAgICAgICByZXQgPSAwOwogCWJvb2wgICAgICAgICAgICAg
ICAgZG9fc3VibWl0OwotCXVpbnQzMl90ICAgICAgICAgICAgaSwgbWluX3NlcW5vOworCXVpbnQz
Ml90ICAgICAgICAgICAgbWluX3NlcW5vOwogCXN0cnVjdCBsaXN0X2hlYWQgICAgcmVtb3ZlOwog
CiAJaWYgKGxpc3RfZW1wdHkoJnNjaGVkdWxlci0+bm9kZV9xdWV1ZVtyaW5nLT5pZF0pKQpAQCAt
NTM1LDIxICs1NjcsOCBAQCBzdGF0aWMgaW50IGk5MTVfc2NoZWR1bGVyX3JlbW92ZShzdHJ1Y3Qg
aW50ZWxfZW5naW5lX2NzICpyaW5nKQogCQlub2RlID0gbGlzdF9maXJzdF9lbnRyeSgmcmVtb3Zl
LCB0eXBlb2YoKm5vZGUpLCBsaW5rKTsKIAkJbGlzdF9kZWwoJm5vZGUtPmxpbmspOwogCi0JCS8q
IFRoZSBiYXRjaCBidWZmZXIgbXVzdCBiZSB1bnBpbm5lZCBiZWZvcmUgaXQgaXMgdW5yZWZlcmVu
Y2VkCi0JCSAqIG90aGVyd2lzZSB0aGUgdW5waW4gZmFpbHMgd2l0aCBhIG1pc3Npbmcgdm1hIT8g
Ki8KLQkJaWYgKG5vZGUtPnBhcmFtcy5kaXNwYXRjaF9mbGFncyAmIEk5MTVfRElTUEFUQ0hfU0VD
VVJFKQotCQkJaTkxNV9nZW1fZXhlY2J1ZmZfcmVsZWFzZV9iYXRjaF9vYmoobm9kZS0+cGFyYW1z
LmJhdGNoX29iaik7Ci0KLQkJLyogUmVsZWFzZSB0aGUgbG9ja2VkIGJ1ZmZlcnM6ICovCi0JCWZv
ciAoaSA9IDA7IGkgPCBub2RlLT5udW1fb2JqczsgaSsrKSB7Ci0JCQlkcm1fZ2VtX29iamVjdF91
bnJlZmVyZW5jZSgKLQkJCQkJICAgICZub2RlLT5zYXZlZF9vYmplY3RzW2ldLm9iai0+YmFzZSk7
Ci0JCX0KLQkJa2ZyZWUobm9kZS0+c2F2ZWRfb2JqZWN0cyk7Ci0KLQkJLyogQ29udGV4dCB0b286
ICovCi0JCWlmIChub2RlLT5wYXJhbXMuY3R4KQotCQkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVy
ZW5jZShub2RlLT5wYXJhbXMuY3R4KTsKKwkJLyogRnJlZSB1cCBhbGwgdGhlIERSTSBvYmplY3Qg
cmVmZXJlbmNlcyAqLworCQlpOTE1X2dlbV9zY2hlZHVsZXJfY2xlYW5fbm9kZShub2RlKTsKIAog
CQkvKiBBbmQgYW55dGhpbmcgZWxzZSBvd25lZCBieSB0aGUgbm9kZTogKi8KIAkJbm9kZS0+cGFy
YW1zLnJlcXVlc3QtPnNjaGVkdWxlcl9xZSA9IE5VTEw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9z
Y2hlZHVsZXIuaAppbmRleCAxNTg3OGE0Li43M2M1ZTdkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfc2NoZWR1bGVyLmgKQEAgLTg4LDYgKzg4LDcgQEAgYm9vbCAgICAgICAgaTkxNV9zY2hlZHVs
ZXJfaXNfZW5hYmxlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCAgICAgICAgIGk5MTVf
c2NoZWR1bGVyX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgICAgICAgICBpOTE1
X3NjaGVkdWxlcl9jbG9zZWZpbGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgICAgIHN0
cnVjdCBkcm1fZmlsZSAqZmlsZSk7Cit2b2lkICAgICAgICBpOTE1X2dlbV9zY2hlZHVsZXJfY2xl
YW5fbm9kZShzdHJ1Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVfZW50cnkgKm5vZGUpOwogaW50ICAg
ICAgICAgaTkxNV9zY2hlZHVsZXJfcXVldWVfZXhlY2J1ZmZlcihzdHJ1Y3QgaTkxNV9zY2hlZHVs
ZXJfcXVldWVfZW50cnkgKnFlKTsKIGludCAgICAgICAgIGk5MTVfc2NoZWR1bGVyX2hhbmRsZV9p
cnEoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiB2b2lkICAgICAgICBpOTE1X2dlbV9z
Y2hlZHVsZXJfd29ya19oYW5kbGVyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yayk7Ci0tIAoxLjku
MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt
Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s
aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK