commit e0e344e620b11b76376027087574f8ae1c7807fd
author Jyri Sarha <jsarha@ti.com> Wed Jun 22 17:21:06 2016 +0300
committer Jyri Sarha <jsarha@ti.com> Mon Aug 08 23:05:19 2016 +0300
tree 1004844bcce22407bcc64f4997d39f3134259c76
parent d81b7f34034034e17409809a71d013ae314ae81c

drm/tilcdc: Change tilcdc_crtc_page_flip() to tilcdc_crtc_update_fb()

Change tilcdc_crtc_page_flip() to tilcdc_crtc_update_fb(). The
function is not used as a page_flip() callback anymore so it is only
confusing to call it that. The function should only be used by dummy
primary plane commit() callback.

Signed-off-by: Jyri Sarha <jsarha@ti.com>

drivers/gpu/drm/tilcdc/tilcdc_crtc.c

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 124474f..25d6b22 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -225,10 +225,9 @@
 	drm_flip_work_cleanup(&tilcdc_crtc->unref_work);
 }
 
-int tilcdc_crtc_page_flip(struct drm_crtc *crtc,
+int tilcdc_crtc_update_fb(struct drm_crtc *crtc,
 		struct drm_framebuffer *fb,
-		struct drm_pending_vblank_event *event,
-		uint32_t page_flip_flags)
+		struct drm_pending_vblank_event *event)
 {
 	struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc);
 	struct drm_device *dev = crtc->dev;

drivers/gpu/drm/tilcdc/tilcdc_drv.h

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.h b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
index a02eb373..13001df 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.h
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
@@ -171,10 +171,9 @@
 int tilcdc_crtc_mode_valid(struct drm_crtc *crtc, struct drm_display_mode *mode);
 int tilcdc_crtc_max_width(struct drm_crtc *crtc);
 void tilcdc_crtc_disable(struct drm_crtc *crtc);
-int tilcdc_crtc_page_flip(struct drm_crtc *crtc,
+int tilcdc_crtc_update_fb(struct drm_crtc *crtc,
 		struct drm_framebuffer *fb,
-		struct drm_pending_vblank_event *event,
-		uint32_t page_flip_flags);
+		struct drm_pending_vblank_event *event);
 
 int tilcdc_plane_init(struct drm_device *dev, struct drm_plane *plane);
 

drivers/gpu/drm/tilcdc/tilcdc_plane.c

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_plane.c b/drivers/gpu/drm/tilcdc/tilcdc_plane.c
index d5635d6..41911e3 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_plane.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c
@@ -101,10 +101,9 @@
 	if (WARN_ON(!state->fb || !state->crtc->state))
 		return;
 
-	tilcdc_crtc_page_flip(state->crtc,
+	tilcdc_crtc_update_fb(state->crtc,
 			      state->fb,
-			      state->crtc->state->event,
-			      0);
+			      state->crtc->state->event);
 }
 
 static const struct drm_plane_helper_funcs plane_helper_funcs = {