diff options
| author | Rob Clark <[email protected]> | 2025-06-29 02:54:49 +0000 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2025-06-29 02:54:49 +0000 |
| commit | 74f1af95820fc2ee580a775a3a17c416db30b38c (patch) | |
| tree | 7c82cffe3c1d99b99053d28b57a4ac5d81f85844 /drivers/gpu/drm/msm/msm_gpu.c | |
| parent | drm/msm: Fix inverted WARN_ON() logic (diff) | |
| parent | Merge tag 'drm-misc-next-2025-06-26' of https://gitlab.freedesktop.org/drm/mi... (diff) | |
| download | kernel-74f1af95820fc2ee580a775a3a17c416db30b38c.tar.gz kernel-74f1af95820fc2ee580a775a3a17c416db30b38c.zip | |
Merge remote-tracking branch 'drm/drm-next' into msm-next
Back-merge drm-next to (indirectly) get arm-smmu updates for making
stall-on-fault more reliable.
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gpu.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 457f019d507e..3947f7ba1421 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -520,7 +520,7 @@ static bool made_progress(struct msm_gpu *gpu, struct msm_ringbuffer *ring) static void hangcheck_handler(struct timer_list *t) { - struct msm_gpu *gpu = from_timer(gpu, t, hangcheck_timer); + struct msm_gpu *gpu = timer_container_of(gpu, t, hangcheck_timer); struct drm_device *dev = gpu->dev; struct msm_ringbuffer *ring = gpu->funcs->active_ring(gpu); uint32_t fence = ring->memptrs->fence; |