[v2] drm/plane_helper: Use helper for plane->CRTC linkage

Commit Message

Daniel Stone May 26, 2015, 9:15 a.m. UTC

plane_state->crtc shouldn't be assigned directly, but instead use
drm_atomic_set_crtc_for_plane, which also takes care of updating the
plane_mask on each CRTC's state.

v2: First patch sent by mistake; this one checks the return value.

Signed-off-by: Daniel Stone <[e-mail]>
---
 drivers/gpu/drm/drm_plane_helper.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index 40c1db9..7c6a2ad 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -519,6 +519,7 @@  int drm_plane_helper_update(struct drm_plane *plane, struct drm_crtc *crtc,
 			    uint32_t src_w, uint32_t src_h)
 {
 	struct drm_plane_state *plane_state;
+	int ret;
 
 	if (plane->funcs->atomic_duplicate_state)
 		plane_state = plane->funcs->atomic_duplicate_state(plane);
@@ -530,7 +531,10 @@  int drm_plane_helper_update(struct drm_plane *plane, struct drm_crtc *crtc,
 		return -ENOMEM;
 	plane_state->plane = plane;
 
-	plane_state->crtc = crtc;
+	ret = drm_atomic_set_crtc_for_plane(plane_state, crtc);
+	if (ret)
+		return ret;
+
 	drm_atomic_set_fb_for_plane(plane_state, fb);
 	plane_state->crtc_x = crtc_x;
 	plane_state->crtc_y = crtc_y;
@@ -561,6 +565,7 @@  EXPORT_SYMBOL(drm_plane_helper_update);
 int drm_plane_helper_disable(struct drm_plane *plane)
 {
 	struct drm_plane_state *plane_state;
+	int ret;
 
 	/* crtc helpers love to call disable functions for already disabled hw
 	 * functions. So cope with that. */
@@ -577,7 +582,10 @@  int drm_plane_helper_disable(struct drm_plane *plane)
 		return -ENOMEM;
 	plane_state->plane = plane;
 
-	plane_state->crtc = NULL;
+	ret = drm_atomic_set_crtc_for_plane(plane_state, NULL);
+	if (ret)
+		return ret;
+
 	drm_atomic_set_fb_for_plane(plane_state, NULL);
 
 	return drm_plane_helper_commit(plane, plane_state, plane->fb);