From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 8/9] drm/i915: Track the previous pinned context inside the request Date: Tue, 19 Apr 2016 07:49:19 +0100 Message-ID: <1461048560-31983-9-git-send-email-chris@chris-wilson.co.uk> References: <1460721275-1001-1-git-send-email-tvrtko.ursulin@linux.intel.com> <1461048560-31983-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 C6C9F6E6A7 for ; Tue, 19 Apr 2016 06:49:40 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id y144so2252318wmd.0 for ; Mon, 18 Apr 2016 23:49:40 -0700 (PDT) In-Reply-To: <1461048560-31983-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, Tvrtko Ursulin List-Id: intel-gfx@lists.freedesktop.org QXMgdGhlIGNvbnRleHRzIGFyZSBhY2Nlc3NlZCBieSB0aGUgaGFyZHdhcmUgdW50aWwgdGhlIHN3 aXRjaCBpcyBjb21wbGV0ZWQKdG8gYSBuZXcgY29udGV4dCwgdGhlIGhhcmR3YXJlIG1heSBzdGls bCBiZSB3cml0aW5nIHRvIHRoZSBjb250ZXh0IG9iamVjdAphZnRlciB0aGUgYnJlYWRjcnVtYiBp cyB2aXNpYmxlLiBXZSBtdXN0IG5vdCB1bnBpbi91bmJpbmQvcHJ1bmUgdGhhdApvYmplY3Qgd2hp bHN0IHN0aWxsIGFjdGl2ZSBhbmQgc28gd2Uga2VlcCB0aGUgcHJldmlvdXMgY29udGV4dCBwaW5u ZWQgdW50aWwKdGhlIGZvbGxvd2luZyByZXF1ZXN0LiBJZiB3ZSBtb3ZlIHRoaXMgdHJhY2tpbmcg b250byB0aGUgcmVxdWVzdCwgd2UgY2FuCnNpbXBsaWZ5IHRoZSBjb2RlIGFuZCBlbmFibGUgZnJl ZWluZyBvZiB0aGUgcmVxdWVzdCB3aXRob3V0IHRoZQpzdHJ1Y3RfbXV0ZXggaW4gc3Vic2VxdWVu dCBwYXRjaGVzLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxz b24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jIHwg IDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuaCB8IDEx ICsrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCAx MiArKysrKy0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgMTEgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVx dWVzdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCmluZGV4IDMz YWFjZjE3MjVkZC4uOGQ3YzQxNWYxODk2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9yZXF1ZXN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f cmVxdWVzdC5jCkBAIC02NDMsMTIgKzY0MywxMiBAQCB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfZnJl ZShzdHJ1Y3Qga3JlZiAqcmVxX3JlZikKIAlpZiAocmVxLT5maWxlX3ByaXYpCiAJCWk5MTVfZ2Vt X3JlcXVlc3RfcmVtb3ZlX2Zyb21fY2xpZW50KHJlcSk7CiAKLQlpZiAoY3R4KSB7CisJaWYgKHJl cS0+cGlubmVkX2NvbnRleHQpIHsKIAkJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykKLQkJCWlu dGVsX2xyX2NvbnRleHRfdW5waW4oY3R4LCByZXEtPmVuZ2luZSk7Ci0KLQkJaTkxNV9nZW1fY29u dGV4dF91bnJlZmVyZW5jZShjdHgpOworCQkJaW50ZWxfbHJfY29udGV4dF91bnBpbihyZXEtPnBp bm5lZF9jb250ZXh0LAorCQkJCQkgICAgICAgcmVxLT5lbmdpbmUpOwogCX0KIAorCWk5MTVfZ2Vt X2NvbnRleHRfdW5yZWZlcmVuY2UoY3R4KTsKIAlrbWVtX2NhY2hlX2ZyZWUodG9faTkxNShyZXEp LT5yZXF1ZXN0cywgcmVxKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX3JlcXVlc3QuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3Qu aAppbmRleCA2OWE0ZDRlMmM5N2IuLjM4OTgxM2NiYzE5YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3JlcXVlc3QuaApAQCAtODUsNiArODUsMTcgQEAgc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0IHsKIAlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4OwogCXN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmOwogCisJLyoqCisJICogQ29udGV4dCByZWxhdGVkIHRvIHRoZSBw cmV2aW91cyByZXF1ZXN0LgorCSAqIEFzIHRoZSBjb250ZXh0cyBhcmUgYWNjZXNzZWQgYnkgdGhl IGhhcmR3YXJlIHVudGlsIHRoZSBzd2l0Y2ggaXMKKwkgKiBjb21wbGV0ZWQgdG8gYSBuZXcgY29u dGV4dCwgdGhlIGhhcmR3YXJlIG1heSBzdGlsbCBiZSB3cml0aW5nCisJICogdG8gdGhlIGNvbnRl eHQgb2JqZWN0IGFmdGVyIHRoZSBicmVhZGNydW1iIGlzIHZpc2libGUuIFdlIG11c3QKKwkgKiBu b3QgdW5waW4vdW5iaW5kL3BydW5lIHRoYXQgb2JqZWN0IHdoaWxzdCBzdGlsbCBhY3RpdmUgYW5k IHNvCisJICogd2Uga2VlcCB0aGUgcHJldmlvdXMgY29udGV4dCBwaW5uZWQgdW50aWwgdGhlIGZv bGxvd2luZyAodGhpcykKKwkgKiByZXF1ZXN0IGlzIHJldGlyZWQuCisJICovCisJc3RydWN0IGlu dGVsX2NvbnRleHQgKnBpbm5lZF9jb250ZXh0OworCiAJLyoqIEJhdGNoIGJ1ZmZlciByZWxhdGVk IHRvIHRoaXMgcmVxdWVzdCBpZiBhbnkgKHVzZWQgZm9yCiAJICAgIGVycm9yIHN0YXRlIGR1bXAg b25seSkgKi8KIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqYmF0Y2hfb2JqOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwppbmRleCBiMGQyMGFmMzg1NzQuLjBlNTVmMjA2ZTU5MiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTcwOCw2ICs3MDgsNyBAQCBpbnQgaW50ZWxfbG9naWNh bF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFzKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxdWVzdAogCQlyZXF1ZXN0LT5jdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5pbml0aWFsaXNlZCA9 IHRydWU7CiAJfQogCisJcmVxdWVzdC0+cGlubmVkX2NvbnRleHQgPSByZXF1ZXN0LT5jdHg7CiAJ cmV0dXJuIDA7CiB9CiAKQEAgLTc4MiwxMiArNzgzLDggQEAgaW50ZWxfbG9naWNhbF9yaW5nX2Fk dmFuY2VfYW5kX3N1Ym1pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJ aW50ZWxfbG9naWNhbF9yaW5nX2VtaXQocmluZ2J1ZiwgTUlfTk9PUCk7CiAJaW50ZWxfbG9naWNh bF9yaW5nX2FkdmFuY2UocmluZ2J1Zik7CiAKLQlpZiAoZW5naW5lLT5sYXN0X2NvbnRleHQgIT0g cmVxdWVzdC0+Y3R4KSB7Ci0JCWlmIChlbmdpbmUtPmxhc3RfY29udGV4dCkKLQkJCWludGVsX2xy X2NvbnRleHRfdW5waW4oZW5naW5lLT5sYXN0X2NvbnRleHQsIGVuZ2luZSk7Ci0JCWludGVsX2xy X2NvbnRleHRfcGluKHJlcXVlc3QtPmN0eCwgZW5naW5lKTsKLQkJZW5naW5lLT5sYXN0X2NvbnRl eHQgPSByZXF1ZXN0LT5jdHg7Ci0JfQorCXJlcXVlc3QtPnBpbm5lZF9jb250ZXh0ID0gZW5naW5l LT5sYXN0X2NvbnRleHQ7CisJZW5naW5lLT5sYXN0X2NvbnRleHQgPSByZXF1ZXN0LT5jdHg7CiAK IAlpZiAoZGV2X3ByaXYtPmd1Yy5leGVjYnVmX2NsaWVudCkKIAkJaTkxNV9ndWNfc3VibWl0KGRl dl9wcml2LT5ndWMuZXhlY2J1Zl9jbGllbnQsIHJlcXVlc3QpOwpAQCAtMTAwOSw3ICsxMDA2LDgg QEAgdm9pZCBpbnRlbF9leGVjbGlzdHNfcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKIAlzcGluX3VubG9ja19iaCgmZW5naW5lLT5leGVjbGlzdF9sb2NrKTsK IAogCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShyZXEsIHRtcCwgJnJldGlyZWRfbGlzdCwgZXhl Y2xpc3RfbGluaykgewotCQlpbnRlbF9scl9jb250ZXh0X3VucGluKHJlcS0+Y3R4LCBlbmdpbmUp OworCQlpZiAocmVxLT5waW5uZWRfY29udGV4dCkKKwkJCWludGVsX2xyX2NvbnRleHRfdW5waW4o cmVxLT5waW5uZWRfY29udGV4dCwgZW5naW5lKTsKIAogCQlsaXN0X2RlbCgmcmVxLT5leGVjbGlz dF9saW5rKTsKIAkJaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZShyZXEpOwotLSAKMi44LjAu cmMzCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK