]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm: omapdrm: Rename omap_crtc_page_flip_locked to omap_crtc_page_flip
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Sun, 18 Jan 2015 14:36:19 +0000 (16:36 +0200)
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Fri, 12 Jun 2015 19:52:45 +0000 (22:52 +0300)
The operation is called page_flip, rename its implementation
accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/gpu/drm/omapdrm/omap_crtc.c

index e5fb8c6e25e62201ec566a440be5c43f8da6a8ad..7ef9147bde734fc5e56acd3e2fd15107b8f403ed 100644 (file)
@@ -534,10 +534,10 @@ static void page_flip_cb(void *arg)
        queue_work(priv->wq, &omap_crtc->page_flip_work);
 }
 
-static int omap_crtc_page_flip_locked(struct drm_crtc *crtc,
-                struct drm_framebuffer *fb,
-                struct drm_pending_vblank_event *event,
-                uint32_t page_flip_flags)
+static int omap_crtc_page_flip(struct drm_crtc *crtc,
+                              struct drm_framebuffer *fb,
+                              struct drm_pending_vblank_event *event,
+                              uint32_t page_flip_flags)
 {
        struct drm_device *dev = crtc->dev;
        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
@@ -589,7 +589,7 @@ static int omap_crtc_set_property(struct drm_crtc *crtc,
 static const struct drm_crtc_funcs omap_crtc_funcs = {
        .set_config = drm_crtc_helper_set_config,
        .destroy = omap_crtc_destroy,
-       .page_flip = omap_crtc_page_flip_locked,
+       .page_flip = omap_crtc_page_flip,
        .set_property = omap_crtc_set_property,
 };