Commit 07866963 authored by Thierry Reding's avatar Thierry Reding

drm/tegra: Atomic conversion, phase 3, step 1

Switch out the regular plane helpers for the atomic plane helpers. Also
use the default atomic helpers to implement the ->atomic_check() and
->atomic_commit() callbacks. The driver now exclusively uses the atomic
interfaces.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 9d44189f
...@@ -397,8 +397,8 @@ static void tegra_primary_plane_destroy(struct drm_plane *plane) ...@@ -397,8 +397,8 @@ static void tegra_primary_plane_destroy(struct drm_plane *plane)
} }
static const struct drm_plane_funcs tegra_primary_plane_funcs = { static const struct drm_plane_funcs tegra_primary_plane_funcs = {
.update_plane = drm_plane_helper_update, .update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_plane_helper_disable, .disable_plane = drm_atomic_helper_disable_plane,
.destroy = tegra_primary_plane_destroy, .destroy = tegra_primary_plane_destroy,
.reset = drm_atomic_helper_plane_reset, .reset = drm_atomic_helper_plane_reset,
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
...@@ -683,8 +683,8 @@ static void tegra_cursor_atomic_disable(struct drm_plane *plane, ...@@ -683,8 +683,8 @@ static void tegra_cursor_atomic_disable(struct drm_plane *plane,
} }
static const struct drm_plane_funcs tegra_cursor_plane_funcs = { static const struct drm_plane_funcs tegra_cursor_plane_funcs = {
.update_plane = drm_plane_helper_update, .update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_plane_helper_disable, .disable_plane = drm_atomic_helper_disable_plane,
.destroy = tegra_plane_destroy, .destroy = tegra_plane_destroy,
.reset = drm_atomic_helper_plane_reset, .reset = drm_atomic_helper_plane_reset,
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
...@@ -733,8 +733,8 @@ static void tegra_overlay_plane_destroy(struct drm_plane *plane) ...@@ -733,8 +733,8 @@ static void tegra_overlay_plane_destroy(struct drm_plane *plane)
} }
static const struct drm_plane_funcs tegra_overlay_plane_funcs = { static const struct drm_plane_funcs tegra_overlay_plane_funcs = {
.update_plane = drm_plane_helper_update, .update_plane = drm_atomic_helper_update_plane,
.disable_plane = drm_plane_helper_disable, .disable_plane = drm_atomic_helper_disable_plane,
.destroy = tegra_overlay_plane_destroy, .destroy = tegra_overlay_plane_destroy,
.reset = drm_atomic_helper_plane_reset, .reset = drm_atomic_helper_plane_reset,
.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include <linux/host1x.h> #include <linux/host1x.h>
#include <linux/iommu.h> #include <linux/iommu.h>
#include <drm/drm_atomic_helper.h>
#include "drm.h" #include "drm.h"
#include "gem.h" #include "gem.h"
...@@ -29,6 +31,8 @@ static const struct drm_mode_config_funcs tegra_drm_mode_funcs = { ...@@ -29,6 +31,8 @@ static const struct drm_mode_config_funcs tegra_drm_mode_funcs = {
#ifdef CONFIG_DRM_TEGRA_FBDEV #ifdef CONFIG_DRM_TEGRA_FBDEV
.output_poll_changed = tegra_fb_output_poll_changed, .output_poll_changed = tegra_fb_output_poll_changed,
#endif #endif
.atomic_check = drm_atomic_helper_check,
.atomic_commit = drm_atomic_helper_commit,
}; };
static int tegra_drm_load(struct drm_device *drm, unsigned long flags) static int tegra_drm_load(struct drm_device *drm, unsigned long flags)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment