Commit b77d010d authored by Imre Deak's avatar Imre Deak

drm/i915: Don't change the status of forced connectors during hotplug detect

DRM display connectors forced to a connected/disconnected state via the
drm_connector::force member shouldn't change their status. Atm, this can
still happen in the connector's detect function when called to handle a
hotplug event. This in turn may lead to the GETCONNECTOR ioctl to report
the incorrect state if it's called to return the connector properties
without doing an actual detection (by calling the ioctl with a non-zero
drm_mode_get_connector::count_modes).

Fix the above by updating the connector state during hotplug detect only
if the connector state is not forced.

Testcase: igt@kms_force_connector_basic@force-connector-state
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230809104307.1218058-2-imre.deak@intel.com
parent cc018c26
...@@ -267,14 +267,16 @@ intel_encoder_hotplug(struct intel_encoder *encoder, ...@@ -267,14 +267,16 @@ intel_encoder_hotplug(struct intel_encoder *encoder,
struct drm_device *dev = connector->base.dev; struct drm_device *dev = connector->base.dev;
enum drm_connector_status old_status; enum drm_connector_status old_status;
u64 old_epoch_counter; u64 old_epoch_counter;
int status;
bool ret = false; bool ret = false;
drm_WARN_ON(dev, !mutex_is_locked(&dev->mode_config.mutex)); drm_WARN_ON(dev, !mutex_is_locked(&dev->mode_config.mutex));
old_status = connector->base.status; old_status = connector->base.status;
old_epoch_counter = connector->base.epoch_counter; old_epoch_counter = connector->base.epoch_counter;
connector->base.status = status = drm_helper_probe_detect(&connector->base, NULL, false);
drm_helper_probe_detect(&connector->base, NULL, false); if (!connector->base.force)
connector->base.status = status;
if (old_epoch_counter != connector->base.epoch_counter) if (old_epoch_counter != connector->base.epoch_counter)
ret = true; ret = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment