aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos
diff options
context:
space:
mode:
authorInki Dae <inki.dae@samsung.com>2011-10-14 00:29:47 -0400
committerDave Airlie <airlied@redhat.com>2011-10-18 05:01:18 -0400
commit8e9cc6a13ac0c6a5a1fef5ca2bda0925832516f3 (patch)
tree639cc5edeff611de20676d34a7b178583bda12f8 /drivers/gpu/drm/exynos
parent19c8b8343d9cb9674fa47103bf2a4abb43757e65 (diff)
drm/exynos: fixed overlay updating time at page flip.
buffer addess is set to shadow register and then applied to real register at vsync front porch time. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/exynos')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_crtc.c4
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_crtc.h1
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fimd.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 654bf3aff71f..0587b52a18bf 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -78,7 +78,7 @@ struct exynos_drm_crtc {
78 unsigned int pipe; 78 unsigned int pipe;
79}; 79};
80 80
81void exynos_drm_crtc_apply(struct drm_crtc *crtc) 81static void exynos_drm_crtc_apply(struct drm_crtc *crtc)
82{ 82{
83 struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); 83 struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
84 struct exynos_drm_overlay *overlay = &exynos_crtc->overlay; 84 struct exynos_drm_overlay *overlay = &exynos_crtc->overlay;
@@ -279,6 +279,8 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
279 goto out; 279 goto out;
280 } 280 }
281 281
282 exynos_drm_crtc_apply(crtc);
283
282 dev_priv->pageflip_event = true; 284 dev_priv->pageflip_event = true;
283 } 285 }
284out: 286out:
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.h b/drivers/gpu/drm/exynos/exynos_drm_crtc.h
index 452b62b23853..c584042d6d2c 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.h
@@ -31,7 +31,6 @@
31 31
32struct exynos_drm_overlay *get_exynos_drm_overlay(struct drm_device *dev, 32struct exynos_drm_overlay *get_exynos_drm_overlay(struct drm_device *dev,
33 struct drm_crtc *crtc); 33 struct drm_crtc *crtc);
34void exynos_drm_crtc_apply(struct drm_crtc *crtc);
35int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr); 34int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr);
36int exynos_drm_crtc_enable_vblank(struct drm_device *dev, int crtc); 35int exynos_drm_crtc_enable_vblank(struct drm_device *dev, int crtc);
37void exynos_drm_crtc_disable_vblank(struct drm_device *dev, int crtc); 36void exynos_drm_crtc_disable_vblank(struct drm_device *dev, int crtc);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 623ba33a74be..9d1138e4fb4e 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -500,8 +500,6 @@ static void fimd_finish_pageflip(struct drm_device *drm_dev, int crtc)
500 500
501 spin_lock_irqsave(&drm_dev->event_lock, flags); 501 spin_lock_irqsave(&drm_dev->event_lock, flags);
502 502
503 exynos_drm_crtc_apply(dev_priv->crtc[crtc]);
504
505 list_for_each_entry_safe(e, t, &dev_priv->pageflip_event_list, 503 list_for_each_entry_safe(e, t, &dev_priv->pageflip_event_list,
506 base.link) { 504 base.link) {
507 do_gettimeofday(&now); 505 do_gettimeofday(&now);