From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH resend-for-CI 1/3] drm/i915: Use consistent forcewake auto-release timeout across kernel configs Date: Wed, 6 Apr 2016 10:33:12 +0100 Message-ID: <1459935194-2318-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 5699C6E8BA for ; Wed, 6 Apr 2016 09:33:18 +0000 (UTC) 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+ClJldmlld2Vk LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91bmNvcmUuYyB8IDI1ICsrKysrKysrKysrKysrKystLS0tLS0tLS0KIDIgZmlsZXMg Y2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKaW5kZXggMzEzYmMzNTc2ZDg3Li44ZWU1Zjc4ZDQ1YmMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaApAQCAtNjY2LDcgKzY2Niw3IEBAIHN0cnVjdCBpbnRlbF91bmNvcmUgewogCQlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNTsKIAkJZW51bSBmb3JjZXdha2VfZG9tYWluX2lk IGlkOwogCQl1bnNpZ25lZCB3YWtlX2NvdW50OwotCQlzdHJ1Y3QgdGltZXJfbGlzdCB0aW1lcjsK KwkJc3RydWN0IGhydGltZXIgdGltZXI7CiAJCWk5MTVfcmVnX3QgcmVnX3NldDsKIAkJdTMyIHZh bF9zZXQ7CiAJCXUzMiB2YWxfY2xlYXI7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmlu ZGV4IGZiYzFkMjE1Y2E2Ny4uMmUzZTkyNDY5OTQ3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91 bmNvcmUuYwpAQCAtNjAsNyArNjAsMTEgQEAgZndfZG9tYWluX3Jlc2V0KGNvbnN0IHN0cnVjdCBp bnRlbF91bmNvcmVfZm9yY2V3YWtlX2RvbWFpbiAqZCkKIHN0YXRpYyBpbmxpbmUgdm9pZAogZndf ZG9tYWluX2FybV90aW1lcihzdHJ1Y3QgaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9kb21haW4gKmQp CiB7Ci0JbW9kX3RpbWVyX3Bpbm5lZCgmZC0+dGltZXIsIGppZmZpZXMgKyAxKTsKKwlkLT53YWtl X2NvdW50Kys7CisJaHJ0aW1lcl9zdGFydF9yYW5nZV9ucygmZC0+dGltZXIsCisJCQkgICAgICAg a3RpbWVfc2V0KDAsIE5TRUNfUEVSX01TRUMpLAorCQkJICAgICAgIE5TRUNfUEVSX01TRUMsCisJ CQkgICAgICAgSFJUSU1FUl9NT0RFX1JFTCk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZApAQCAt MjI0LDkgKzIyOCwxMSBAQCBzdGF0aWMgaW50IF9fZ2VuNl9ndF93YWl0X2Zvcl9maWZvKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMg dm9pZCBpbnRlbF91bmNvcmVfZndfcmVsZWFzZV90aW1lcih1bnNpZ25lZCBsb25nIGFyZykKK3N0 YXRpYyBlbnVtIGhydGltZXJfcmVzdGFydAoraW50ZWxfdW5jb3JlX2Z3X3JlbGVhc2VfdGltZXIo c3RydWN0IGhydGltZXIgKnRpbWVyKQogewotCXN0cnVjdCBpbnRlbF91bmNvcmVfZm9yY2V3YWtl X2RvbWFpbiAqZG9tYWluID0gKHZvaWQgKilhcmc7CisJc3RydWN0IGludGVsX3VuY29yZV9mb3Jj ZXdha2VfZG9tYWluICpkb21haW4gPQorCSAgICAgICBjb250YWluZXJfb2YodGltZXIsIHN0cnVj dCBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2RvbWFpbiwgdGltZXIpOwogCXVuc2lnbmVkIGxvbmcg aXJxZmxhZ3M7CiAKIAlhc3NlcnRfcnBtX2RldmljZV9ub3Rfc3VzcGVuZGVkKGRvbWFpbi0+aTkx NSk7CkBAIC0yNDAsNiArMjQ2LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfdW5jb3JlX2Z3X3JlbGVh c2VfdGltZXIodW5zaWduZWQgbG9uZyBhcmcpCiAJCQkJCQkJICAxIDw8IGRvbWFpbi0+aWQpOwog CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZG9tYWluLT5pOTE1LT51bmNvcmUubG9jaywgaXJx ZmxhZ3MpOworCisJcmV0dXJuIEhSVElNRVJfTk9SRVNUQVJUOwogfQogCiB2b2lkIGludGVsX3Vu Y29yZV9mb3JjZXdha2VfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgYm9vbCByZXN0b3Jl KQpAQCAtMjU5LDE2ICsyNjcsMTYgQEAgdm9pZCBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3Jlc2V0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgcmVzdG9yZSkKIAkJYWN0aXZlX2RvbWFpbnMg PSAwOwogCiAJCWZvcl9lYWNoX2Z3X2RvbWFpbihkb21haW4sIGRldl9wcml2LCBpZCkgewotCQkJ aWYgKGRlbF90aW1lcl9zeW5jKCZkb21haW4tPnRpbWVyKSA9PSAwKQorCQkJaWYgKGhydGltZXJf Y2FuY2VsKCZkb21haW4tPnRpbWVyKSA9PSAwKQogCQkJCWNvbnRpbnVlOwogCi0JCQlpbnRlbF91 bmNvcmVfZndfcmVsZWFzZV90aW1lcigodW5zaWduZWQgbG9uZylkb21haW4pOworCQkJaW50ZWxf dW5jb3JlX2Z3X3JlbGVhc2VfdGltZXIoJmRvbWFpbi0+dGltZXIpOwogCQl9CiAKIAkJc3Bpbl9s b2NrX2lycXNhdmUoJmRldl9wcml2LT51bmNvcmUubG9jaywgaXJxZmxhZ3MpOwogCiAJCWZvcl9l YWNoX2Z3X2RvbWFpbihkb21haW4sIGRldl9wcml2LCBpZCkgewotCQkJaWYgKHRpbWVyX3BlbmRp bmcoJmRvbWFpbi0+dGltZXIpKQorCQkJaWYgKGhydGltZXJfYWN0aXZlKCZkb21haW4tPnRpbWVy KSkKIAkJCQlhY3RpdmVfZG9tYWlucyB8PSAoMSA8PCBpZCk7CiAJCX0KIApAQCAtNDkxLDcgKzQ5 OSw2IEBAIHN0YXRpYyB2b2lkIF9faW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9wdXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQlpZiAoLS1kb21haW4tPndha2VfY291bnQpCiAJ CQljb250aW51ZTsKIAotCQlkb21haW4tPndha2VfY291bnQrKzsKIAkJZndfZG9tYWluX2FybV90 aW1lcihkb21haW4pOwogCX0KIH0KQEAgLTczMiw3ICs3MzksNiBAQCBzdGF0aWMgaW5saW5lIHZv aWQgX19mb3JjZV93YWtlX2F1dG8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CQkJY29udGludWU7CiAJCX0KIAotCQlkb21haW4tPndha2VfY291bnQrKzsKIAkJZndfZG9tYWlu X2FybV90aW1lcihkb21haW4pOwogCX0KIApAQCAtMTE1MCw3ICsxMTU2LDggQEAgc3RhdGljIHZv aWQgZndfZG9tYWluX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWQt Pmk5MTUgPSBkZXZfcHJpdjsKIAlkLT5pZCA9IGRvbWFpbl9pZDsKIAotCXNldHVwX3RpbWVyKCZk LT50aW1lciwgaW50ZWxfdW5jb3JlX2Z3X3JlbGVhc2VfdGltZXIsICh1bnNpZ25lZCBsb25nKWQp OworCWhydGltZXJfaW5pdCgmZC0+dGltZXIsIENMT0NLX01PTk9UT05JQywgSFJUSU1FUl9NT0RF X1JFTCk7CisJZC0+dGltZXIuZnVuY3Rpb24gPSBpbnRlbF91bmNvcmVfZndfcmVsZWFzZV90aW1l cjsKIAogCWRldl9wcml2LT51bmNvcmUuZndfZG9tYWlucyB8PSAoMSA8PCBkb21haW5faWQpOwog Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==