From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 51/62] drm/i915: Move request list retirement to i915_gem_request.c Date: Fri, 3 Jun 2016 17:37:16 +0100 Message-ID: <1464971847-15809-52-git-send-email-chris@chris-wilson.co.uk> References: <1464971847-15809-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 635B66EE38 for ; Fri, 3 Jun 2016 16:38:23 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id a136so632525wme.0 for ; Fri, 03 Jun 2016 09:38:23 -0700 (PDT) In-Reply-To: <1464971847-15809-1-git-send-email-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 QXMgdGhlIGxpc3QgcmV0aXJlbWVudCBpcyBub3cgY2xlYW4gb2YgaW1wbGVtZW50YXRpb24gZGV0 YWlscywgd2UgY2FuCm1vdmUgaXQgY2xvc2VyIHRvIHRoZSByZXF1ZXN0IG1hbmFnZW1lbnQuCgpT aWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCA0MSAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3Jl cXVlc3QuYyB8IDMzICsrKysrKysrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQs IDMzIGluc2VydGlvbnMoKyksIDQxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j CmluZGV4IDNiM2EzYjgzNGU4MC4uMjBlMTc0ZjdmYzllIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMKQEAgLTIyNjgsNDcgKzIyNjgsNiBAQCB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJaTkxNV9nZW1fcmVzdG9yZV9mZW5jZXMoZGV2KTsKIH0KIAotLyoqCi0g KiBUaGlzIGZ1bmN0aW9uIGNsZWFycyB0aGUgcmVxdWVzdCBsaXN0IGFzIHNlcXVlbmNlIG51bWJl cnMgYXJlIHBhc3NlZC4KLSAqLwotdm9pZAotaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3Jpbmco c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQotewotCXdoaWxlICghbGlzdF9lbXB0eSgm ZW5naW5lLT5yZXF1ZXN0X2xpc3QpKSB7Ci0JCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxdWVzdDsKLQotCQlyZXF1ZXN0ID0gbGlzdF9maXJzdF9lbnRyeSgmZW5naW5lLT5yZXF1ZXN0 X2xpc3QsCi0JCQkJCSAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCwKLQkJCQkJICAgbGlu ayk7Ci0KLQkJaWYgKCFpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXF1ZXN0KSkKLQkJCWJy ZWFrOwotCi0JCWk5MTVfZ2VtX3JlcXVlc3RfcmV0aXJlX3VwdG8ocmVxdWVzdCk7Ci0JfQotfQot Ci12b2lkIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCi17Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwotCi0JaWYgKGRl dl9wcml2LT5ndC5hY3RpdmVfZW5naW5lcyA9PSAwKQotCQlyZXR1cm47Ci0KLQlHRU1fQlVHX09O KCFkZXZfcHJpdi0+Z3QuYXdha2UpOwotCi0JZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3By aXYpIHsKLQkJaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3JpbmcoZW5naW5lKTsKLQkJaWYgKGxp c3RfZW1wdHkoJmVuZ2luZS0+cmVxdWVzdF9saXN0KSkKLQkJCWRldl9wcml2LT5ndC5hY3RpdmVf ZW5naW5lcyAmPSB+aW50ZWxfZW5naW5lX2ZsYWcoZW5naW5lKTsKLQl9Ci0KLQlpZiAoZGV2X3By aXYtPmd0LmFjdGl2ZV9lbmdpbmVzID09IDApCi0JCXF1ZXVlX2RlbGF5ZWRfd29yayhkZXZfcHJp di0+d3EsCi0JCQkJICAgJmRldl9wcml2LT5ndC5pZGxlX3dvcmssCi0JCQkJICAgbXNlY3NfdG9f amlmZmllcygxMDApKTsKLX0KLQogc3RhdGljIHZvaWQKIGk5MTVfZ2VtX3JldGlyZV93b3JrX2hh bmRsZXIoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fcmVxdWVzdC5jCmluZGV4IDJlMTM5MzQwNDFmMy4uMzhlNWRhZWNkOGY1IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCkBAIC03MzMsMyArNzMzLDM2IEBAIGlu dCBpOTE1X3dhaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAog CXJldHVybiAwOwogfQorCit2b2lkIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0c19yaW5nKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVl c3QgKnJlcXVlc3QsICpuZXh0OworCisJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHJlcXVlc3Qs IG5leHQsICZlbmdpbmUtPnJlcXVlc3RfbGlzdCwgbGluaykgeworCQlpZiAoIWk5MTVfZ2VtX3Jl cXVlc3RfY29tcGxldGVkKHJlcXVlc3QpKQorCQkJYnJlYWs7CisKKwkJaTkxNV9nZW1fcmVxdWVz dF9yZXRpcmUocmVxdWVzdCk7CisJfQorfQorCit2b2lkIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0 cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lOworCisJaWYgKGRldl9wcml2LT5ndC5hY3RpdmVfZW5naW5lcyA9PSAw KQorCQlyZXR1cm47CisKKwlHRU1fQlVHX09OKCFkZXZfcHJpdi0+Z3QuYXdha2UpOworCisJZm9y X2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYpIHsKKwkJaTkxNV9nZW1fcmV0aXJlX3JlcXVl c3RzX3JpbmcoZW5naW5lKTsKKwkJaWYgKGxpc3RfZW1wdHkoJmVuZ2luZS0+cmVxdWVzdF9saXN0 KSkKKwkJCWRldl9wcml2LT5ndC5hY3RpdmVfZW5naW5lcyAmPSB+aW50ZWxfZW5naW5lX2ZsYWco ZW5naW5lKTsKKwl9CisKKwlpZiAoZGV2X3ByaXYtPmd0LmFjdGl2ZV9lbmdpbmVzID09IDApCisJ CXF1ZXVlX2RlbGF5ZWRfd29yayhkZXZfcHJpdi0+d3EsCisJCQkJICAgJmRldl9wcml2LT5ndC5p ZGxlX3dvcmssCisJCQkJICAgbXNlY3NfdG9famlmZmllcygxMDApKTsKK30KLS0gCjIuOC4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK