diff options
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0177-drm-vc4-Convert-timers-to-use-timer_setup.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0177-drm-vc4-Convert-timers-to-use-timer_setup.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0177-drm-vc4-Convert-timers-to-use-timer_setup.patch b/target/linux/brcm2708/patches-4.14/950-0177-drm-vc4-Convert-timers-to-use-timer_setup.patch new file mode 100644 index 0000000000..d3883dc74a --- /dev/null +++ b/target/linux/brcm2708/patches-4.14/950-0177-drm-vc4-Convert-timers-to-use-timer_setup.patch @@ -0,0 +1,75 @@ +From 98f53bafea86a24d2ae510a72cb24234f6cbb7f2 Mon Sep 17 00:00:00 2001 +From: Kees Cook <keescook@chromium.org> +Date: Tue, 24 Oct 2017 08:16:48 -0700 +Subject: [PATCH 177/454] drm/vc4: Convert timers to use timer_setup() + +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: Eric Anholt <eric@anholt.net> +Cc: David Airlie <airlied@linux.ie> +Cc: dri-devel@lists.freedesktop.org +Signed-off-by: Kees Cook <keescook@chromium.org> +Signed-off-by: Eric Anholt <eric@anholt.net> +Link: https://patchwork.freedesktop.org/patch/msgid/20171024151648.GA104538@beast +Reviewed-by: Eric Anholt <eric@anholt.net> +(cherry picked from commit 33b54ea1109721dcd07d3f7ee753c07482021eed) +--- + drivers/gpu/drm/vc4/vc4_bo.c | 9 +++------ + drivers/gpu/drm/vc4/vc4_gem.c | 10 ++++------ + 2 files changed, 7 insertions(+), 12 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_bo.c ++++ b/drivers/gpu/drm/vc4/vc4_bo.c +@@ -677,10 +677,9 @@ void vc4_bo_dec_usecnt(struct vc4_bo *bo + mutex_unlock(&bo->madv_lock); + } + +-static void vc4_bo_cache_time_timer(unsigned long data) ++static void vc4_bo_cache_time_timer(struct timer_list *t) + { +- struct drm_device *dev = (struct drm_device *)data; +- struct vc4_dev *vc4 = to_vc4_dev(dev); ++ struct vc4_dev *vc4 = from_timer(vc4, t, bo_cache.time_timer); + + schedule_work(&vc4->bo_cache.time_work); + } +@@ -1042,9 +1041,7 @@ int vc4_bo_cache_init(struct drm_device + INIT_LIST_HEAD(&vc4->bo_cache.time_list); + + INIT_WORK(&vc4->bo_cache.time_work, vc4_bo_cache_time_work); +- setup_timer(&vc4->bo_cache.time_timer, +- vc4_bo_cache_time_timer, +- (unsigned long)dev); ++ timer_setup(&vc4->bo_cache.time_timer, vc4_bo_cache_time_timer, 0); + + return 0; + } +--- a/drivers/gpu/drm/vc4/vc4_gem.c ++++ b/drivers/gpu/drm/vc4/vc4_gem.c +@@ -312,10 +312,10 @@ vc4_reset_work(struct work_struct *work) + } + + static void +-vc4_hangcheck_elapsed(unsigned long data) ++vc4_hangcheck_elapsed(struct timer_list *t) + { +- struct drm_device *dev = (struct drm_device *)data; +- struct vc4_dev *vc4 = to_vc4_dev(dev); ++ struct vc4_dev *vc4 = from_timer(vc4, t, hangcheck.timer); ++ struct drm_device *dev = vc4->dev; + uint32_t ct0ca, ct1ca; + unsigned long irqflags; + struct vc4_exec_info *bin_exec, *render_exec; +@@ -1156,9 +1156,7 @@ vc4_gem_init(struct drm_device *dev) + spin_lock_init(&vc4->job_lock); + + INIT_WORK(&vc4->hangcheck.reset_work, vc4_reset_work); +- setup_timer(&vc4->hangcheck.timer, +- vc4_hangcheck_elapsed, +- (unsigned long)dev); ++ timer_setup(&vc4->hangcheck.timer, vc4_hangcheck_elapsed, 0); + + INIT_WORK(&vc4->job_done_work, vc4_job_done_work); + |