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>

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 124474fe8c6c0b4bdea83ea02812537f4348d85b..25d6b220ee8a49b0bdd1985b124d5ce6b7971180 100644 (file)
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -225,10 +225,9 @@ static void tilcdc_crtc_destroy(struct drm_crtc *crtc)
        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;

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.h b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
index a02eb3736d75e929ff83ff15770e6ac2d61abb6a..13001df7dbe8fd8d3c29e0607448b51daec171bc 100644 (file)
--- a/drivers/gpu/drm/tilcdc/tilcdc_drv.h
+++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.h
@@ -171,10 +171,9 @@ void tilcdc_crtc_set_simulate_vesa_sync(struct drm_crtc *crtc,
 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);
 

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_plane.c b/drivers/gpu/drm/tilcdc/tilcdc_plane.c
index d5635d6cbdff9d2d48b96ca7a86c3e8517bff75b..41911e3110e817ca50869d8f55a9ff019c3d6b36 100644 (file)
--- a/drivers/gpu/drm/tilcdc/tilcdc_plane.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c
@@ -101,10 +101,9 @@ static void tilcdc_plane_atomic_update(struct drm_plane *plane,
        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 = {