drm/msm: small fence cleanup

Give ourselves a way to wait for certain fence #..  makes it easier to
wait on a set of bo's, which we'll need for atomic.

Signed-off-by: Rob Clark <robdclark@gmail.com>

4 files changed, 39 insertions, 21 deletions

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 5717d4ec1a2c..1456b1c3e890 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -619,6 +619,26 @@ int msm_wait_fence_interruptable(struct drm_device *dev, uint32_t fence,
         return ret;
 }
 
+int msm_queue_fence_cb(struct drm_device *dev,
+                struct msm_fence_cb *cb, uint32_t fence)
+{
+        struct msm_drm_private *priv = dev->dev_private;
+        int ret = 0;
+
+        mutex_lock(&dev->struct_mutex);
+        if (!list_empty(&cb->work.entry)) {
+                ret = -EINVAL;
+        } else if (fence > priv->completed_fence) {
+                cb->fence = fence;
+                list_add_tail(&cb->work.entry, &priv->fence_cbs);
+        } else {
+                queue_work(priv->wq, &cb->work);
+        }
+        mutex_unlock(&dev->struct_mutex);
+
+        return ret;
+}
+
 /* called from workqueue */
 void msm_update_fence(struct drm_device *dev, uint32_t fence)
 {
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h
index c763c19405de..5901be444777 100644
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -154,6 +154,8 @@ int msm_register_mmu(struct drm_device *dev, struct msm_mmu *mmu);
 
 int msm_wait_fence_interruptable(struct drm_device *dev, uint32_t fence,
                 struct timespec *timeout);
+int msm_queue_fence_cb(struct drm_device *dev,
+                struct msm_fence_cb *cb, uint32_t fence);
 void msm_update_fence(struct drm_device *dev, uint32_t fence);
 
 int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 4b1b82adabde..8207862b70d1 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -397,23 +397,10 @@ void *msm_gem_vaddr(struct drm_gem_object *obj)
 int msm_gem_queue_inactive_cb(struct drm_gem_object *obj,
                 struct msm_fence_cb *cb)
 {
-        struct drm_device *dev = obj->dev;
-        struct msm_drm_private *priv = dev->dev_private;
         struct msm_gem_object *msm_obj = to_msm_bo(obj);
-        int ret = 0;
-
-        mutex_lock(&dev->struct_mutex);
-        if (!list_empty(&cb->work.entry)) {
-                ret = -EINVAL;
-        } else if (is_active(msm_obj)) {
-                cb->fence = max(msm_obj->read_fence, msm_obj->write_fence);
-                list_add_tail(&cb->work.entry, &priv->fence_cbs);
-        } else {
-                queue_work(priv->wq, &cb->work);
-        }
-        mutex_unlock(&dev->struct_mutex);
-
-        return ret;
+        uint32_t fence = msm_gem_fence(msm_obj,
+                        MSM_PREP_READ | MSM_PREP_WRITE);
+        return msm_queue_fence_cb(obj->dev, cb, fence);
 }
 
 void msm_gem_move_to_active(struct drm_gem_object *obj,
@@ -452,12 +439,8 @@ int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op,
         int ret = 0;
 
         if (is_active(msm_obj)) {
-                uint32_t fence = 0;
+                uint32_t fence = msm_gem_fence(msm_obj, op);
 
-                if (op & MSM_PREP_READ)
-                        fence = msm_obj->write_fence;
-                if (op & MSM_PREP_WRITE)
-                        fence = max(fence, msm_obj->read_fence);
                 if (op & MSM_PREP_NOSYNC)
                         timeout = NULL;
 
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
index bfb052688f8e..8fbbd0594c46 100644
--- a/drivers/gpu/drm/msm/msm_gem.h
+++ b/drivers/gpu/drm/msm/msm_gem.h
@@ -70,6 +70,19 @@ static inline bool is_active(struct msm_gem_object *msm_obj)
         return msm_obj->gpu != NULL;
 }
 
+static inline uint32_t msm_gem_fence(struct msm_gem_object *msm_obj,
+                uint32_t op)
+{
+        uint32_t fence = 0;
+
+        if (op & MSM_PREP_READ)
+                fence = msm_obj->write_fence;
+        if (op & MSM_PREP_WRITE)
+                fence = max(fence, msm_obj->read_fence);
+
+        return fence;
+}
+
 #define MAX_CMDS 4
 
 /* Created per submit-ioctl, to track bo's and cmdstream bufs, etc,