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

Commit 0e0a649f authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Inki Dae
Browse files

drm/exynos: unify plane update on exynos_update_plane() 



We can safely use the exynos_update_plane() to update the plane
framebuffer for both the overlay and primary planes.

Note that this patch removes a call to manager->ops->commit() in
exynos_drm_crtc_mode_set_commit(). The commit() call is used only by the
fimd driver to set underlying timings and need only in full modeset
operations. For plane update only win_commit is needed.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 9d5310c0

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+2 −15
Original line number Diff line number Diff line
@@ -117,12 +117,9 @@ static int exynos_drm_crtc_mode_set_commit(struct drm_crtc *crtc, int x, int y, 
					  struct drm_framebuffer *old_fb)

{

	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);

	struct drm_framebuffer *fb = crtc->primary->fb;

	unsigned int crtc_w;

	unsigned int crtc_h;

	int ret;



	/* when framebuffer changing is requested, crtc's dpms should be on */

	if (exynos_crtc->dpms > DRM_MODE_DPMS_ON) {
@@ -133,18 +130,8 @@ static int exynos_drm_crtc_mode_set_commit(struct drm_crtc *crtc, int x, int y, 
	crtc_w = fb->width - x;

	crtc_h = fb->height - y;



	ret = exynos_plane_mode_set(crtc->primary, crtc, fb, 0, 0,

	return exynos_update_plane(crtc->primary, crtc, fb, 0, 0,

				   crtc_w, crtc_h, x, y, crtc_w, crtc_h);

	if (ret)

		return ret;



	if (manager->ops->win_commit)

		manager->ops->win_commit(manager, exynos_plane->zpos);



	if (manager->ops->commit)

		manager->ops->commit(manager);



	return 0;

}



static int exynos_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,

drivers/gpu/drm/exynos/exynos_drm_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void exynos_plane_dpms(struct drm_plane *plane, int mode) 
	}

}



static int

int

exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,

		     struct drm_framebuffer *fb, int crtc_x, int crtc_y,

		     unsigned int crtc_w, unsigned int crtc_h,

drivers/gpu/drm/exynos/exynos_drm_plane.h

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ 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);

int exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,

			struct drm_framebuffer *fb, int crtc_x, int crtc_y,

			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_dpms(struct drm_plane *plane, int mode);

struct drm_plane *exynos_plane_init(struct drm_device *dev,

				    unsigned long possible_crtcs,