2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index a90d67b6310b..37a7fc7649a4 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -517,7 +517,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
                 }
         }
 
-        ret = handle_conflicting_encoders(state, state->legacy_set_config);
+        ret = handle_conflicting_encoders(state, false);
         if (ret)
                 return ret;
 
@@ -2289,12 +2289,15 @@ int drm_atomic_helper_set_config(struct drm_mode_set *set,
         if (!state)
                 return -ENOMEM;
 
-        state->legacy_set_config = true;
         state->acquire_ctx = ctx;
         ret = __drm_atomic_helper_set_config(set, state);
         if (ret != 0)
                 goto fail;
 
+        ret = handle_conflicting_encoders(state, true);
+        if (ret)
+                return ret;
+
         ret = drm_atomic_commit(state);
 
 fail:
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
index fd33ed5eaeb4..788daf756f48 100644
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
@@ -160,7 +160,6 @@ struct __drm_connnectors_state {
  * @dev: parent DRM device
  * @allow_modeset: allow full modeset
  * @legacy_cursor_update: hint to enforce legacy cursor IOCTL semantics
- * @legacy_set_config: Disable conflicting encoders instead of failing with -EINVAL.
  * @planes: pointer to array of structures with per-plane data
  * @crtcs: pointer to array of CRTC pointers
  * @num_connector: size of the @connectors and @connector_states arrays
@@ -173,7 +172,6 @@ struct drm_atomic_state {
         struct drm_device *dev;
         bool allow_modeset : 1;
         bool legacy_cursor_update : 1;
-        bool legacy_set_config : 1;
         struct __drm_planes_state *planes;
         struct __drm_crtcs_state *crtcs;
         int num_connector;