]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm: omapdrm: Replace encoder mode_fixup with atomic_check
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Thu, 5 Mar 2015 21:04:30 +0000 (23:04 +0200)
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Fri, 12 Jun 2015 19:52:48 +0000 (22:52 +0300)
The encoder .mode_fixup() operation is legacy, atomic updates uses the
new .atomic_check() operation. Convert the encoder driver.

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

index 2aeb41f0881ae3bacf27a6fc7e90be2d737232de..54847ed089ef4edc88660d0b70faabc77a9cba41 100644 (file)
@@ -62,13 +62,6 @@ static const struct drm_encoder_funcs omap_encoder_funcs = {
        .destroy = omap_encoder_destroy,
 };
 
-static bool omap_encoder_mode_fixup(struct drm_encoder *encoder,
-                                 const struct drm_display_mode *mode,
-                                 struct drm_display_mode *adjusted_mode)
-{
-       return true;
-}
-
 static void omap_encoder_mode_set(struct drm_encoder *encoder,
                                struct drm_display_mode *mode,
                                struct drm_display_mode *adjusted_mode)
@@ -117,11 +110,18 @@ static void omap_encoder_enable(struct drm_encoder *encoder)
 {
 }
 
+static int omap_encoder_atomic_check(struct drm_encoder *encoder,
+                                    struct drm_crtc_state *crtc_state,
+                                    struct drm_connector_state *conn_state)
+{
+       return 0;
+}
+
 static const struct drm_encoder_helper_funcs omap_encoder_helper_funcs = {
-       .mode_fixup = omap_encoder_mode_fixup,
        .mode_set = omap_encoder_mode_set,
        .disable = omap_encoder_disable,
        .enable = omap_encoder_enable,
+       .atomic_check = omap_encoder_atomic_check,
 };
 
 /*