From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v5] drm/i915: Be more careful to drop the GT wakeref Date: Tue, 15 Nov 2016 16:46:20 +0000 Message-ID: <20161115164620.17185-1-chris@chris-wilson.co.uk> References: <20161115142646.5949-1-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-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id C428A898B7 for ; Tue, 15 Nov 2016 16:46:23 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id a20so1761139wme.2 for ; Tue, 15 Nov 2016 08:46:23 -0800 (PST) In-Reply-To: <20161115142646.5949-1-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 U2luY2Ugd2UgY2FuIHJldGlyZSByZXF1ZXN0cyBmcm9tIG11bHRpcGxlIHBhdGhzLCB3ZSBjYW5u b3QgYXNzdW1lIHRoYXQKaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzKCkgaXMgdGhlIHNvbGUgcGF0 aCBvbiB3aGljaCB3ZSBjYW4gdHJhbnNpdGlvbgp0byBndC5hY3RpdmVfcmVxdWVzdHMgPT0gMC4g QSBjb25zZXF1ZW5jZSBvZiB0aGlzIGlzIHRoYXQgd2Ugd291bGQgc2tpcAp0aGUgZnVuY3Rpb24g aWYgd2UgaGFkIGFscmVhZHkgcmV0aXJlZCBhbGwgdGhlIHJlcXVlc3RzIGFuZCBub3QKc2NoZWR1 bGVkIHRoZSBpZGxlIHdvcmtlci4KClRoaXMgaXMgZmFsbG91dCBmcm9tIGNoYW5naW5nIHRoZSBy b3V0aW5lIGZyb20gY29uc2lkZXJpbmcgYWN0aXZlX2VuZ2luZXMKKG92ZXIgd2hpY2ggaXQgd2Fz IHRoZSBvbmx5IGNvbnN1bWVyKSB0byBhY3RpdmVfcmVxdWVzdHMuCgp2MjogTW92ZSBraWNraW5n IHRoZSBpZGxlIHdvcmtpbmcgdG8gaTkxNV9nZW1fcmVxdWVzdF9yZXRpcmUoKSBvdGhlcndpc2UK d2UgY291bGQgcG9zdHBvbmUgdGhlIGlkbGUgY2FsbGJhY2sgZXZlcnl0aW1lIHdlIGNhbGxlZCBy ZXRpcmVfcmVxdWVzdHMKZXZlbiB0aG91Z2ggd2UgZGlkIG5vIHdvcmsuCnYzOiBXZSBvbmx5IG5l ZWQgdG8gbW92ZSB0aGUgaWRsZSB3b3JrIGtpY2tpbmchCnY0OiBEcm9wIHRoZSBCVUdfT04oIWF3 YWtlKSBhcyB3ZSBtYXkgYmUgY2FsbGVkIGZyb20gdGhlIHNocmlua2VyIGluIHRoZQptaWRkbGUg b2YgY29uc3RydWN0aW5nIGEgcmVxdWVzdCBiZWZvcmUgd2UgaGF2ZSBtYXJrZWQgdGhlIGRldmlj ZSBhd2FrZS4KCkZpeGVzOiAyODE3NmVmNGNmYTUgKCJkcm0vaTkxNTogUmVzZXJ2ZSBzcGFjZSBp biB0aGUgZ2xvYmFsIHNlcW5vIGR1cmluZyByZXF1ZXN0IGFsbG9jYXRpb24iKQpTaWduZWQtb2Zm LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IEpvb25hcyBM YWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMgfCAxNiArKysrKysrKy0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwppbmRleCBiOWI1MjUzY2YzY2QuLmMyMjdiY2EzMDM1 NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwpAQCAtMjE4LDcgKzIx OCwxMiBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X3JldGlyZShzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJICovCiAJbGlzdF9kZWwoJnJlcXVlc3QtPnJpbmdf bGluayk7CiAJcmVxdWVzdC0+cmluZy0+bGFzdF9yZXRpcmVkX2hlYWQgPSByZXF1ZXN0LT5wb3N0 Zml4OwotCXJlcXVlc3QtPmk5MTUtPmd0LmFjdGl2ZV9yZXF1ZXN0cy0tOworCWlmICghLS1yZXF1 ZXN0LT5pOTE1LT5ndC5hY3RpdmVfcmVxdWVzdHMpIHsKKwkJR0VNX0JVR19PTighcmVxdWVzdC0+ aTkxNS0+Z3QuYXdha2UpOworCQltb2RfZGVsYXllZF93b3JrKHJlcXVlc3QtPmk5MTUtPndxLAor CQkJCSAmcmVxdWVzdC0+aTkxNS0+Z3QuaWRsZV93b3JrLAorCQkJCSBtc2Vjc190b19qaWZmaWVz KDEwMCkpOworCX0KIAogCS8qIFdhbGsgdGhyb3VnaCB0aGUgYWN0aXZlIGxpc3QsIGNhbGxpbmcg cmV0aXJlIG9uIGVhY2guIFRoaXMgYWxsb3dzCiAJICogb2JqZWN0cyB0byB0cmFjayB0aGVpciBH UFUgYWN0aXZpdHkgYW5kIG1hcmsgdGhlbXNlbHZlcyBhcyBpZGxlCkBAIC03NjMsNiArNzY4LDgg QEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fbWFya19idXN5KGNvbnN0IHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKIAlpZiAoZGV2X3ByaXYtPmd0LmF3YWtlKQogCQlyZXR1cm47CiAKKwlH RU1fQlVHX09OKCFkZXZfcHJpdi0+Z3QuYWN0aXZlX3JlcXVlc3RzKTsKKwogCWludGVsX3J1bnRp bWVfcG1fZ2V0X25vcmVzdW1lKGRldl9wcml2KTsKIAlkZXZfcHJpdi0+Z3QuYXdha2UgPSB0cnVl OwogCkBAIC0xMTQ2LDEzICsxMTUzLDYgQEAgdm9pZCBpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHMo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlmICghZGV2X3ByaXYtPmd0LmFj dGl2ZV9yZXF1ZXN0cykKIAkJcmV0dXJuOwogCi0JR0VNX0JVR19PTighZGV2X3ByaXYtPmd0LmF3 YWtlKTsKLQogCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkKIAkJZW5naW5l X3JldGlyZV9yZXF1ZXN0cyhlbmdpbmUpOwotCi0JaWYgKCFkZXZfcHJpdi0+Z3QuYWN0aXZlX3Jl cXVlc3RzKQotCQltb2RfZGVsYXllZF93b3JrKGRldl9wcml2LT53cSwKLQkJCQkgJmRldl9wcml2 LT5ndC5pZGxlX3dvcmssCi0JCQkJIG1zZWNzX3RvX2ppZmZpZXMoMTAwKSk7CiB9Ci0tIAoyLjEw LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=