diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2014-11-13 22:17:46 -0200 |
|---|---|---|
| committer | Inki Dae <daeinki@gmail.com> | 2015-01-25 21:28:05 +0900 |
| commit | 9d5310c024691cadb2dcab1a74b5ab067255f1be (patch) | |
| tree | 673101942d111be034e0b46d9e401df52b1e1904 | |
| parent | ea8802d3ddde245e8b8a56a19d70e9b97737880f (diff) | |
drm/exynos: remove exynos_plane_commit() wrapper
It's doing nothing but calling exynos_crtc->ops->win_commit(), so let's
call this directly to avoid extra layers of abstraction.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_plane.c | 15 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_plane.h | 1 |
3 files changed, 8 insertions, 12 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index e946b5f5e3ac..a43e25d57a02 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -59,10 +59,12 @@ static void exynos_drm_crtc_commit(struct drm_crtc *crtc) { struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); struct exynos_drm_manager *manager = exynos_crtc->manager; + struct exynos_drm_plane *exynos_plane = to_exynos_plane(crtc->primary); exynos_drm_crtc_dpms(crtc, DRM_MODE_DPMS_ON); - exynos_plane_commit(crtc->primary); + if (manager->ops->win_commit) + manager->ops->win_commit(manager, exynos_plane->zpos); if (manager->ops->commit) manager->ops->commit(manager); diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c index 4fe3c2b555b1..aa9cc9a0a033 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c @@ -139,15 +139,6 @@ int exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, return 0; } -void exynos_plane_commit(struct drm_plane *plane) -{ - struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane); - struct exynos_drm_manager *manager = to_exynos_crtc(plane->crtc)->manager; - - if (manager->ops->win_commit) - manager->ops->win_commit(manager, exynos_plane->zpos); -} - void exynos_plane_dpms(struct drm_plane *plane, int mode) { struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane); @@ -181,6 +172,9 @@ exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h) { + + struct exynos_drm_manager *manager = to_exynos_crtc(crtc)->manager; + struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane); int ret; ret = exynos_plane_mode_set(plane, crtc, fb, crtc_x, crtc_y, @@ -189,7 +183,8 @@ exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, if (ret < 0) return ret; - exynos_plane_commit(plane); + if (manager->ops->win_commit) + manager->ops->win_commit(manager, exynos_plane->zpos); return 0; } diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.h b/drivers/gpu/drm/exynos/exynos_drm_plane.h index 0d1986b115f8..3c239891926e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.h +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.h @@ -14,7 +14,6 @@ int exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, unsigned int crtc_w, unsigned int crtc_h, uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h); -void exynos_plane_commit(struct drm_plane *plane); void exynos_plane_dpms(struct drm_plane *plane, int mode); struct drm_plane *exynos_plane_init(struct drm_device *dev, unsigned long possible_crtcs, |