From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v3] drm/i915: Be more careful to drop the GT wakeref Date: Tue, 15 Nov 2016 15:23:05 +0000 Message-ID: <20161115152305.9794-1-chris@chris-wilson.co.uk> References: <20161115143152.9204-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-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5DC0E6E5C0 for ; Tue, 15 Nov 2016 15:23:09 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id g23so925234wme.1 for ; Tue, 15 Nov 2016 07:23:09 -0800 (PST) In-Reply-To: <20161115143152.9204-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 ZWQgdG8gbW92ZSB0aGUgaWRsZSB3b3JrIGtpY2tpbmchCgpGaXhlczogMjgxNzZlZjRjZmE1ICgi ZHJtL2k5MTU6IFJlc2VydmUgc3BhY2UgaW4gdGhlIGdsb2JhbCBzZXFubyBkdXJpbmcgcmVxdWVz dCBhbGxvY2F0aW9uIikKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5p bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jIHwg MTQgKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDYgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVx dWVzdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCmluZGV4IGI5 YjUyNTNjZjNjZC4uYjJiOWUyM2Q1OTAyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9yZXF1ZXN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f cmVxdWVzdC5jCkBAIC0yMTgsNyArMjE4LDEyIEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3JlcXVl c3RfcmV0aXJlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAkgKi8KIAls aXN0X2RlbCgmcmVxdWVzdC0+cmluZ19saW5rKTsKIAlyZXF1ZXN0LT5yaW5nLT5sYXN0X3JldGly ZWRfaGVhZCA9IHJlcXVlc3QtPnBvc3RmaXg7Ci0JcmVxdWVzdC0+aTkxNS0+Z3QuYWN0aXZlX3Jl cXVlc3RzLS07CisJaWYgKCEtLXJlcXVlc3QtPmk5MTUtPmd0LmFjdGl2ZV9yZXF1ZXN0cykgewor CQlHRU1fQlVHX09OKCFkZXZfcHJpdi0+Z3QuYXdha2UpOworCQltb2RfZGVsYXllZF93b3JrKHJl cXVlc3QtPmk5MTUtPndxLAorCQkJCSAmcmVxdWVzdC0+aTkxNS0+Z3QuaWRsZV93b3JrLAorCQkJ CSBtc2Vjc190b19qaWZmaWVzKDEwMCkpOworCX0KIAogCS8qIFdhbGsgdGhyb3VnaCB0aGUgYWN0 aXZlIGxpc3QsIGNhbGxpbmcgcmV0aXJlIG9uIGVhY2guIFRoaXMgYWxsb3dzCiAJICogb2JqZWN0 cyB0byB0cmFjayB0aGVpciBHUFUgYWN0aXZpdHkgYW5kIG1hcmsgdGhlbXNlbHZlcyBhcyBpZGxl CkBAIC03NjMsNiArNzY4LDggQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fbWFya19idXN5KGNvbnN0 IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlpZiAoZGV2X3ByaXYtPmd0LmF3YWtl KQogCQlyZXR1cm47CiAKKwlHRU1fQlVHX09OKCFkZXZfcHJpdi0+Z3QuYWN0aXZlX3JlcXVlc3Rz KTsKKwogCWludGVsX3J1bnRpbWVfcG1fZ2V0X25vcmVzdW1lKGRldl9wcml2KTsKIAlkZXZfcHJp di0+Z3QuYXdha2UgPSB0cnVlOwogCkBAIC0xMTUwLDkgKzExNTcsNCBAQCB2b2lkIGk5MTVfZ2Vt X3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlm b3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpCiAJCWVuZ2luZV9yZXRpcmVfcmVx dWVzdHMoZW5naW5lKTsKLQotCWlmICghZGV2X3ByaXYtPmd0LmFjdGl2ZV9yZXF1ZXN0cykKLQkJ bW9kX2RlbGF5ZWRfd29yayhkZXZfcHJpdi0+d3EsCi0JCQkJICZkZXZfcHJpdi0+Z3QuaWRsZV93 b3JrLAotCQkJCSBtc2Vjc190b19qaWZmaWVzKDEwMCkpOwogfQotLSAKMi4xMC4yCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK