diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 705c700fdeefb2ecce6396e9c28c283cb9861b72..794b161c889c38d1ea34bd332bf458d920d035f1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -768,6 +768,9 @@ nouveau_connector_set_property(struct drm_connector *connector,
 	struct nouveau_crtc *nv_crtc = NULL;
 	int ret;
 
+	if (connector->dev->mode_config.funcs->atomic_commit)
+		return drm_atomic_helper_connector_set_property(connector, property, value);
+
 	ret = connector->funcs->atomic_set_property(&nv_connector->base,
 						    &asyc->state,
 						    property, value);