瀏覽代碼

staging: vboxvideo: Replace crtc_helper enable/disable functions

Replace vbox_crtc_commit and vbox_crtc_disable with
vbox_crtc_atomic_[en|dis]able which are the preferred callbacks for
these for atomic drivers.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Hans de Goede 6 年之前
父節點
當前提交
33f48cc1f1
共有 1 個文件被更改,包括 6 次插入4 次删除
  1. 6 4
      drivers/staging/vboxvideo/vbox_mode.c

+ 6 - 4
drivers/staging/vboxvideo/vbox_mode.c

@@ -229,11 +229,13 @@ static void vbox_crtc_set_base_and_mode(struct drm_crtc *crtc,
 	mutex_unlock(&vbox->hw_mutex);
 	mutex_unlock(&vbox->hw_mutex);
 }
 }
 
 
-static void vbox_crtc_disable(struct drm_crtc *crtc)
+static void vbox_crtc_atomic_enable(struct drm_crtc *crtc,
+				    struct drm_crtc_state *old_crtc_state)
 {
 {
 }
 }
 
 
-static void vbox_crtc_commit(struct drm_crtc *crtc)
+static void vbox_crtc_atomic_disable(struct drm_crtc *crtc,
+				     struct drm_crtc_state *old_crtc_state)
 {
 {
 }
 }
 
 
@@ -254,8 +256,8 @@ static void vbox_crtc_atomic_flush(struct drm_crtc *crtc,
 }
 }
 
 
 static const struct drm_crtc_helper_funcs vbox_crtc_helper_funcs = {
 static const struct drm_crtc_helper_funcs vbox_crtc_helper_funcs = {
-	.disable = vbox_crtc_disable,
-	.commit = vbox_crtc_commit,
+	.atomic_enable = vbox_crtc_atomic_enable,
+	.atomic_disable = vbox_crtc_atomic_disable,
 	.atomic_flush = vbox_crtc_atomic_flush,
 	.atomic_flush = vbox_crtc_atomic_flush,
 };
 };