diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 5adee7043f7a..fdad865d79f5 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -217,12 +217,8 @@ set_best_encoder(struct drm_atomic_state *state,
 		 * As an exception restoring duplicated atomic state
 		 * during resume is allowed, so don't warn when
 		 * best_encoder is equal to encoder we intend to set.
-		 *
-		 * As rockchip maybe appear one crtc connect two connecter,
-		 * the conn_state->best_encoder always isn't NULL, so here no
-		 * need warning.
 		 */
-		WARN_ON(!crtc && encoder && encoder != conn_state->best_encoder);
+		WARN_ON(!crtc && encoder != conn_state->best_encoder);
 		if (crtc) {
 			crtc_state = drm_atomic_get_new_crtc_state(state, crtc);