Merge remote-tracking branch 'origin/master' into drm-misc-fixes
[muen/linux.git] / drivers / gpu / drm / qxl / qxl_display.c
index 7babdd8f20fd454f2fdb48298a546eb4178f3e32..e1dd05423e8629cdf7a1547f16b50e3024d39b82 100644 (file)
@@ -378,10 +378,6 @@ qxl_framebuffer_init(struct drm_device *dev,
        return 0;
 }
 
-static void qxl_crtc_dpms(struct drm_crtc *crtc, int mode)
-{
-}
-
 static bool qxl_crtc_mode_fixup(struct drm_crtc *crtc,
                                  const struct drm_display_mode *mode,
                                  struct drm_display_mode *adjusted_mode)
@@ -437,7 +433,7 @@ static void qxl_monitors_config_set(struct qxl_device *qdev,
 
 }
 
-void qxl_mode_set_nofb(struct drm_crtc *crtc)
+static void qxl_mode_set_nofb(struct drm_crtc *crtc)
 {
        struct qxl_device *qdev = crtc->dev->dev_private;
        struct qxl_crtc *qcrtc = to_qxl_crtc(crtc);
@@ -451,12 +447,14 @@ void qxl_mode_set_nofb(struct drm_crtc *crtc)
 
 }
 
-static void qxl_crtc_commit(struct drm_crtc *crtc)
+static void qxl_crtc_atomic_enable(struct drm_crtc *crtc,
+                                  struct drm_crtc_state *old_state)
 {
        DRM_DEBUG("\n");
 }
 
-static void qxl_crtc_disable(struct drm_crtc *crtc)
+static void qxl_crtc_atomic_disable(struct drm_crtc *crtc,
+                                   struct drm_crtc_state *old_state)
 {
        struct qxl_crtc *qcrtc = to_qxl_crtc(crtc);
        struct qxl_device *qdev = crtc->dev->dev_private;
@@ -467,16 +465,15 @@ static void qxl_crtc_disable(struct drm_crtc *crtc)
 }
 
 static const struct drm_crtc_helper_funcs qxl_crtc_helper_funcs = {
-       .dpms = qxl_crtc_dpms,
-       .disable = qxl_crtc_disable,
        .mode_fixup = qxl_crtc_mode_fixup,
        .mode_set_nofb = qxl_mode_set_nofb,
-       .commit = qxl_crtc_commit,
        .atomic_flush = qxl_crtc_atomic_flush,
+       .atomic_enable = qxl_crtc_atomic_enable,
+       .atomic_disable = qxl_crtc_atomic_disable,
 };
 
-int qxl_primary_atomic_check(struct drm_plane *plane,
-                            struct drm_plane_state *state)
+static int qxl_primary_atomic_check(struct drm_plane *plane,
+                                   struct drm_plane_state *state)
 {
        struct qxl_device *qdev = plane->dev->dev_private;
        struct qxl_framebuffer *qfb;
@@ -551,8 +548,8 @@ static void qxl_primary_atomic_disable(struct drm_plane *plane,
        }
 }
 
-int qxl_plane_atomic_check(struct drm_plane *plane,
-                          struct drm_plane_state *state)
+static int qxl_plane_atomic_check(struct drm_plane *plane,
+                                 struct drm_plane_state *state)
 {
        return 0;
 }
@@ -651,8 +648,8 @@ out_free_release:
 
 }
 
-void qxl_cursor_atomic_disable(struct drm_plane *plane,
-                              struct drm_plane_state *old_state)
+static void qxl_cursor_atomic_disable(struct drm_plane *plane,
+                                     struct drm_plane_state *old_state)
 {
        struct qxl_device *qdev = plane->dev->dev_private;
        struct qxl_release *release;
@@ -679,8 +676,8 @@ void qxl_cursor_atomic_disable(struct drm_plane *plane,
        qxl_release_fence_buffer_objects(release);
 }
 
-int qxl_plane_prepare_fb(struct drm_plane *plane,
-                        struct drm_plane_state *new_state)
+static int qxl_plane_prepare_fb(struct drm_plane *plane,
+                               struct drm_plane_state *new_state)
 {
        struct drm_gem_object *obj;
        struct qxl_bo *user_bo;
@@ -791,7 +788,7 @@ static struct drm_plane *qxl_create_plane(struct qxl_device *qdev,
 
        err = drm_universal_plane_init(&qdev->ddev, plane, possible_crtcs,
                                       funcs, formats, num_formats,
-                                      type, NULL);
+                                      NULL, type, NULL);
        if (err)
                goto free_plane;