From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH v2 1/3] drm/i915: Use consistent forcewake auto-release timeout across kernel configs Date: Tue, 5 Apr 2016 12:01:10 +0100 Message-ID: <1459854072-5504-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1459788671-17501-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id F1A8B6E742 for ; Tue, 5 Apr 2016 11:01:19 +0000 (UTC) In-Reply-To: <1459788671-17501-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkJlY2F1c2Ug aXQgaXMgYmFzZWQgb24gamlmZmllcywgY3VycmVudCBpbXBsZW1lbnRhdGlvbiByZWxlYXNlcyB0 aGUKZm9yY2V3YWtlIGF0IGFueSB0aW1lIGJldHdlZW4gc3RyYWlnaHQgYXdheSBhbmQgYmV0d2Vl biAxbXMgYW5kIDEwbXMsCmRlcGVuZGluZyBvbiB0aGUga2VybmVsIGNvbmZpZ3VyYXRpb24gKENP TkZJR19IWikuCgpUaGlzIGlzIHByb2JhYmx5IG5vdCB3aGF0IGhhcyBiZWVuIGRlc2lyZWQsIHNp bmNlIHRoZSBkeW5hbWljcyBvZiBrZWVwaW5nCnBhcnRzIG9mIHRoZSBHUFUgYXdha2Ugc2hvdWxk IG5vdCBiZSBjb3JyZWxhdGVkIHdpdGggdGhpcyBrZXJuZWwKY29uZmlndXJhdGlvbiBwYXJhbWV0 ZXIuCgpDaGFuZ2UgdGhlIGF1dG8tcmVsZWFzZSBtZWNoYW5pc20gdG8gdXNlIGhydGltZXJzIGFu ZCBzZXQgdGhlIHRpbWVvdXQgdG8KMW1zIHdpdGggYSAxbXMgb2Ygc2xhY2suIFRoaXMgc2hvdWxk IG1ha2UgdGhlIEdQVSBwb3dlciBjb25zaXN0ZW50CmFjcm9zcyBrZXJuZWwgY29uZmlncywgYW5k IHRpbWVyIHNsYWNrIHNob3VsZCBlbmFibGUgc29tZSB0aW1lciBjb2FsZXNjaW5nCndoZXJlIG11 bHRpcGxlIGZvcmNlLXdha2UgZG9tYWlucyBleGlzdCwgb3Igd2l0aCB1bnJlbGF0ZWQgdGltZXJz LgoKRm9yIEdsQmVuY2gvVC1SZXggdGhpcyBkZWNyZWFzZXMgdGhlIG51bWJlciBvZiBmb3JjZXdh a2UgcmVsZWFzZXMgZnJvbQp+NDgwIHRvIH4zMDAgcGVyIHNlY29uZCwgYW5kIGZvciBhIGhlYXZ5 IGNvbWJpbmVkIE9HTC9PQ0wgdGVzdCBmcm9tCn42NzAgdG8gfjM2MCAoSFo9MTAwMCBrZXJuZWwp LgoKRXZlbiB0aG91Z2ggdGhpcyByZWR1Y3Rpb24gY2FuIGJlIGF0dHJpYnV0ZWQgdG8gdGhlIGF2 ZXJhZ2UgcmVsZWFzZSBwZXJpb2QKZXh0ZW5kaW5nIGZyb20gMC0xbXMgdG8gMS0ybXMsIGFzIGRp c2N1c3NlZCBhYm92ZSwgaXQgd2lsbCBtYWtlIHRoZQpmb3JjZXdha2UgdGltZW91dCBjb25zaXN0 ZW50IGZvciBkaWZmZXJlbnQgQ09ORklHX0haIHZhbHVlcy4KClJlYWwgbGlmZSBtZWFzdXJlbWVu dHMgd2l0aCB0aGUgYWJvdmUgd29ya2xvYWQgaGFzIHNob3duIHRoYXQsIHdpdGggdGhpcwpwYXRj aCwgYm90aCBtYW5hZ2UgdG8gYXV0by1yZWxlYXNlIHRoZSBmb3JjZXdha2UgYmV0d2VlbiAyLTQg dGltZXMgcGVyCjEwbXMsIGV2ZW4gdGhvdWdoIHRoZSBudW1iZXIgb2YgZm9yY2V3YWtlIGdldHMg aXMgZHJhbWF0aWNhbGx5IGRpZmZlcmVudC4KClQtUmV4IHJlcXVlc3RzIGJldHdlZW4gNS0xMCBl eHBsaWNpdCBnZXRzIGFuZCA1LTEwIGltcGxpY3QgZ2V0cyBpbiBlYWNoCjEwbXMgcGVyaW9kLCB3 aGlsZSB0aGUgT0dML09DTCB0ZXN0IHJlcXVlc3RzIDI1MCBhbmQgMzgwIHRpbWVzIGluIHRoZSBz YW1lCnBlcmlvZC4KClRoZSB0d28gZGF0YSBwb2ludHMgdG9nZXRoZXIgc3VnZ2VzdCB0aGF0IHRo ZSBuYXR1cmUgb2YgdGhlIGZvcndha2UKYWNjZXNzZXMgaXMgYnVyc3R5IGFuZCB0aGF0IGZ1cnRo ZXIgY2hhbmdlcyBhbmQgcG90ZW50aWFsIHRpbWVvdXQKZXh0ZW5zaW9ucywgb3IgbW92aW5nIHRo ZSBzdGFydCBvZiB0aW1lb3V0IGZyb20gdGhlIGZpcnN0IHRvIHRoZSBsYXN0CmF1dG9tYXRpYyBm b3JjZXdha2UgZ3JhYiwgc2hvdWxkIGJlIGNhcmVmdWxseSBtZWFzdXJlZCBmb3IgcG93ZXIgYW5k CnBlcmZvcm1hbmNlIGVmZmVjdHMuCgp2MjoKICAqIENvbW1pdCBzcGVsbGluZy4gKERhdmUgR29y ZG9uKQogICogTW9yZSBkaXNjdXNzaW9uIG9uIG51bWJlcnMgaW4gdGhlIGNvbW1pdC4gKENocmlz IFdpbHNvbikKClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBp bnRlbC5jb20+ClJldmlld2VkLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwu Y29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdW5jb3JlLmMgfCAyNSArKysrKysrKysrKysrKysrLS0tLS0tLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCmluZGV4IGRkMTg3NzI3YzgxMy4uN2Q0YzcwNGQ3ZDc1IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKQEAgLTY2Niw3ICs2NjYsNyBAQCBzdHJ1Y3QgaW50ZWxfdW5jb3JlIHsK IAkJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTU7CiAJCWVudW0gZm9yY2V3YWtlX2RvbWFp bl9pZCBpZDsKIAkJdW5zaWduZWQgd2FrZV9jb3VudDsKLQkJc3RydWN0IHRpbWVyX2xpc3QgdGlt ZXI7CisJCXN0cnVjdCBocnRpbWVyIHRpbWVyOwogCQlpOTE1X3JlZ190IHJlZ19zZXQ7CiAJCXUz MiB2YWxfc2V0OwogCQl1MzIgdmFsX2NsZWFyOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUu YwppbmRleCBhYzFjNTQ1NDM2YWYuLjc2YWM5OTBkZTM1NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfdW5jb3JlLmMKQEAgLTYwLDcgKzYwLDExIEBAIGZ3X2RvbWFpbl9yZXNldChjb25zdCBzdHJ1 Y3QgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9kb21haW4gKmQpCiBzdGF0aWMgaW5saW5lIHZvaWQK IGZ3X2RvbWFpbl9hcm1fdGltZXIoc3RydWN0IGludGVsX3VuY29yZV9mb3JjZXdha2VfZG9tYWlu ICpkKQogewotCW1vZF90aW1lcl9waW5uZWQoJmQtPnRpbWVyLCBqaWZmaWVzICsgMSk7CisJZC0+ d2FrZV9jb3VudCsrOworCWhydGltZXJfc3RhcnRfcmFuZ2VfbnMoJmQtPnRpbWVyLAorCQkJICAg ICAgIGt0aW1lX3NldCgwLCBOU0VDX1BFUl9NU0VDKSwKKwkJCSAgICAgICBOU0VDX1BFUl9NU0VD LAorCQkJICAgICAgIEhSVElNRVJfTU9ERV9SRUwpOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQK QEAgLTIyNCw5ICsyMjgsMTEgQEAgc3RhdGljIGludCBfX2dlbjZfZ3Rfd2FpdF9mb3JfZmlmbyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIHJldDsKIH0KIAotc3Rh dGljIHZvaWQgaW50ZWxfdW5jb3JlX2Z3X3JlbGVhc2VfdGltZXIodW5zaWduZWQgbG9uZyBhcmcp CitzdGF0aWMgZW51bSBocnRpbWVyX3Jlc3RhcnQKK2ludGVsX3VuY29yZV9md19yZWxlYXNlX3Rp bWVyKHN0cnVjdCBocnRpbWVyICp0aW1lcikKIHsKLQlzdHJ1Y3QgaW50ZWxfdW5jb3JlX2ZvcmNl d2FrZV9kb21haW4gKmRvbWFpbiA9ICh2b2lkICopYXJnOworCXN0cnVjdCBpbnRlbF91bmNvcmVf Zm9yY2V3YWtlX2RvbWFpbiAqZG9tYWluID0KKwkgICAgICAgY29udGFpbmVyX29mKHRpbWVyLCBz dHJ1Y3QgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9kb21haW4sIHRpbWVyKTsKIAl1bnNpZ25lZCBs b25nIGlycWZsYWdzOwogCiAJYXNzZXJ0X3JwbV9kZXZpY2Vfbm90X3N1c3BlbmRlZChkb21haW4t Pmk5MTUpOwpAQCAtMjQwLDYgKzI0Niw4IEBAIHN0YXRpYyB2b2lkIGludGVsX3VuY29yZV9md19y ZWxlYXNlX3RpbWVyKHVuc2lnbmVkIGxvbmcgYXJnKQogCQkJCQkJCSAgMSA8PCBkb21haW4tPmlk KTsKIAogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRvbWFpbi0+aTkxNS0+dW5jb3JlLmxvY2ss IGlycWZsYWdzKTsKKworCXJldHVybiBIUlRJTUVSX05PUkVTVEFSVDsKIH0KIAogdm9pZCBpbnRl bF91bmNvcmVfZm9yY2V3YWtlX3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgcmVz dG9yZSkKQEAgLTI1OSwxNiArMjY3LDE2IEBAIHZvaWQgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9y ZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHJlc3RvcmUpCiAJCWFjdGl2ZV9kb21h aW5zID0gMDsKIAogCQlmb3JfZWFjaF9md19kb21haW4oZG9tYWluLCBkZXZfcHJpdiwgaWQpIHsK LQkJCWlmIChkZWxfdGltZXJfc3luYygmZG9tYWluLT50aW1lcikgPT0gMCkKKwkJCWlmIChocnRp bWVyX2NhbmNlbCgmZG9tYWluLT50aW1lcikgPT0gMCkKIAkJCQljb250aW51ZTsKIAotCQkJaW50 ZWxfdW5jb3JlX2Z3X3JlbGVhc2VfdGltZXIoKHVuc2lnbmVkIGxvbmcpZG9tYWluKTsKKwkJCWlu dGVsX3VuY29yZV9md19yZWxlYXNlX3RpbWVyKCZkb21haW4tPnRpbWVyKTsKIAkJfQogCiAJCXNw aW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIAogCQlm b3JfZWFjaF9md19kb21haW4oZG9tYWluLCBkZXZfcHJpdiwgaWQpIHsKLQkJCWlmICh0aW1lcl9w ZW5kaW5nKCZkb21haW4tPnRpbWVyKSkKKwkJCWlmIChocnRpbWVyX2FjdGl2ZSgmZG9tYWluLT50 aW1lcikpCiAJCQkJYWN0aXZlX2RvbWFpbnMgfD0gKDEgPDwgaWQpOwogCQl9CiAKQEAgLTQ5MSw3 ICs0OTksNiBAQCBzdGF0aWMgdm9pZCBfX2ludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJaWYgKC0tZG9tYWluLT53YWtlX2NvdW50 KQogCQkJY29udGludWU7CiAKLQkJZG9tYWluLT53YWtlX2NvdW50Kys7CiAJCWZ3X2RvbWFpbl9h cm1fdGltZXIoZG9tYWluKTsKIAl9CiB9CkBAIC03MzIsNyArNzM5LDYgQEAgc3RhdGljIGlubGlu ZSB2b2lkIF9fZm9yY2Vfd2FrZV9hdXRvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAkJCWNvbnRpbnVlOwogCQl9CiAKLQkJZG9tYWluLT53YWtlX2NvdW50Kys7CiAJCWZ3X2Rv bWFpbl9hcm1fdGltZXIoZG9tYWluKTsKIAl9CiAKQEAgLTExNTAsNyArMTE1Niw4IEBAIHN0YXRp YyB2b2lkIGZ3X2RvbWFpbl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK IAlkLT5pOTE1ID0gZGV2X3ByaXY7CiAJZC0+aWQgPSBkb21haW5faWQ7CiAKLQlzZXR1cF90aW1l cigmZC0+dGltZXIsIGludGVsX3VuY29yZV9md19yZWxlYXNlX3RpbWVyLCAodW5zaWduZWQgbG9u ZylkKTsKKwlocnRpbWVyX2luaXQoJmQtPnRpbWVyLCBDTE9DS19NT05PVE9OSUMsIEhSVElNRVJf TU9ERV9SRUwpOworCWQtPnRpbWVyLmZ1bmN0aW9uID0gaW50ZWxfdW5jb3JlX2Z3X3JlbGVhc2Vf dGltZXI7CiAKIAlkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFpbnMgfD0gKDEgPDwgZG9tYWluX2lk KTsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=