From: Damien Lespiau Subject: [PATCH 6/7] drm/i915/skl: Use correct use counters for force wakes Date: Thu, 13 Nov 2014 17:51:51 +0000 Message-ID: <1415901112-7233-7-git-send-email-damien.lespiau@intel.com> References: <1415901112-7233-1-git-send-email-damien.lespiau@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 101FF6EBDA for ; Thu, 13 Nov 2014 09:52:02 -0800 (PST) In-Reply-To: <1415901112-7233-1-git-send-email-damien.lespiau@intel.com> 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldyaXRlIGFu ZCByZWFkcyBmb2xsb3dpbmcgdGhlIGJsb2NrIGNoYW5nZWQgdXNlIGVuZ2luZSBzcGVjaWZpYyB1 c2UgY291bnRlcnMKYW5kIHVubGVzcyB0aGF0IGlzIG1hdGNoZWQgaGVyZSBmb3JjZSB3YWtlIHVz ZSBjb3VudGluZyBnb2VzIGJhZC4gU2FtZQpmb3JjZSB3YWtlIGlzIGF0dGVtcHRlZCB0byBiZSB0 YWtlbiB0d2ljZSB3aGljaCBsZWFkcyB0byBhdCBsZWFzdCB0aW1lIG91dHMuCgpOT1RFOiBEZXBl bmRpbmcgb24gZmVlZGJhY2sgZnJvbSBoYXJkd2FyZSBkZXNpZ25lcnMgaXQgbWF5IG5vdCBiZSBu ZWNlc3NhcnkKdG8gZ3JhYiBmb3JjZSB3YWtlcyBvbiBHZW45IGhlcmUuIEJ1dCBmb3IgR2VuOCBp dCBpcyBuZWVkZWQgZHVlIHRvIGEgcmFjZQpiZXR3ZWVuIFJDNiBhbmQgRUxTUCB3cml0ZXMuCgp2 MjogQWRkZWQgYmxpdHRlciBmb3JjZSB3YWtlIGVuZ2luZSBhbmQgbWFkZSBtb3JlIGZ1dHVyZSBw cm9vZi4KICAgIEFkZGVkIGNvbW1pdCBub3RlLgoKUmV2aWV3ZWQtYnk6IERhbWllbiBMZXNwaWF1 IDxkYW1pZW4ubGVzcGlhdUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGlu IDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBEYW1pZW4gTGVzcGlhdSA8ZGFtaWVuLmxl c3BpYXVAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYW1pZW4gTGVzcGlhdSA8ZGFtaWVuLmxl c3BpYXVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIHwg MTcgKysrKysrKysrKysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAz IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggYWYwYzE4YS4uMGVl ZTQyOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTI3Niw3ICsyNzYsOCBAQCBzdGF0 aWMgdm9pZCBleGVjbGlzdHNfZWxzcF93cml0ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n LAogCQkJCSBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iajAsCiAJCQkJIHN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqMSkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSByaW5nLT5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAl1aW50NjRfdCB0ZW1wID0gMDsKIAl1aW50MzJfdCBkZXNj WzRdOwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CkBAIC0zMDEsMTMgKzMwMiwxOCBAQCBzdGF0aWMg dm9pZCBleGVjbGlzdHNfZWxzcF93cml0ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAog CSAqIEluc3RlYWQsIHdlIGRvIHRoZSBydW50aW1lX3BtX2dldC9wdXQgd2hlbiBjcmVhdGluZy9k ZXN0cm95aW5nIHJlcXVlc3RzLgogCSAqLwogCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+ dW5jb3JlLmxvY2ssIGZsYWdzKTsKLQlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdi0+ZGV2KSkg eworCWlmIChJU19DSEVSUllWSUVXKGRldikgfHwgSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkg ewogCQlpZiAoZGV2X3ByaXYtPnVuY29yZS5md19yZW5kZXJjb3VudCsrID09IDApCiAJCQlkZXZf cHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfZ2V0KGRldl9wcml2LAogCQkJCQkJCSAgICAg IEZPUkNFV0FLRV9SRU5ERVIpOwogCQlpZiAoZGV2X3ByaXYtPnVuY29yZS5md19tZWRpYWNvdW50 KysgPT0gMCkKIAkJCWRldl9wcml2LT51bmNvcmUuZnVuY3MuZm9yY2Vfd2FrZV9nZXQoZGV2X3By aXYsCiAJCQkJCQkJICAgICAgRk9SQ0VXQUtFX01FRElBKTsKKwkJaWYgKElOVEVMX0lORk8oZGV2 KS0+Z2VuID49IDkpIHsKKwkJCWlmIChkZXZfcHJpdi0+dW5jb3JlLmZ3X2JsaXR0ZXJjb3VudCsr ID09IDApCisJCQkJZGV2X3ByaXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX2dldChkZXZfcHJp diwKKwkJCQkJCQlGT1JDRVdBS0VfQkxJVFRFUik7CisJCX0KIAl9IGVsc2UgewogCQlpZiAoZGV2 X3ByaXYtPnVuY29yZS5mb3JjZXdha2VfY291bnQrKyA9PSAwKQogCQkJZGV2X3ByaXYtPnVuY29y ZS5mdW5jcy5mb3JjZV93YWtlX2dldChkZXZfcHJpdiwKQEAgLTMyNiwxMyArMzMyLDE4IEBAIHN0 YXRpYyB2b2lkIGV4ZWNsaXN0c19lbHNwX3dyaXRlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcsCiAKIAkvKiBSZWxlYXNlIEZvcmNlIFdha2V1cCAoc2VlIHRoZSBiaWcgY29tbWVudCBhYm92 ZSkuICovCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgZmxhZ3Mp OwotCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2LT5kZXYpKSB7CisJaWYgKElTX0NIRVJSWVZJ RVcoZGV2KSB8fCBJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSB7CiAJCWlmICgtLWRldl9wcml2 LT51bmNvcmUuZndfcmVuZGVyY291bnQgPT0gMCkKIAkJCWRldl9wcml2LT51bmNvcmUuZnVuY3Mu Zm9yY2Vfd2FrZV9wdXQoZGV2X3ByaXYsCiAJCQkJCQkJICAgICAgRk9SQ0VXQUtFX1JFTkRFUik7 CiAJCWlmICgtLWRldl9wcml2LT51bmNvcmUuZndfbWVkaWFjb3VudCA9PSAwKQogCQkJZGV2X3By aXYtPnVuY29yZS5mdW5jcy5mb3JjZV93YWtlX3B1dChkZXZfcHJpdiwKIAkJCQkJCQkgICAgICBG T1JDRVdBS0VfTUVESUEpOworCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkgeworCQkJ aWYgKC0tZGV2X3ByaXYtPnVuY29yZS5md19ibGl0dGVyY291bnQgPT0gMCkKKwkJCQlkZXZfcHJp di0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2VfcHV0KGRldl9wcml2LAorCQkJCQkJCUZPUkNFV0FL RV9CTElUVEVSKTsKKwkJfQogCX0gZWxzZSB7CiAJCWlmICgtLWRldl9wcml2LT51bmNvcmUuZm9y Y2V3YWtlX2NvdW50ID09IDApCiAJCQlkZXZfcHJpdi0+dW5jb3JlLmZ1bmNzLmZvcmNlX3dha2Vf cHV0KGRldl9wcml2LAotLSAKMS44LjMuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK