Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d5310c0 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Inki Dae
Browse files

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: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent ea8802d3

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/exynos/exynos_drm_plane.c

+5 −10
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/exynos/exynos_drm_plane.h

+0 −1
Original line number Diff line number Diff line
@@ -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,