aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-11-25 07:05:12 -0500
committerThierry Reding <treding@nvidia.com>2015-01-27 04:14:41 -0500
commit3cad4b6887cd3d2b4e7f2c0ad6cb557b8eda4084 (patch)
tree63b0434320da9b28f808be52f8922afd93c05092
parent2cb207e413a9ace502edbce51c604e2088b0acb2 (diff)
drm/plane: Make ->atomic_update() mandatory
There is no use-case where it would be useful for drivers not to implement this function and the transitional plane helpers already require drivers to provide an implementation. v2: add new requirement to kerneldoc Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/drm_atomic_helper.c2
-rw-r--r--include/drm/drm_plane_helper.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 541ba833ed36..6c72c57b2244 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1108,7 +1108,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
1108 1108
1109 funcs = plane->helper_private; 1109 funcs = plane->helper_private;
1110 1110
1111 if (!funcs || !funcs->atomic_update) 1111 if (!funcs)
1112 continue; 1112 continue;
1113 1113
1114 old_plane_state = old_state->plane_states[i]; 1114 old_plane_state = old_state->plane_states[i];
diff --git a/include/drm/drm_plane_helper.h b/include/drm/drm_plane_helper.h
index a185392cafeb..06d0314a1352 100644
--- a/include/drm/drm_plane_helper.h
+++ b/include/drm/drm_plane_helper.h
@@ -52,7 +52,7 @@ extern int drm_crtc_init(struct drm_device *dev,
52 * @prepare_fb: prepare a framebuffer for use by the plane 52 * @prepare_fb: prepare a framebuffer for use by the plane
53 * @cleanup_fb: cleanup a framebuffer when it's no longer used by the plane 53 * @cleanup_fb: cleanup a framebuffer when it's no longer used by the plane
54 * @atomic_check: check that a given atomic state is valid and can be applied 54 * @atomic_check: check that a given atomic state is valid and can be applied
55 * @atomic_update: apply an atomic state to the plane 55 * @atomic_update: apply an atomic state to the plane (mandatory)
56 * 56 *
57 * The helper operations are called by the mid-layer CRTC helper. 57 * The helper operations are called by the mid-layer CRTC helper.
58 */ 58 */