diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-11-24 17:08:06 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2015-01-27 10:14:51 +0100 |
| commit | 07866963b675b358d82baf8df73dba545d967a1d (patch) | |
| tree | 6d778a8a8365f80c3e58eac21721650aeb2b06c6 /drivers/gpu/drm/tegra | |
| parent | 9d44189f55c77face595982bad3310bd4078b9fe (diff) | |
| download | blackbird-obmc-linux-07866963b675b358d82baf8df73dba545d967a1d.tar.gz blackbird-obmc-linux-07866963b675b358d82baf8df73dba545d967a1d.zip | |
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: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/drm/tegra')
| -rw-r--r-- | drivers/gpu/drm/tegra/dc.c | 12 | ||||
| -rw-r--r-- | drivers/gpu/drm/tegra/drm.c | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 6bf5014ad2dc..4fb9048b2f65 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -397,8 +397,8 @@ static void tegra_primary_plane_destroy(struct drm_plane *plane) } static const struct drm_plane_funcs tegra_primary_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, .destroy = tegra_primary_plane_destroy, .reset = drm_atomic_helper_plane_reset, .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, @@ -683,8 +683,8 @@ static void tegra_cursor_atomic_disable(struct drm_plane *plane, } static const struct drm_plane_funcs tegra_cursor_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, .destroy = tegra_plane_destroy, .reset = drm_atomic_helper_plane_reset, .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, @@ -733,8 +733,8 @@ static void tegra_overlay_plane_destroy(struct drm_plane *plane) } static const struct drm_plane_funcs tegra_overlay_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, .destroy = tegra_overlay_plane_destroy, .reset = drm_atomic_helper_plane_reset, .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index c1bb0d901454..d01484cf3432 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -10,6 +10,8 @@ #include <linux/host1x.h> #include <linux/iommu.h> +#include <drm/drm_atomic_helper.h> + #include "drm.h" #include "gem.h" @@ -29,6 +31,8 @@ static const struct drm_mode_config_funcs tegra_drm_mode_funcs = { #ifdef CONFIG_DRM_TEGRA_FBDEV .output_poll_changed = tegra_fb_output_poll_changed, #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) |
