From: Joonas Lahtinen Subject: [CI] drm/i915: Convert timers to use timer_setup() Date: Tue, 17 Oct 2017 09:53:04 +0300 Message-ID: <20171017065304.3358-1-joonas.lahtinen@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95FC66E214 for ; Tue, 17 Oct 2017 06:53:08 +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 graphics driver community testing & development List-Id: intel-gfx@lists.freedesktop.org RnJvbTogS2VlcyBDb29rIDxrZWVzY29va0BjaHJvbWl1bS5vcmc+CgpJbiBwcmVwYXJhdGlvbiBm b3IgdW5jb25kaXRpb25hbGx5IHBhc3NpbmcgdGhlIHN0cnVjdCB0aW1lcl9saXN0IHBvaW50ZXIg dG8KYWxsIHRpbWVyIGNhbGxiYWNrcywgc3dpdGNoIHRvIHVzaW5nIHRoZSBuZXcgdGltZXJfc2V0 dXAoKSBhbmQgZnJvbV90aW1lcigpCnRvIHBhc3MgdGhlIHRpbWVyIHBvaW50ZXIgZXhwbGljaXRs eS4KCkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KQ2M6IEphbmkg TmlrdWxhIDxqYW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBEYXZpZCBBaXJsaWUgPGFp cmxpZWRAbGludXguaWU+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51 az4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4K Q2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBPc2NhciBN YXRlbyA8b3NjYXIubWF0ZW9AaW50ZWwuY29tPgpDYzogaW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpTaWduZWQtb2ZmLWJ5 OiBLZWVzIENvb2sgPGtlZXNjb29rQGNocm9taXVtLm9yZz4KUmV2aWV3ZWQtYnk6IEpvb25hcyBM YWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X3N3X2ZlbmNlLmMgICAgICAgICB8ICA4ICsrKy0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9icmVhZGNydW1icy5jICAgICB8IDE4ICsrKysrKysrLS0tLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZW5naW5lLmMgfCAgOCAr KystLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N3X2ZlbmNlLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N3X2ZlbmNlLmMKaW5kZXggY2EzM2NjMDhjYjA3Li5l OGNhNjdhMTI5ZDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3dfZmVu Y2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N3X2ZlbmNlLmMKQEAgLTM2OSw5 ICszNjksOSBAQCBzdHJ1Y3QgaTkxNV9zd19kbWFfZmVuY2VfY2IgewogCXN0cnVjdCBpcnFfd29y ayB3b3JrOwogfTsKIAotc3RhdGljIHZvaWQgdGltZXJfaTkxNV9zd19mZW5jZV93YWtlKHVuc2ln bmVkIGxvbmcgZGF0YSkKK3N0YXRpYyB2b2lkIHRpbWVyX2k5MTVfc3dfZmVuY2Vfd2FrZShzdHJ1 Y3QgdGltZXJfbGlzdCAqdCkKIHsKLQlzdHJ1Y3QgaTkxNV9zd19kbWFfZmVuY2VfY2IgKmNiID0g KHN0cnVjdCBpOTE1X3N3X2RtYV9mZW5jZV9jYiAqKWRhdGE7CisJc3RydWN0IGk5MTVfc3dfZG1h X2ZlbmNlX2NiICpjYiA9IGZyb21fdGltZXIoY2IsIHQsIHRpbWVyKTsKIAlzdHJ1Y3QgaTkxNV9z d19mZW5jZSAqZmVuY2U7CiAKIAlmZW5jZSA9IHhjaGcoJmNiLT5mZW5jZSwgTlVMTCk7CkBAIC00 MzQsOSArNDM0LDcgQEAgaW50IGk5MTVfc3dfZmVuY2VfYXdhaXRfZG1hX2ZlbmNlKHN0cnVjdCBp OTE1X3N3X2ZlbmNlICpmZW5jZSwKIAlpOTE1X3N3X2ZlbmNlX2F3YWl0KGZlbmNlKTsKIAogCWNi LT5kbWEgPSBOVUxMOwotCV9fc2V0dXBfdGltZXIoJmNiLT50aW1lciwKLQkJICAgICAgdGltZXJf aTkxNV9zd19mZW5jZV93YWtlLCAodW5zaWduZWQgbG9uZyljYiwKLQkJICAgICAgVElNRVJfSVJR U0FGRSk7CisJdGltZXJfc2V0dXAoJmNiLT50aW1lciwgdGltZXJfaTkxNV9zd19mZW5jZV93YWtl LCBUSU1FUl9JUlFTQUZFKTsKIAlpbml0X2lycV93b3JrKCZjYi0+d29yaywgaXJxX2k5MTVfc3df ZmVuY2Vfd29yayk7CiAJaWYgKHRpbWVvdXQpIHsKIAkJY2ItPmRtYSA9IGRtYV9mZW5jZV9nZXQo ZG1hKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2JyZWFkY3J1bWJz LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9icmVhZGNydW1icy5jCmluZGV4IDI5YzYy ZDQ4MWNlZi4uNDhlMWJhMDFjY2Y4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9icmVhZGNydW1icy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2JyZWFk Y3J1bWJzLmMKQEAgLTc0LDkgKzc0LDEwIEBAIHN0YXRpYyBub2lubGluZSB2b2lkIG1pc3NlZF9i cmVhZGNydW1iKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlzZXRfYml0KGVuZ2lu ZS0+aWQsICZlbmdpbmUtPmk5MTUtPmdwdV9lcnJvci5taXNzZWRfaXJxX3JpbmdzKTsKIH0KIAot c3RhdGljIHZvaWQgaW50ZWxfYnJlYWRjcnVtYnNfaGFuZ2NoZWNrKHVuc2lnbmVkIGxvbmcgZGF0 YSkKK3N0YXRpYyB2b2lkIGludGVsX2JyZWFkY3J1bWJzX2hhbmdjaGVjayhzdHJ1Y3QgdGltZXJf bGlzdCAqdCkKIHsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSAoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqKWRhdGE7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0g ZnJvbV90aW1lcihlbmdpbmUsIHQsCisJCQkJCQkgICAgYnJlYWRjcnVtYnMuaGFuZ2NoZWNrKTsK IAlzdHJ1Y3QgaW50ZWxfYnJlYWRjcnVtYnMgKmIgPSAmZW5naW5lLT5icmVhZGNydW1iczsKIAog CWlmICghYi0+aXJxX2FybWVkKQpAQCAtMTA4LDkgKzEwOSwxMCBAQCBzdGF0aWMgdm9pZCBpbnRl bF9icmVhZGNydW1ic19oYW5nY2hlY2sodW5zaWduZWQgbG9uZyBkYXRhKQogCX0KIH0KIAotc3Rh dGljIHZvaWQgaW50ZWxfYnJlYWRjcnVtYnNfZmFrZV9pcnEodW5zaWduZWQgbG9uZyBkYXRhKQor c3RhdGljIHZvaWQgaW50ZWxfYnJlYWRjcnVtYnNfZmFrZV9pcnEoc3RydWN0IHRpbWVyX2xpc3Qg KnQpCiB7Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0gKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKilkYXRhOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSA9IGZyb21f dGltZXIoZW5naW5lLCB0LAorCQkJCQkJICAgIGJyZWFkY3J1bWJzLmZha2VfaXJxKTsKIAlzdHJ1 Y3QgaW50ZWxfYnJlYWRjcnVtYnMgKmIgPSAmZW5naW5lLT5icmVhZGNydW1iczsKIAogCS8qIFRo ZSB0aW1lciBwZXJzaXN0cyBpbiBjYXNlIHdlIGNhbm5vdCBlbmFibGUgaW50ZXJydXB0cywKQEAg LTc4NywxMiArNzg5LDggQEAgaW50IGludGVsX2VuZ2luZV9pbml0X2JyZWFkY3J1bWJzKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlzcGluX2xvY2tfaW5pdCgmYi0+cmJfbG9jayk7 CiAJc3Bpbl9sb2NrX2luaXQoJmItPmlycV9sb2NrKTsKIAotCXNldHVwX3RpbWVyKCZiLT5mYWtl X2lycSwKLQkJICAgIGludGVsX2JyZWFkY3J1bWJzX2Zha2VfaXJxLAotCQkgICAgKHVuc2lnbmVk IGxvbmcpZW5naW5lKTsKLQlzZXR1cF90aW1lcigmYi0+aGFuZ2NoZWNrLAotCQkgICAgaW50ZWxf YnJlYWRjcnVtYnNfaGFuZ2NoZWNrLAotCQkgICAgKHVuc2lnbmVkIGxvbmcpZW5naW5lKTsKKwl0 aW1lcl9zZXR1cCgmYi0+ZmFrZV9pcnEsIGludGVsX2JyZWFkY3J1bWJzX2Zha2VfaXJxLCAwKTsK Kwl0aW1lcl9zZXR1cCgmYi0+aGFuZ2NoZWNrLCBpbnRlbF9icmVhZGNydW1ic19oYW5nY2hlY2ss IDApOwogCiAJLyogU3Bhd24gYSB0aHJlYWQgdG8gcHJvdmlkZSBhIGNvbW1vbiBib3R0b20taGFs ZiBmb3IgYWxsIHNpZ25hbHMuCiAJICogQXMgdGhpcyBpcyBhbiBhc3luY2hyb25vdXMgaW50ZXJm YWNlIHdlIGNhbm5vdCBzdGVhbCB0aGUgY3VycmVudApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZW5naW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9z ZWxmdGVzdHMvbW9ja19lbmdpbmUuYwppbmRleCBmYzBmZDc0OTg2ODkuLjMzMWMyYjA5ODY5ZSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZW5naW5lLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZW5naW5lLmMKQEAgLTMy LDkgKzMyLDkgQEAgc3RhdGljIHN0cnVjdCBtb2NrX3JlcXVlc3QgKmZpcnN0X3JlcXVlc3Qoc3Ry dWN0IG1vY2tfZW5naW5lICplbmdpbmUpCiAJCQkJCWxpbmspOwogfQogCi1zdGF0aWMgdm9pZCBo d19kZWxheV9jb21wbGV0ZSh1bnNpZ25lZCBsb25nIGRhdGEpCitzdGF0aWMgdm9pZCBod19kZWxh eV9jb21wbGV0ZShzdHJ1Y3QgdGltZXJfbGlzdCAqdCkKIHsKLQlzdHJ1Y3QgbW9ja19lbmdpbmUg KmVuZ2luZSA9ICh0eXBlb2YoZW5naW5lKSlkYXRhOworCXN0cnVjdCBtb2NrX2VuZ2luZSAqZW5n aW5lID0gZnJvbV90aW1lcihlbmdpbmUsIHQsIGh3X2RlbGF5KTsKIAlzdHJ1Y3QgbW9ja19yZXF1 ZXN0ICpyZXF1ZXN0OwogCiAJc3Bpbl9sb2NrKCZlbmdpbmUtPmh3X2xvY2spOwpAQCAtMTYxLDkg KzE2MSw3IEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKm1vY2tfZW5naW5lKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICppOTE1LAogCiAJLyogZmFrZSBodyBxdWV1ZSAqLwogCXNwaW5fbG9ja19p bml0KCZlbmdpbmUtPmh3X2xvY2spOwotCXNldHVwX3RpbWVyKCZlbmdpbmUtPmh3X2RlbGF5LAot CQkgICAgaHdfZGVsYXlfY29tcGxldGUsCi0JCSAgICAodW5zaWduZWQgbG9uZyllbmdpbmUpOwor CXRpbWVyX3NldHVwKCZlbmdpbmUtPmh3X2RlbGF5LCBod19kZWxheV9jb21wbGV0ZSwgMCk7CiAJ SU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+aHdfcXVldWUpOwogCiAJcmV0dXJuICZlbmdpbmUtPmJh c2U7Ci0tIAoyLjEzLjYKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=