diff options
| author | Rob Clark <robdclark@gmail.com> | 2016-03-16 18:18:17 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2016-05-08 10:22:14 -0400 |
| commit | ba00c3f2f0c84456ffe9d548823ff4fb8e4e7ed4 (patch) | |
| tree | 1cddb413a2c1f4281f938f356bf74cfaf33cedcc /drivers/gpu/drm/msm/msm_drv.h | |
| parent | ca762a8ae7f453978a4769af9dcd3cb08e45b932 (diff) | |
| download | op-kernel-dev-ba00c3f2f0c84456ffe9d548823ff4fb8e4e7ed4.zip op-kernel-dev-ba00c3f2f0c84456ffe9d548823ff4fb8e4e7ed4.tar.gz | |
drm/msm: remove fence_cbs
This was only used for atomic commit these days. So instead just give
atomic it's own work-queue where we can do a block on each bo in turn.
Simplifies things a whole bunch and makes the 'struct fence' conversion
easier.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.h')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 6c3f67b..7124c7f 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -109,6 +109,7 @@ struct msm_drm_private { struct list_head inactive_list; struct workqueue_struct *wq; + struct workqueue_struct *atomic_wq; /* crtcs pending async atomic updates: */ uint32_t pending_crtcs; @@ -192,8 +193,8 @@ void *msm_gem_vaddr(struct drm_gem_object *obj); void msm_gem_move_to_active(struct drm_gem_object *obj, struct msm_gpu *gpu, bool write, uint32_t fence); void msm_gem_move_to_inactive(struct drm_gem_object *obj); -int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op, - ktime_t *timeout); +int msm_gem_cpu_sync(struct drm_gem_object *obj, uint32_t op, ktime_t *timeout); +int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op, ktime_t *timeout); int msm_gem_cpu_fini(struct drm_gem_object *obj); void msm_gem_free_object(struct drm_gem_object *obj); int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file, |
