[3/7] drm/cirrus: phase 3: atomic updates of planes

Commit Message

John Hunter July 30, 2015, 10:08 a.m. UTC

From: Zhao Junwang <[e-mail]>

Now that phase 1 and 2 are complete we can switch the
update/disable_plane callbacks to their atomic version

Signed-off-by: Zhao Junwang <[e-mail]>
---
 drivers/gpu/drm/cirrus/cirrus_main.c |    3 +++
 drivers/gpu/drm/cirrus/cirrus_mode.c |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/gpu/drm/cirrus/cirrus_main.c b/drivers/gpu/drm/cirrus/cirrus_main.c
index d95de34..cfa92bc 100644
--- a/drivers/gpu/drm/cirrus/cirrus_main.c
+++ b/drivers/gpu/drm/cirrus/cirrus_main.c
@@ -10,6 +10,7 @@ 
  */
 #include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_atomic_helper.h>
 
 #include "cirrus_drv.h"
 
@@ -82,6 +83,8 @@  cirrus_user_framebuffer_create(struct drm_device *dev,
 
 static const struct drm_mode_config_funcs cirrus_mode_funcs = {
 	.fb_create = cirrus_user_framebuffer_create,
+	.atomic_check = drm_atomic_helper_check,
+	.atomic_commit = drm_atomic_helper_commit,
 };
 
 /* Unmap the framebuffer from the core and release the memory */
diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c
index 42a4d86..e8f038b 100644
--- a/drivers/gpu/drm/cirrus/cirrus_mode.c
+++ b/drivers/gpu/drm/cirrus/cirrus_mode.c
@@ -431,8 +431,8 @@  static void cirrus_plane_atomic_disable(struct drm_plane *plane,
 }
 
 static const struct drm_plane_funcs cirrus_plane_funcs = {
-	.update_plane = drm_plane_helper_update,
-	.disable_plane = drm_plane_helper_disable,
+	.update_plane = drm_atomic_helper_update_plane,
+	.disable_plane = drm_atomic_helper_disable_plane,
 	.reset = drm_atomic_helper_plane_reset,
 	.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
 	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,