From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kees Cook Subject: [PATCH] drm/i915/selftests: Convert timers to use timer_setup() Date: Tue, 24 Oct 2017 08:13:44 -0700 Message-ID: <20171024151344.GA104417@beast> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula Cc: David Airlie , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi List-Id: dri-devel@lists.freedesktop.org SW4gcHJlcGFyYXRpb24gZm9yIHVuY29uZGl0aW9uYWxseSBwYXNzaW5nIHRoZSBzdHJ1Y3QgdGlt ZXJfbGlzdCBwb2ludGVyIHRvCmFsbCB0aW1lciBjYWxsYmFja3MsIHN3aXRjaCB0byB1c2luZyB0 aGUgbmV3IHRpbWVyX3NldHVwKCkgYW5kIGZyb21fdGltZXIoKQp0byBwYXNzIHRoZSB0aW1lciBw b2ludGVyIGV4cGxpY2l0bHkuCgpDYzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGxpbnV4Lmlu dGVsLmNvbT4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVs LmNvbT4KQ2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KQ2M6IERhdmlk IEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJz dWxpbkBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51 az4KQ2M6IGludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKQ2M6IGRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKU2lnbmVkLW9mZi1ieTogS2VlcyBDb29rIDxrZWVzY29va0BjaHJv bWl1bS5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2xpYl9zd19mZW5j ZS5jIHwgNiArKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2xpYl9z d19mZW5jZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2xpYl9zd19mZW5jZS5j CmluZGV4IDM3OTBmZGY0NGExYS4uYjI2ZjA3YjU1ZDg2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9zZWxmdGVzdHMvbGliX3N3X2ZlbmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvc2VsZnRlc3RzL2xpYl9zd19mZW5jZS5jCkBAIC00OSw5ICs0OSw5IEBAIHZvaWQgb25z dGFja19mZW5jZV9maW5pKHN0cnVjdCBpOTE1X3N3X2ZlbmNlICpmZW5jZSkKIAlpOTE1X3N3X2Zl bmNlX2ZpbmkoZmVuY2UpOwogfQogCi1zdGF0aWMgdm9pZCB0aW1lZF9mZW5jZV93YWtlKHVuc2ln bmVkIGxvbmcgZGF0YSkKK3N0YXRpYyB2b2lkIHRpbWVkX2ZlbmNlX3dha2Uoc3RydWN0IHRpbWVy X2xpc3QgKnQpCiB7Ci0Jc3RydWN0IHRpbWVkX2ZlbmNlICp0ZiA9IChzdHJ1Y3QgdGltZWRfZmVu Y2UgKilkYXRhOworCXN0cnVjdCB0aW1lZF9mZW5jZSAqdGYgPSBmcm9tX3RpbWVyKHRmLCB0LCB0 aW1lcik7CiAKIAlpOTE1X3N3X2ZlbmNlX2NvbW1pdCgmdGYtPmZlbmNlKTsKIH0KQEAgLTYwLDcg KzYwLDcgQEAgdm9pZCB0aW1lZF9mZW5jZV9pbml0KHN0cnVjdCB0aW1lZF9mZW5jZSAqdGYsIHVu c2lnbmVkIGxvbmcgZXhwaXJlcykKIHsKIAlvbnN0YWNrX2ZlbmNlX2luaXQoJnRmLT5mZW5jZSk7 CiAKLQlzZXR1cF90aW1lcl9vbl9zdGFjaygmdGYtPnRpbWVyLCB0aW1lZF9mZW5jZV93YWtlLCAo dW5zaWduZWQgbG9uZyl0Zik7CisJdGltZXJfc2V0dXBfb25fc3RhY2soJnRmLT50aW1lciwgdGlt ZWRfZmVuY2Vfd2FrZSwgMCk7CiAKIAlpZiAodGltZV9hZnRlcihleHBpcmVzLCBqaWZmaWVzKSkK IAkJbW9kX3RpbWVyKCZ0Zi0+dGltZXIsIGV4cGlyZXMpOwotLSAKMi43LjQKCgotLSAKS2VlcyBD b29rClBpeGVsIFNlY3VyaXR5Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932205AbdJXPNt (ORCPT ); Tue, 24 Oct 2017 11:13:49 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:53261 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751280AbdJXPNr (ORCPT ); Tue, 24 Oct 2017 11:13:47 -0400 X-Google-Smtp-Source: ABhQp+SIFrcirkIxFOZvOP86VVolb73eYN2TYW9Rbk6r375FNRIK1Xsw6cIkEYZRNywxXI4hozOz+g== Date: Tue, 24 Oct 2017 08:13:44 -0700 From: Kees Cook To: Jani Nikula Cc: Joonas Lahtinen , Rodrigo Vivi , David Airlie , Tvrtko Ursulin , Chris Wilson , linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/i915/selftests: Convert timers to use timer_setup() Message-ID: <20171024151344.GA104417@beast> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: David Airlie Cc: Tvrtko Ursulin Cc: Chris Wilson Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Kees Cook --- drivers/gpu/drm/i915/selftests/lib_sw_fence.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/selftests/lib_sw_fence.c b/drivers/gpu/drm/i915/selftests/lib_sw_fence.c index 3790fdf44a1a..b26f07b55d86 100644 --- a/drivers/gpu/drm/i915/selftests/lib_sw_fence.c +++ b/drivers/gpu/drm/i915/selftests/lib_sw_fence.c @@ -49,9 +49,9 @@ void onstack_fence_fini(struct i915_sw_fence *fence) i915_sw_fence_fini(fence); } -static void timed_fence_wake(unsigned long data) +static void timed_fence_wake(struct timer_list *t) { - struct timed_fence *tf = (struct timed_fence *)data; + struct timed_fence *tf = from_timer(tf, t, timer); i915_sw_fence_commit(&tf->fence); } @@ -60,7 +60,7 @@ void timed_fence_init(struct timed_fence *tf, unsigned long expires) { onstack_fence_init(&tf->fence); - setup_timer_on_stack(&tf->timer, timed_fence_wake, (unsigned long)tf); + timer_setup_on_stack(&tf->timer, timed_fence_wake, 0); if (time_after(expires, jiffies)) mod_timer(&tf->timer, expires); -- 2.7.4 -- Kees Cook Pixel Security