UPSTREAM: drm/rockchip: support atomic asynchronous commit

If drm core requests a async commit, rockchip_drm_atomic_commit
will schedule a work task to update later.

Change-Id: I8d35b157b817f2e7f810968e7b18043414cb17e6
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
(cherry picked from commit f32fad51eec51ad816cecdc3723ab443cd69b61f)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index ab3e0f67539678c7a3978548a08b4265e4d6148b..5edd5ccb8b070cf665f45a5ab2c19b26846afe2d 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -140,6 +140,9 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags)
        if (!private)
                return -ENOMEM;
 
        if (!private)
                return -ENOMEM;
 

+       mutex_init(&private->commit.lock);
+       INIT_WORK(&private->commit.work, rockchip_drm_atomic_work);
+

        drm_dev->dev_private = private;
 
        drm_mode_config_init(drm_dev);
        drm_dev->dev_private = private;
 
        drm_mode_config_init(drm_dev);

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
index 4468f98ec437553309fb58e0f5c2d93e37619af1..bb8b076f1dbb32e0242b4c4dffd8e012eeae3bba 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h
@@ -42,6 +42,13 @@ struct rockchip_crtc_funcs {
        void (*wait_for_update)(struct drm_crtc *crtc);
 };
 
        void (*wait_for_update)(struct drm_crtc *crtc);
 };
 

+struct rockchip_atomic_commit {
+       struct work_struct      work;
+       struct drm_atomic_state *state;
+       struct drm_device *dev;
+       struct mutex lock;
+};
+

 /*
  * Rockchip drm private structure.
  *
 /*
  * Rockchip drm private structure.
  *


@@ -52,8 +59,11 @@ struct rockchip_drm_private {
        struct drm_fb_helper fbdev_helper;
        struct drm_gem_object *fbdev_bo;
        const struct rockchip_crtc_funcs *crtc_funcs[ROCKCHIP_MAX_CRTC];
        struct drm_fb_helper fbdev_helper;
        struct drm_gem_object *fbdev_bo;
        const struct rockchip_crtc_funcs *crtc_funcs[ROCKCHIP_MAX_CRTC];

+
+       struct rockchip_atomic_commit commit;

 };
 
 };
 

+void rockchip_drm_atomic_work(struct work_struct *work);

 int rockchip_register_crtc_funcs(struct drm_crtc *crtc,
                                 const struct rockchip_crtc_funcs *crtc_funcs);
 void rockchip_unregister_crtc_funcs(struct drm_crtc *crtc);
 int rockchip_register_crtc_funcs(struct drm_crtc *crtc,
                                 const struct rockchip_crtc_funcs *crtc_funcs);
 void rockchip_unregister_crtc_funcs(struct drm_crtc *crtc);

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
index 5569849e6ce493804c2e8ec9950dbd70b83b52dd..0e58e1d530abcc18a7c8912b92e5a17b058a9a33 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
@@ -210,20 +210,11 @@ rockchip_atomic_wait_for_complete(struct drm_atomic_state *old_state)
        }
 }
 
        }
 }
 

-int rockchip_drm_atomic_commit(struct drm_device *dev,
-                              struct drm_atomic_state *state,
-                              bool async)
+static void
+rockchip_atomic_commit_complete(struct rockchip_atomic_commit *commit)

 {
 {

-       int ret;
-
-       if (async)
-               return -EBUSY;
-
-       ret = drm_atomic_helper_prepare_planes(dev, state);
-       if (ret)
-               return ret;
-
-       drm_atomic_helper_swap_state(dev, state);
+       struct drm_atomic_state *state = commit->state;
+       struct drm_device *dev = commit->dev;

 
        /*
         * TODO: do fence wait here.
 
        /*
         * TODO: do fence wait here.


@@ -255,6 +246,43 @@ int rockchip_drm_atomic_commit(struct drm_device *dev,
        drm_atomic_helper_cleanup_planes(dev, state);
 
        drm_atomic_state_free(state);
        drm_atomic_helper_cleanup_planes(dev, state);
 
        drm_atomic_state_free(state);

+}
+
+void rockchip_drm_atomic_work(struct work_struct *work)
+{
+       struct rockchip_atomic_commit *commit = container_of(work,
+                                       struct rockchip_atomic_commit, work);
+
+       rockchip_atomic_commit_complete(commit);
+}
+
+int rockchip_drm_atomic_commit(struct drm_device *dev,
+                              struct drm_atomic_state *state,
+                              bool async)
+{
+       struct rockchip_drm_private *private = dev->dev_private;
+       struct rockchip_atomic_commit *commit = &private->commit;
+       int ret;
+
+       ret = drm_atomic_helper_prepare_planes(dev, state);
+       if (ret)
+               return ret;
+
+       /* serialize outstanding asynchronous commits */
+       mutex_lock(&commit->lock);
+       flush_work(&commit->work);
+
+       drm_atomic_helper_swap_state(dev, state);
+
+       commit->dev = dev;
+       commit->state = state;
+
+       if (async)
+               schedule_work(&commit->work);
+       else
+               rockchip_atomic_commit_complete(commit);
+
+       mutex_unlock(&commit->lock);

 
        return 0;
 }
 
        return 0;
 }