From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH 1/3] drm/i915: Use consistent forcewake
	auto-release timeout across kernel configs
Date: Mon,  4 Apr 2016 17:51:09 +0100
Message-ID: <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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id 682336E626
 for <Intel-gfx@lists.freedesktop.org>; Mon,  4 Apr 2016 16:51:38 +0000 (UTC)
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkN1cnJlbnQg
aW1wbGVtZW50YXRpb24gcmVsZWFzZXMgdGhlIGZvcmNld2FrZSBhdCBhbnkgdGltZSBiZXR3ZWVu
CnN0cmFpZ2h0IGF3YXksIGFuZCBvbmUgamlmZmllIGZyb20gdGhlIGxhc3QgcHV0LCBvciBmaXJz
dCBhdXRvbWF0aWMKZ3JhYi4KClRoaXMgZG9lcyBub3Qgc291bmQgbGlrZSB3aGF0IHdhcyBkZXNp
cmVkIHNpbmNlIGppZmZpZXMgYXJlIHR5cGljYWxseQpiZXR3ZWVuIDEgYW5kIDEwbXMgZGVwZW5k
aW5nIG9uIHRoZSBrZXJuZWwgY29uZmlndXJhdGlvbi4KCkNoYW5nZSB0aGUgYXV0by1yZWxlYXNl
IG1lY2hhbmlzbSB0byB1c2UgaHJ0aW1lcnMgYW5kIHNldCB0aGUgdGltZW91dAp0byAxbXMgd2l0
aCBhIDFtcyBvZiBzbGFjay4gVGhpcyBzaG91bGQgbWFrZSB0aGUgR1BVIHBvd2VyIGNvbnNpc3Rl
bnQKYWNyb3NzIGtlcm5lbCBjb25maWdzIGFuZCB0aGUgc2xhY2sgc2hvdWxkIGVuYWJsZSBzb21l
IHRpbWVyIGNvYWxsZXNjaW5nCndoZXJlIG11bHRpcGxlIGZvcmNlLXdha2UgZG9tYWlucyBleGlz
dCwgb3Igd2l0aCB1bnJlbGF0ZWQgdGltZXJzLgoKRm9yIEdsQmVuY2gvVC1SZXggdGhpcyBkZWNy
ZWFzZXMgdGhlIG51bWJlciBvZiBmb3JjZXdha2UgcmVsZWFzZXMgZnJvbQp+NDgwIHRvIH4zMDAg
cGVyIHNlY29uZCwgYW5kIGZvciBhIGhlYXZ5IGNvbWJpbmVkIE9HTC9PQ0wgdGVzdCBmcm9tCn42
NzAgdG8gfjM2MC4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxp
bkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgfCAg
MiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgfCAyNSArKysrKysrKysr
KysrKysrLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDEwIGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGRkMTg3NzI3YzgxMy4uN2Q0
YzcwNGQ3ZDc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTY2Niw3ICs2NjYsNyBAQCBz
dHJ1Y3QgaW50ZWxfdW5jb3JlIHsKIAkJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTU7CiAJ
CWVudW0gZm9yY2V3YWtlX2RvbWFpbl9pZCBpZDsKIAkJdW5zaWduZWQgd2FrZV9jb3VudDsKLQkJ
c3RydWN0IHRpbWVyX2xpc3QgdGltZXI7CisJCXN0cnVjdCBocnRpbWVyIHRpbWVyOwogCQlpOTE1
X3JlZ190IHJlZ19zZXQ7CiAJCXUzMiB2YWxfc2V0OwogCQl1MzIgdmFsX2NsZWFyOwpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCBhYzFjNTQ1NDM2YWYuLjc2YWM5OTBkZTM1NCAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysrIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTYwLDcgKzYwLDExIEBAIGZ3X2Rv
bWFpbl9yZXNldChjb25zdCBzdHJ1Y3QgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9kb21haW4gKmQp
CiBzdGF0aWMgaW5saW5lIHZvaWQKIGZ3X2RvbWFpbl9hcm1fdGltZXIoc3RydWN0IGludGVsX3Vu
Y29yZV9mb3JjZXdha2VfZG9tYWluICpkKQogewotCW1vZF90aW1lcl9waW5uZWQoJmQtPnRpbWVy
LCBqaWZmaWVzICsgMSk7CisJZC0+d2FrZV9jb3VudCsrOworCWhydGltZXJfc3RhcnRfcmFuZ2Vf
bnMoJmQtPnRpbWVyLAorCQkJICAgICAgIGt0aW1lX3NldCgwLCBOU0VDX1BFUl9NU0VDKSwKKwkJ
CSAgICAgICBOU0VDX1BFUl9NU0VDLAorCQkJICAgICAgIEhSVElNRVJfTU9ERV9SRUwpOwogfQog
CiBzdGF0aWMgaW5saW5lIHZvaWQKQEAgLTIyNCw5ICsyMjgsMTEgQEAgc3RhdGljIGludCBfX2dl
bjZfZ3Rfd2FpdF9mb3JfZmlmbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ
cmV0dXJuIHJldDsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfdW5jb3JlX2Z3X3JlbGVhc2VfdGlt
ZXIodW5zaWduZWQgbG9uZyBhcmcpCitzdGF0aWMgZW51bSBocnRpbWVyX3Jlc3RhcnQKK2ludGVs
X3VuY29yZV9md19yZWxlYXNlX3RpbWVyKHN0cnVjdCBocnRpbWVyICp0aW1lcikKIHsKLQlzdHJ1
Y3QgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9kb21haW4gKmRvbWFpbiA9ICh2b2lkICopYXJnOwor
CXN0cnVjdCBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2RvbWFpbiAqZG9tYWluID0KKwkgICAgICAg
Y29udGFpbmVyX29mKHRpbWVyLCBzdHJ1Y3QgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9kb21haW4s
IHRpbWVyKTsKIAl1bnNpZ25lZCBsb25nIGlycWZsYWdzOwogCiAJYXNzZXJ0X3JwbV9kZXZpY2Vf
bm90X3N1c3BlbmRlZChkb21haW4tPmk5MTUpOwpAQCAtMjQwLDYgKzI0Niw4IEBAIHN0YXRpYyB2
b2lkIGludGVsX3VuY29yZV9md19yZWxlYXNlX3RpbWVyKHVuc2lnbmVkIGxvbmcgYXJnKQogCQkJ
CQkJCSAgMSA8PCBkb21haW4tPmlkKTsKIAogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRvbWFp
bi0+aTkxNS0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKKworCXJldHVybiBIUlRJTUVSX05PUkVT
VEFSVDsKIH0KIAogdm9pZCBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3Jlc2V0KHN0cnVjdCBkcm1f
ZGV2aWNlICpkZXYsIGJvb2wgcmVzdG9yZSkKQEAgLTI1OSwxNiArMjY3LDE2IEBAIHZvaWQgaW50
ZWxfdW5jb3JlX2ZvcmNld2FrZV9yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHJl
c3RvcmUpCiAJCWFjdGl2ZV9kb21haW5zID0gMDsKIAogCQlmb3JfZWFjaF9md19kb21haW4oZG9t
YWluLCBkZXZfcHJpdiwgaWQpIHsKLQkJCWlmIChkZWxfdGltZXJfc3luYygmZG9tYWluLT50aW1l
cikgPT0gMCkKKwkJCWlmIChocnRpbWVyX2NhbmNlbCgmZG9tYWluLT50aW1lcikgPT0gMCkKIAkJ
CQljb250aW51ZTsKIAotCQkJaW50ZWxfdW5jb3JlX2Z3X3JlbGVhc2VfdGltZXIoKHVuc2lnbmVk
IGxvbmcpZG9tYWluKTsKKwkJCWludGVsX3VuY29yZV9md19yZWxlYXNlX3RpbWVyKCZkb21haW4t
PnRpbWVyKTsKIAkJfQogCiAJCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxv
Y2ssIGlycWZsYWdzKTsKIAogCQlmb3JfZWFjaF9md19kb21haW4oZG9tYWluLCBkZXZfcHJpdiwg
aWQpIHsKLQkJCWlmICh0aW1lcl9wZW5kaW5nKCZkb21haW4tPnRpbWVyKSkKKwkJCWlmIChocnRp
bWVyX2FjdGl2ZSgmZG9tYWluLT50aW1lcikpCiAJCQkJYWN0aXZlX2RvbWFpbnMgfD0gKDEgPDwg
aWQpOwogCQl9CiAKQEAgLTQ5MSw3ICs0OTksNiBAQCBzdGF0aWMgdm9pZCBfX2ludGVsX3VuY29y
ZV9mb3JjZXdha2VfcHV0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJaWYg
KC0tZG9tYWluLT53YWtlX2NvdW50KQogCQkJY29udGludWU7CiAKLQkJZG9tYWluLT53YWtlX2Nv
dW50Kys7CiAJCWZ3X2RvbWFpbl9hcm1fdGltZXIoZG9tYWluKTsKIAl9CiB9CkBAIC03MzIsNyAr
NzM5LDYgQEAgc3RhdGljIGlubGluZSB2b2lkIF9fZm9yY2Vfd2FrZV9hdXRvKHN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCWNvbnRpbnVlOwogCQl9CiAKLQkJZG9tYWluLT53
YWtlX2NvdW50Kys7CiAJCWZ3X2RvbWFpbl9hcm1fdGltZXIoZG9tYWluKTsKIAl9CiAKQEAgLTEx
NTAsNyArMTE1Niw4IEBAIHN0YXRpYyB2b2lkIGZ3X2RvbWFpbl9pbml0KHN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdiwKIAlkLT5pOTE1ID0gZGV2X3ByaXY7CiAJZC0+aWQgPSBkb21h
aW5faWQ7CiAKLQlzZXR1cF90aW1lcigmZC0+dGltZXIsIGludGVsX3VuY29yZV9md19yZWxlYXNl
X3RpbWVyLCAodW5zaWduZWQgbG9uZylkKTsKKwlocnRpbWVyX2luaXQoJmQtPnRpbWVyLCBDTE9D
S19NT05PVE9OSUMsIEhSVElNRVJfTU9ERV9SRUwpOworCWQtPnRpbWVyLmZ1bmN0aW9uID0gaW50
ZWxfdW5jb3JlX2Z3X3JlbGVhc2VfdGltZXI7CiAKIAlkZXZfcHJpdi0+dW5jb3JlLmZ3X2RvbWFp
bnMgfD0gKDEgPDwgZG9tYWluX2lkKTsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt
Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t
YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=