redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
hifive-unleashed-5.1
Mark Yao 2015-12-16 18:09:38 +08:00
parent ce3887ed0d
commit f32fad51ee
3 changed files with 54 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
View File

@ -140,6 +140,9 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags)
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);

10
drivers/gpu/drm/rockchip/rockchip_drm_drv.h
View File

@ -42,6 +42,13 @@ struct rockchip_crtc_funcs {
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.
*
@ -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 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);

54
drivers/gpu/drm/rockchip/rockchip_drm_fb.c
View File

@ -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.
@ -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);
}
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;
}