From bd0eb1729abee65503ce328a56e8b79c93e90840 Mon Sep 17 00:00:00 2001 From: Inki Dae Date: Wed, 19 Sep 2012 11:02:43 +0900 Subject: [PATCH] --- yaml --- r: 331770 b: refs/heads/master c: 291257cf4cb0da1e32b672b88e73d22d845c8f93 h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/gpu/drm/exynos/exynos_drm_vidi.c | 22 ++++++++++++++++++- trunk/include/drm/exynos_drm.h | 10 +++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 087f25343290..96f24caeb39b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32aeab17457c13e6a448ba0f6f3c03d6705e5592 +refs/heads/master: 291257cf4cb0da1e32b672b88e73d22d845c8f93 diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_vidi.c index c95f7dedb8a0..54b44159caf1 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_vidi.c @@ -56,6 +56,7 @@ struct vidi_context { unsigned int connected; bool vblank_on; bool suspended; + bool direct_vblank; struct work_struct work; struct mutex lock; }; @@ -224,6 +225,15 @@ static int vidi_enable_vblank(struct device *dev) if (!test_and_set_bit(0, &ctx->irq_flags)) ctx->vblank_on = true; + ctx->direct_vblank = true; + + /* + * in case of page flip request, vidi_finish_pageflip function + * will not be called because direct_vblank is true and then + * that function will be called by overlay_ops->commit callback + */ + schedule_work(&ctx->work); + return 0; } @@ -425,7 +435,17 @@ static void vidi_fake_vblank_handler(struct work_struct *work) /* refresh rate is about 50Hz. */ usleep_range(16000, 20000); - drm_handle_vblank(subdrv->drm_dev, manager->pipe); + mutex_lock(&ctx->lock); + + if (ctx->direct_vblank) { + drm_handle_vblank(subdrv->drm_dev, manager->pipe); + ctx->direct_vblank = false; + mutex_unlock(&ctx->lock); + return; + } + + mutex_unlock(&ctx->lock); + vidi_finish_pageflip(subdrv->drm_dev, manager->pipe); } diff --git a/trunk/include/drm/exynos_drm.h b/trunk/include/drm/exynos_drm.h index c20b00181530..0d1c503042d5 100644 --- a/trunk/include/drm/exynos_drm.h +++ b/trunk/include/drm/exynos_drm.h @@ -107,6 +107,16 @@ struct drm_exynos_vidi_connection { uint64_t edid; }; +/* Indicate Exynos specific vblank flags */ +enum e_drm_exynos_vblank { + /* + * this flags is used for Virtual Display module + * to use DRM_IOCTL_WAIT_VBLANK feature. for this, + * user should set this flag to vblwait->request.type + */ + _DRM_VBLANK_EXYNOS_VIDI = 2, +}; + /* memory type definitions. */ enum e_drm_exynos_gem_mem_type { /* Physically Continuous memory and used as default. */