From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH] drm/i915: Be more careful to drop the GT wakeref Date: Tue, 15 Nov 2016 14:31:52 +0000 Message-ID: <20161115143152.9204-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 C5C286E5B0 for ; Tue, 15 Nov 2016 14:31:55 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id u144so429508wmu.0 for ; Tue, 15 Nov 2016 06:31:55 -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 ZXRpcmVfcmVxdWVzdHMKZXZlbiB0aG91Z2ggd2UgZGlkIG5vIHdvcmsuCgpGaXhlczogMjgxNzZl ZjRjZmE1ICgiZHJtL2k5MTU6IFJlc2VydmUgc3BhY2UgaW4gdGhlIGdsb2JhbCBzZXFubyBkdXJp bmcgcmVxdWVzdCBhbGxvY2F0aW9uIikKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBKb29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5l bkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVx dWVzdC5jIHwgMTYgKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9u cygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9yZXF1ZXN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0 LmMKaW5kZXggYjliNTI1M2NmM2NkLi5hZTRkNmUwODAwMDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9yZXF1ZXN0LmMKQEAgLTIxOCw3ICsyMTgsMTAgQEAgc3RhdGljIHZvaWQgaTkx NV9nZW1fcmVxdWVzdF9yZXRpcmUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0 KQogCSAqLwogCWxpc3RfZGVsKCZyZXF1ZXN0LT5yaW5nX2xpbmspOwogCXJlcXVlc3QtPnJpbmct Pmxhc3RfcmV0aXJlZF9oZWFkID0gcmVxdWVzdC0+cG9zdGZpeDsKLQlyZXF1ZXN0LT5pOTE1LT5n dC5hY3RpdmVfcmVxdWVzdHMtLTsKKwlpZiAoIS0tcmVxdWVzdC0+aTkxNS0+Z3QuYWN0aXZlX3Jl cXVlc3RzKQorCQltb2RfZGVsYXllZF93b3JrKHJlcXVlc3QtPmk5MTUtPndxLAorCQkJCSAmcmVx dWVzdC0+aTkxNS0+Z3QuaWRsZV93b3JrLAorCQkJCSBtc2Vjc190b19qaWZmaWVzKDEwMCkpOwog CiAJLyogV2FsayB0aHJvdWdoIHRoZSBhY3RpdmUgbGlzdCwgY2FsbGluZyByZXRpcmUgb24gZWFj aC4gVGhpcyBhbGxvd3MKIAkgKiBvYmplY3RzIHRvIHRyYWNrIHRoZWlyIEdQVSBhY3Rpdml0eSBh bmQgbWFyayB0aGVtc2VsdmVzIGFzIGlkbGUKQEAgLTc2Myw2ICs3NjYsOCBAQCBzdGF0aWMgdm9p ZCBpOTE1X2dlbV9tYXJrX2J1c3koY29uc3Qgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQogCWlmIChkZXZfcHJpdi0+Z3QuYXdha2UpCiAJCXJldHVybjsKIAorCUdFTV9CVUdfT04oIWRl dl9wcml2LT5ndC5hY3RpdmVfcmVxdWVzdHMpOworCiAJaW50ZWxfcnVudGltZV9wbV9nZXRfbm9y ZXN1bWUoZGV2X3ByaXYpOwogCWRldl9wcml2LT5ndC5hd2FrZSA9IHRydWU7CiAKQEAgLTExNDMs MTYgKzExNDgsOSBAQCB2b2lkIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlsb2NrZGVwX2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+ ZHJtLnN0cnVjdF9tdXRleCk7CiAKLQlpZiAoIWRldl9wcml2LT5ndC5hY3RpdmVfcmVxdWVzdHMp CisJaWYgKCFkZXZfcHJpdi0+Z3QuYXdha2UpCiAJCXJldHVybjsKIAotCUdFTV9CVUdfT04oIWRl dl9wcml2LT5ndC5hd2FrZSk7Ci0KIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwg aWQpCiAJCWVuZ2luZV9yZXRpcmVfcmVxdWVzdHMoZW5naW5lKTsKLQotCWlmICghZGV2X3ByaXYt Pmd0LmFjdGl2ZV9yZXF1ZXN0cykKLQkJbW9kX2RlbGF5ZWRfd29yayhkZXZfcHJpdi0+d3EsCi0J CQkJICZkZXZfcHJpdi0+Z3QuaWRsZV93b3JrLAotCQkJCSBtc2Vjc190b19qaWZmaWVzKDEwMCkp OwogfQotLSAKMi4xMC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK