From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v4] drm/i915: Be more careful to drop the GT wakeref Date: Tue, 15 Nov 2016 15:24:42 +0000 Message-ID: <20161115152442.15719-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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE3306E5C1 for ; Tue, 15 Nov 2016 15:24:45 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id a20so924593wme.2 for ; Tue, 15 Nov 2016 07:24:45 -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 YjUyNTNjZjNjZC4uYWQ2MDU3ZGM0OTVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9yZXF1ZXN0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f cmVxdWVzdC5jCkBAIC0yMTgsNyArMjE4LDEyIEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3JlcXVl c3RfcmV0aXJlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAkgKi8KIAls aXN0X2RlbCgmcmVxdWVzdC0+cmluZ19saW5rKTsKIAlyZXF1ZXN0LT5yaW5nLT5sYXN0X3JldGly ZWRfaGVhZCA9IHJlcXVlc3QtPnBvc3RmaXg7Ci0JcmVxdWVzdC0+aTkxNS0+Z3QuYWN0aXZlX3Jl cXVlc3RzLS07CisJaWYgKCEtLXJlcXVlc3QtPmk5MTUtPmd0LmFjdGl2ZV9yZXF1ZXN0cykgewor CQlHRU1fQlVHX09OKCFyZXF1ZXN0LT5pOTE1LT5ndC5hd2FrZSk7CisJCW1vZF9kZWxheWVkX3dv cmsocmVxdWVzdC0+aTkxNS0+d3EsCisJCQkJICZyZXF1ZXN0LT5pOTE1LT5ndC5pZGxlX3dvcmss CisJCQkJIG1zZWNzX3RvX2ppZmZpZXMoMTAwKSk7CisJfQogCiAJLyogV2FsayB0aHJvdWdoIHRo ZSBhY3RpdmUgbGlzdCwgY2FsbGluZyByZXRpcmUgb24gZWFjaC4gVGhpcyBhbGxvd3MKIAkgKiBv YmplY3RzIHRvIHRyYWNrIHRoZWlyIEdQVSBhY3Rpdml0eSBhbmQgbWFyayB0aGVtc2VsdmVzIGFz IGlkbGUKQEAgLTc2Myw2ICs3NjgsOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9tYXJrX2J1c3ko Y29uc3Qgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCWlmIChkZXZfcHJpdi0+Z3Qu YXdha2UpCiAJCXJldHVybjsKIAorCUdFTV9CVUdfT04oIWRldl9wcml2LT5ndC5hY3RpdmVfcmVx dWVzdHMpOworCiAJaW50ZWxfcnVudGltZV9wbV9nZXRfbm9yZXN1bWUoZGV2X3ByaXYpOwogCWRl dl9wcml2LT5ndC5hd2FrZSA9IHRydWU7CiAKQEAgLTExNTAsOSArMTE1Nyw0IEBAIHZvaWQgaTkx NV9nZW1fcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAogCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkKIAkJZW5naW5lX3JldGly ZV9yZXF1ZXN0cyhlbmdpbmUpOwotCi0JaWYgKCFkZXZfcHJpdi0+Z3QuYWN0aXZlX3JlcXVlc3Rz KQotCQltb2RfZGVsYXllZF93b3JrKGRldl9wcml2LT53cSwKLQkJCQkgJmRldl9wcml2LT5ndC5p ZGxlX3dvcmssCi0JCQkJIG1zZWNzX3RvX2ppZmZpZXMoMTAwKSk7CiB9Ci0tIAoyLjEwLjIKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=