projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
msm
/
msm_gpu.c
diff --git
a/drivers/gpu/drm/msm/msm_gpu.c
b/drivers/gpu/drm/msm/msm_gpu.c
index
3bab937
..
4583d61
100644
(file)
--- a/
drivers/gpu/drm/msm/msm_gpu.c
+++ b/
drivers/gpu/drm/msm/msm_gpu.c
@@
-268,6
+268,8
@@
static void retire_worker(struct work_struct *work)
struct drm_device *dev = gpu->dev;
uint32_t fence = gpu->funcs->last_fence(gpu);
struct drm_device *dev = gpu->dev;
uint32_t fence = gpu->funcs->last_fence(gpu);
+ msm_update_fence(gpu->dev, fence);
+
mutex_lock(&dev->struct_mutex);
while (!list_empty(&gpu->active_list)) {
mutex_lock(&dev->struct_mutex);
while (!list_empty(&gpu->active_list)) {
@@
-287,8
+289,6
@@
static void retire_worker(struct work_struct *work)
}
}
}
}
- msm_update_fence(gpu->dev, fence);
-
mutex_unlock(&dev->struct_mutex);
}
mutex_unlock(&dev->struct_mutex);
}