* [Intel-gfx] [PATCH v6 0/3] Send a hotplug when edid changes
@ 2020-06-30 0:26 Kunal Joshi
2020-06-30 0:26 ` [Intel-gfx] [PATCH v6 1/3] drm: Add helper to compare edids Kunal Joshi
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Kunal Joshi @ 2020-06-30 0:26 UTC (permalink / raw)
To: intel-gfx
From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
This series introduce to drm a way to determine if something else
except connection_status had changed during probing, which
can be used by other drivers as well. Another i915 specific part
uses this approach to determine if edid had changed without
changing the connection status and send a hotplug event.
Stanislav Lisovskiy (3):
drm: Add helper to compare edids.
drm: Introduce epoch counter to drm_connector
drm/i915: Send hotplug event if edid had changed
drivers/gpu/drm/drm_connector.c | 16 +++++++++
drivers/gpu/drm/drm_edid.c | 37 ++++++++++++++++++-
drivers/gpu/drm/drm_probe_helper.c | 38 +++++++++++++++++---
drivers/gpu/drm/i915/display/intel_hotplug.c | 24 +++++++------
include/drm/drm_connector.h | 2 ++
include/drm/drm_edid.h | 9 +++++
6 files changed, 110 insertions(+), 16 deletions(-)
--
2.25.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread* [Intel-gfx] [PATCH v6 1/3] drm: Add helper to compare edids. 2020-06-30 0:26 [Intel-gfx] [PATCH v6 0/3] Send a hotplug when edid changes Kunal Joshi @ 2020-06-30 0:26 ` Kunal Joshi 2020-06-30 0:26 ` [Intel-gfx] [PATCH v6 2/3] drm: Introduce epoch counter to drm_connector Kunal Joshi ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: Kunal Joshi @ 2020-06-30 0:26 UTC (permalink / raw) To: intel-gfx From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> Many drivers would benefit from using drm helper to compare edid, rather than bothering with own implementation. v2: Added documentation for this function. Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> --- drivers/gpu/drm/drm_edid.c | 33 +++++++++++++++++++++++++++++++++ include/drm/drm_edid.h | 9 +++++++++ 2 files changed, 42 insertions(+) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 71ae0cd6d576..920ac9ef6018 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1615,6 +1615,39 @@ static bool drm_edid_is_zero(const u8 *in_edid, int length) return true; } +/** + * drm_edid_are_equal - compare two edid blobs. + * @edid1: pointer to first blob + * @edid2: pointer to second blob + * This helper can be used during probing to determine if + * edid had changed. + */ +bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2) +{ + int edid1_len, edid2_len; + bool edid1_present = edid1 != NULL; + bool edid2_present = edid2 != NULL; + + if (edid1_present != edid2_present) + return false; + + if (edid1) { + + edid1_len = EDID_LENGTH * (1 + edid1->extensions); + edid2_len = EDID_LENGTH * (1 + edid2->extensions); + + if (edid1_len != edid2_len) + return false; + + if (memcmp(edid1, edid2, edid1_len)) + return false; + } + + return true; +} +EXPORT_SYMBOL(drm_edid_are_equal); + + /** * drm_edid_block_valid - Sanity check the EDID block (base or extension) * @raw_edid: pointer to raw EDID block diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 43254319ab19..cfa4f5af49af 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -359,6 +359,15 @@ drm_load_edid_firmware(struct drm_connector *connector) } #endif +/** + * drm_edid_are_equal - compare two edid blobs. + * @edid1: pointer to first blob + * @edid2: pointer to second blob + * This helper can be used during probing to determine if + * edid had changed. + */ +bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2); + int drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame, const struct drm_connector *connector, -- 2.25.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH v6 2/3] drm: Introduce epoch counter to drm_connector 2020-06-30 0:26 [Intel-gfx] [PATCH v6 0/3] Send a hotplug when edid changes Kunal Joshi 2020-06-30 0:26 ` [Intel-gfx] [PATCH v6 1/3] drm: Add helper to compare edids Kunal Joshi @ 2020-06-30 0:26 ` Kunal Joshi 2020-06-30 0:27 ` [Intel-gfx] [PATCH v6 3/3] drm/i915: Send hotplug event if edid had changed Kunal Joshi 2020-06-30 14:37 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Send a hotplug when edid changes (rev10) Patchwork 3 siblings, 0 replies; 8+ messages in thread From: Kunal Joshi @ 2020-06-30 0:26 UTC (permalink / raw) To: intel-gfx From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> This counter will be used by drm_helper_probe_detect caller to determine if anything had changed(including edid, connection status and etc). Hardware specific driver detect hooks are responsible for updating this counter when some change is detected to notify the drm part, which can trigger for example hotplug event. Also now call drm_connector_update_edid_property right after we get edid always to make sure there is a unified way to handle edid change, without having to change tons of source code as currently drm_connector_update_edid_property is called only in certain cases like reprobing and not right after edid is actually updated. v2: Added documentation for the new counter. Rename change_counter to epoch_counter. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105540 Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> --- drivers/gpu/drm/drm_connector.c | 16 +++++++++++++ drivers/gpu/drm/drm_edid.c | 8 ++++--- drivers/gpu/drm/drm_probe_helper.c | 38 ++++++++++++++++++++++++++---- include/drm/drm_connector.h | 2 ++ 4 files changed, 56 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index b7bd46033807..328a6a0dfe32 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -269,6 +269,7 @@ int drm_connector_init(struct drm_device *dev, INIT_LIST_HEAD(&connector->modes); mutex_init(&connector->mutex); connector->edid_blob_ptr = NULL; + connector->epoch_counter = 0; connector->tile_blob_ptr = NULL; connector->status = connector_status_unknown; connector->display_info.panel_orientation = @@ -1979,6 +1980,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector, struct drm_device *dev = connector->dev; size_t size = 0; int ret; + const struct edid *old_edid; /* ignore requests to set edid when overridden */ if (connector->override_edid) @@ -2002,6 +2004,20 @@ int drm_connector_update_edid_property(struct drm_connector *connector, drm_update_tile_info(connector, edid); + if (connector->edid_blob_ptr) { + old_edid = (const struct edid *)connector->edid_blob_ptr->data; + if (old_edid) { + if (!drm_edid_are_equal(edid, old_edid)) { + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Edid was changed.\n", + connector->base.id, connector->name); + + connector->epoch_counter += 1; + DRM_DEBUG_KMS("Updating change counter to %llu\n", + connector->epoch_counter); + } + } + } + drm_object_property_set_value(&connector->base, dev->mode_config.non_desktop_property, connector->display_info.non_desktop); diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 920ac9ef6018..8b559b82a15e 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1632,7 +1632,6 @@ bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2) return false; if (edid1) { - edid1_len = EDID_LENGTH * (1 + edid1->extensions); edid2_len = EDID_LENGTH * (1 + edid2->extensions); @@ -1647,7 +1646,6 @@ bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2) } EXPORT_SYMBOL(drm_edid_are_equal); - /** * drm_edid_block_valid - Sanity check the EDID block (base or extension) * @raw_edid: pointer to raw EDID block @@ -2050,13 +2048,17 @@ EXPORT_SYMBOL(drm_probe_ddc); struct edid *drm_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) { + struct edid *edid; + if (connector->force == DRM_FORCE_OFF) return NULL; if (connector->force == DRM_FORCE_UNSPECIFIED && !drm_probe_ddc(adapter)) return NULL; - return drm_do_get_edid(connector, drm_do_probe_ddc_edid, adapter); + edid = drm_do_get_edid(connector, drm_do_probe_ddc_edid, adapter); + drm_connector_update_edid_property(connector, edid); + return edid; } EXPORT_SYMBOL(drm_get_edid); diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 09e872e61315..04a99c17b039 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -292,6 +292,9 @@ drm_helper_probe_detect_ctx(struct drm_connector *connector, bool force) if (WARN_ON(ret < 0)) ret = connector_status_unknown; + if (ret != connector->status) + connector->epoch_counter += 1; + drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); @@ -325,11 +328,16 @@ drm_helper_probe_detect(struct drm_connector *connector, return ret; if (funcs->detect_ctx) - return funcs->detect_ctx(connector, ctx, force); + ret = funcs->detect_ctx(connector, ctx, force); else if (connector->funcs->detect) - return connector->funcs->detect(connector, force); + ret = connector->funcs->detect(connector, force); else - return connector_status_connected; + ret = connector_status_connected; + + if (ret != connector->status) + connector->epoch_counter += 1; + + return ret; } EXPORT_SYMBOL(drm_helper_probe_detect); @@ -779,6 +787,7 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev) struct drm_connector_list_iter conn_iter; enum drm_connector_status old_status; bool changed = false; + u64 old_epoch_counter; if (!dev->mode_config.poll_enabled) return false; @@ -792,20 +801,39 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev) old_status = connector->status; + old_epoch_counter = connector->epoch_counter; + + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Old epoch counter %llu\n", connector->base.id, + connector->name, + old_epoch_counter); + connector->status = drm_helper_probe_detect(connector, NULL, false); DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n", connector->base.id, connector->name, drm_get_connector_status_name(old_status), drm_get_connector_status_name(connector->status)); - if (old_status != connector->status) + + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] New epoch counter %llu\n", + connector->base.id, + connector->name, + connector->epoch_counter); + + /* + * Check if epoch counter had changed, meaning that we need + * to send a uevent. + */ + if (old_epoch_counter != connector->epoch_counter) changed = true; + } drm_connector_list_iter_end(&conn_iter); mutex_unlock(&dev->mode_config.mutex); - if (changed) + if (changed) { drm_kms_helper_hotplug_event(dev); + DRM_DEBUG_KMS("Sent hotplug event\n"); + } return changed; } diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index fd543d1db9b2..6a451b86c454 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1329,6 +1329,8 @@ struct drm_connector { enum drm_connector_force force; /** @override_edid: has the EDID been overwritten through debugfs for testing? */ bool override_edid; + /** @epoch_counter: used to detect any other changes in connector, besides status */ + u64 epoch_counter; /** * @possible_encoders: Bit mask of encoders that can drive this -- 2.25.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH v6 3/3] drm/i915: Send hotplug event if edid had changed 2020-06-30 0:26 [Intel-gfx] [PATCH v6 0/3] Send a hotplug when edid changes Kunal Joshi 2020-06-30 0:26 ` [Intel-gfx] [PATCH v6 1/3] drm: Add helper to compare edids Kunal Joshi 2020-06-30 0:26 ` [Intel-gfx] [PATCH v6 2/3] drm: Introduce epoch counter to drm_connector Kunal Joshi @ 2020-06-30 0:27 ` Kunal Joshi 2020-07-03 0:31 ` kernel test robot 2020-06-30 14:37 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Send a hotplug when edid changes (rev10) Patchwork 3 siblings, 1 reply; 8+ messages in thread From: Kunal Joshi @ 2020-06-30 0:27 UTC (permalink / raw) To: intel-gfx From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> Added epoch counter checking to intel_encoder_hotplug in order to be able process all the connector changes, besides connection status. Also now any change in connector would result in epoch counter change, so no multiple checks are needed. v2: Renamed change counter to epoch counter. Fixed type name. v3: Fixed rebase conflict v4: Remove duplicate drm_edid_equal checks from hdmi and dp, lets use only once edid property is getting updated and increment epoch counter from there. Also lets now call drm_connector_update_edid_property right after we get edid always to make sure there is a unified way to handle edid change, without having to change tons of source code as currently drm_connector_update_edid_property is called only in certain cases like reprobing and not right after edid is actually updated. v5: Fixed const modifiers, removed blank line v6: Removed drm specific part from this patch, leaving only i915 specific changes here. Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> --- drivers/gpu/drm/i915/display/intel_hotplug.c | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c index 2e94c1413c02..80bcfff032e9 100644 --- a/drivers/gpu/drm/i915/display/intel_hotplug.c +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c @@ -283,6 +283,8 @@ intel_encoder_hotplug(struct intel_encoder *encoder, { struct drm_device *dev = connector->base.dev; enum drm_connector_status old_status; + u64 old_epoch_counter; + bool ret = false; drm_WARN_ON(dev, !mutex_is_locked(&dev->mode_config.mutex)); old_status = connector->base.status; @@ -290,17 +292,19 @@ intel_encoder_hotplug(struct intel_encoder *encoder, connector->base.status = drm_helper_probe_detect(&connector->base, NULL, false); - if (old_status == connector->base.status) - return INTEL_HOTPLUG_UNCHANGED; - - drm_dbg_kms(&to_i915(dev)->drm, - "[CONNECTOR:%d:%s] status updated from %s to %s\n", - connector->base.base.id, - connector->base.name, - drm_get_connector_status_name(old_status), - drm_get_connector_status_name(connector->base.status)); + if (old_epoch_counter != connector->base.epoch_counter) + ret = true; - return INTEL_HOTPLUG_CHANGED; + if (ret) { + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s(epoch counter %llu)\n", + connector->base.base.id, + connector->base.name, + drm_get_connector_status_name(old_status), + drm_get_connector_status_name(connector->base.status), + connector->base.epoch_counter); + return INTEL_HOTPLUG_CHANGED; + } + return INTEL_HOTPLUG_UNCHANGED; } static bool intel_encoder_has_hpd_pulse(struct intel_encoder *encoder) -- 2.25.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH v6 3/3] drm/i915: Send hotplug event if edid had changed 2020-06-30 0:27 ` [Intel-gfx] [PATCH v6 3/3] drm/i915: Send hotplug event if edid had changed Kunal Joshi @ 2020-07-03 0:31 ` kernel test robot 0 siblings, 0 replies; 8+ messages in thread From: kernel test robot @ 2020-07-03 0:31 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 5574 bytes --] Hi Kunal, Thank you for the patch! Perhaps something to improve: [auto build test WARNING on drm-tip/drm-tip] [also build test WARNING on linus/master v5.8-rc3] [cannot apply to drm-intel/for-linux-next next-20200701] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Kunal-Joshi/Send-a-hotplug-when-edid-changes/20200630-152626 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip compiler: gcc-9 (Debian 9.3.0-14) 9.3.0 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> cppcheck warnings: (new ones prefixed by >>) >> drivers/gpu/drm/i915/display/intel_hotplug.c:286:6: warning: Variable 'old_epoch_counter' is not assigned a value. [unassignedVariable] u64 old_epoch_counter; ^ >> drivers/gpu/drm/i915/display/intel_hotplug.c:295:6: warning: Uninitialized variable: old_epoch_counter [uninitvar] if (old_epoch_counter != connector->base.epoch_counter) ^ # https://github.com/0day-ci/linux/commit/52973bbb22573f4d170806d2ade0a8871be92d89 git remote add linux-review https://github.com/0day-ci/linux git remote update linux-review git checkout 52973bbb22573f4d170806d2ade0a8871be92d89 vim +/old_epoch_counter +286 drivers/gpu/drm/i915/display/intel_hotplug.c 77913b39addfaa8 drivers/gpu/drm/i915/intel_hotplug.c Jani Nikula 2015-06-18 279 3944709df8e9298 drivers/gpu/drm/i915/display/intel_hotplug.c Imre Deak 2019-07-11 280 enum intel_hotplug_state 3944709df8e9298 drivers/gpu/drm/i915/display/intel_hotplug.c Imre Deak 2019-07-11 281 intel_encoder_hotplug(struct intel_encoder *encoder, 8c8919c7c99f097 drivers/gpu/drm/i915/display/intel_hotplug.c Imre Deak 2020-03-30 282 struct intel_connector *connector) 77913b39addfaa8 drivers/gpu/drm/i915/intel_hotplug.c Jani Nikula 2015-06-18 283 { dba14b27dd3ca5c drivers/gpu/drm/i915/intel_hotplug.c Ville Syrjälä 2018-01-17 284 struct drm_device *dev = connector->base.dev; 77913b39addfaa8 drivers/gpu/drm/i915/intel_hotplug.c Jani Nikula 2015-06-18 285 enum drm_connector_status old_status; 52973bbb22573f4 drivers/gpu/drm/i915/display/intel_hotplug.c Stanislav Lisovskiy 2020-06-30 @286 u64 old_epoch_counter; 52973bbb22573f4 drivers/gpu/drm/i915/display/intel_hotplug.c Stanislav Lisovskiy 2020-06-30 287 bool ret = false; 77913b39addfaa8 drivers/gpu/drm/i915/intel_hotplug.c Jani Nikula 2015-06-18 288 f4224a4cb16c248 drivers/gpu/drm/i915/display/intel_hotplug.c Pankaj Bharadiya 2020-01-28 289 drm_WARN_ON(dev, !mutex_is_locked(&dev->mode_config.mutex)); dba14b27dd3ca5c drivers/gpu/drm/i915/intel_hotplug.c Ville Syrjälä 2018-01-17 290 old_status = connector->base.status; 77913b39addfaa8 drivers/gpu/drm/i915/intel_hotplug.c Jani Nikula 2015-06-18 291 dba14b27dd3ca5c drivers/gpu/drm/i915/intel_hotplug.c Ville Syrjälä 2018-01-17 292 connector->base.status = dba14b27dd3ca5c drivers/gpu/drm/i915/intel_hotplug.c Ville Syrjälä 2018-01-17 293 drm_helper_probe_detect(&connector->base, NULL, false); 6c5ed5ae353cdf1 drivers/gpu/drm/i915/intel_hotplug.c Maarten Lankhorst 2017-04-06 294 52973bbb22573f4 drivers/gpu/drm/i915/display/intel_hotplug.c Stanislav Lisovskiy 2020-06-30 @295 if (old_epoch_counter != connector->base.epoch_counter) 52973bbb22573f4 drivers/gpu/drm/i915/display/intel_hotplug.c Stanislav Lisovskiy 2020-06-30 296 ret = true; 77913b39addfaa8 drivers/gpu/drm/i915/intel_hotplug.c Jani Nikula 2015-06-18 297 52973bbb22573f4 drivers/gpu/drm/i915/display/intel_hotplug.c Stanislav Lisovskiy 2020-06-30 298 if (ret) { 52973bbb22573f4 drivers/gpu/drm/i915/display/intel_hotplug.c Stanislav Lisovskiy 2020-06-30 299 DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s(epoch counter %llu)\n", dba14b27dd3ca5c drivers/gpu/drm/i915/intel_hotplug.c Ville Syrjälä 2018-01-17 300 connector->base.base.id, dba14b27dd3ca5c drivers/gpu/drm/i915/intel_hotplug.c Ville Syrjälä 2018-01-17 301 connector->base.name, 77913b39addfaa8 drivers/gpu/drm/i915/intel_hotplug.c Jani Nikula 2015-06-18 302 drm_get_connector_status_name(old_status), 52973bbb22573f4 drivers/gpu/drm/i915/display/intel_hotplug.c Stanislav Lisovskiy 2020-06-30 303 drm_get_connector_status_name(connector->base.status), 52973bbb22573f4 drivers/gpu/drm/i915/display/intel_hotplug.c Stanislav Lisovskiy 2020-06-30 304 connector->base.epoch_counter); 3944709df8e9298 drivers/gpu/drm/i915/display/intel_hotplug.c Imre Deak 2019-07-11 305 return INTEL_HOTPLUG_CHANGED; 77913b39addfaa8 drivers/gpu/drm/i915/intel_hotplug.c Jani Nikula 2015-06-18 306 } 52973bbb22573f4 drivers/gpu/drm/i915/display/intel_hotplug.c Stanislav Lisovskiy 2020-06-30 307 return INTEL_HOTPLUG_UNCHANGED; 52973bbb22573f4 drivers/gpu/drm/i915/display/intel_hotplug.c Stanislav Lisovskiy 2020-06-30 308 } 77913b39addfaa8 drivers/gpu/drm/i915/intel_hotplug.c Jani Nikula 2015-06-18 309 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for Send a hotplug when edid changes (rev10) 2020-06-30 0:26 [Intel-gfx] [PATCH v6 0/3] Send a hotplug when edid changes Kunal Joshi ` (2 preceding siblings ...) 2020-06-30 0:27 ` [Intel-gfx] [PATCH v6 3/3] drm/i915: Send hotplug event if edid had changed Kunal Joshi @ 2020-06-30 14:37 ` Patchwork 3 siblings, 0 replies; 8+ messages in thread From: Patchwork @ 2020-06-30 14:37 UTC (permalink / raw) To: Stanislav Lisovskiy; +Cc: intel-gfx == Series Details == Series: Send a hotplug when edid changes (rev10) URL : https://patchwork.freedesktop.org/series/62816/ State : failure == Summary == Applying: drm: Add helper to compare edids. Using index info to reconstruct a base tree... M drivers/gpu/drm/drm_edid.c M include/drm/drm_edid.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/drm_edid.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_edid.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 drm: Add helper to compare edids. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH v6 0/3] Send a hotplug when edid changes @ 2020-06-26 9:13 Kunal Joshi 2020-06-26 9:13 ` [Intel-gfx] [PATCH v6 2/3] drm: Introduce epoch counter to drm_connector Kunal Joshi 0 siblings, 1 reply; 8+ messages in thread From: Kunal Joshi @ 2020-06-26 9:13 UTC (permalink / raw) To: intel-gfx; +Cc: daniel.vetter From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> This series introduce to drm a way to determine if something else except connection_status had changed during probing, which can be used by other drivers as well. Another i915 specific part uses this approach to determine if edid had changed without changing the connection status and send a hotplug event. Stanislav Lisovskiy (3): drm: Add helper to compare edids. drm: Introduce epoch counter to drm_connector drm/i915: Send hotplug event if edid had changed drivers/gpu/drm/drm_connector.c | 16 ++++++++ drivers/gpu/drm/drm_edid.c | 39 +++++++++++++++++++- drivers/gpu/drm/drm_probe_helper.c | 38 ++++++++++++++++--- drivers/gpu/drm/i915/display/intel_hotplug.c | 24 +++++++----- include/drm/drm_connector.h | 2 + include/drm/drm_edid.h | 9 +++++ 6 files changed, 112 insertions(+), 16 deletions(-) -- 2.25.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH v6 2/3] drm: Introduce epoch counter to drm_connector 2020-06-26 9:13 [Intel-gfx] [PATCH v6 0/3] Send a hotplug when edid changes Kunal Joshi @ 2020-06-26 9:13 ` Kunal Joshi 0 siblings, 0 replies; 8+ messages in thread From: Kunal Joshi @ 2020-06-26 9:13 UTC (permalink / raw) To: intel-gfx; +Cc: daniel.vetter From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> This counter will be used by drm_helper_probe_detect caller to determine if anything had changed(including edid, connection status and etc). Hardware specific driver detect hooks are responsible for updating this counter when some change is detected to notify the drm part, which can trigger for example hotplug event. Also now call drm_connector_update_edid_property right after we get edid always to make sure there is a unified way to handle edid change, without having to change tons of source code as currently drm_connector_update_edid_property is called only in certain cases like reprobing and not right after edid is actually updated. v2: Added documentation for the new counter. Rename change_counter to epoch_counter. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105540 Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> --- drivers/gpu/drm/drm_connector.c | 16 +++++++++++++ drivers/gpu/drm/drm_edid.c | 6 ++++- drivers/gpu/drm/drm_probe_helper.c | 38 ++++++++++++++++++++++++++---- include/drm/drm_connector.h | 2 ++ 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index b7bd46033807..332686297e45 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -269,6 +269,7 @@ int drm_connector_init(struct drm_device *dev, INIT_LIST_HEAD(&connector->modes); mutex_init(&connector->mutex); connector->edid_blob_ptr = NULL; + connector->epoch_counter = 0; connector->tile_blob_ptr = NULL; connector->status = connector_status_unknown; connector->display_info.panel_orientation = @@ -1979,6 +1980,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector, struct drm_device *dev = connector->dev; size_t size = 0; int ret; + const struct edid *old_edid; /* ignore requests to set edid when overridden */ if (connector->override_edid) @@ -2002,6 +2004,20 @@ int drm_connector_update_edid_property(struct drm_connector *connector, drm_update_tile_info(connector, edid); + if (connector->edid_blob_ptr) { + old_edid = (const struct edid *)connector->edid_blob_ptr->data; + if (old_edid) { + if (!drm_edid_are_equal(edid, old_edid)) { + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Edid was changed.\n", + connector->base.id, connector->name); + + connector->epoch_counter += 1; + DRM_DEBUG_KMS("Updating change counter to %llu\n", + connector->epoch_counter); + } + } + } + drm_object_property_set_value(&connector->base, dev->mode_config.non_desktop_property, connector->display_info.non_desktop); diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 920ac9ef6018..b7530db4a93b 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2050,13 +2050,17 @@ EXPORT_SYMBOL(drm_probe_ddc); struct edid *drm_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) { + struct edid *edid; + if (connector->force == DRM_FORCE_OFF) return NULL; if (connector->force == DRM_FORCE_UNSPECIFIED && !drm_probe_ddc(adapter)) return NULL; - return drm_do_get_edid(connector, drm_do_probe_ddc_edid, adapter); + edid = drm_do_get_edid(connector, drm_do_probe_ddc_edid, adapter); + drm_connector_update_edid_property(connector, edid); + return edid; } EXPORT_SYMBOL(drm_get_edid); diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 09e872e61315..7378c61e7fcc 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -292,6 +292,9 @@ drm_helper_probe_detect_ctx(struct drm_connector *connector, bool force) if (WARN_ON(ret < 0)) ret = connector_status_unknown; + if (ret != connector->status) + connector->epoch_counter += 1; + drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); @@ -325,11 +328,16 @@ drm_helper_probe_detect(struct drm_connector *connector, return ret; if (funcs->detect_ctx) - return funcs->detect_ctx(connector, ctx, force); + ret = funcs->detect_ctx(connector, ctx, force); else if (connector->funcs->detect) - return connector->funcs->detect(connector, force); + ret = connector->funcs->detect(connector, force); else - return connector_status_connected; + ret = connector_status_connected; + + if (ret != connector->status) + connector->epoch_counter += 1; + + return ret; } EXPORT_SYMBOL(drm_helper_probe_detect); @@ -779,6 +787,7 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev) struct drm_connector_list_iter conn_iter; enum drm_connector_status old_status; bool changed = false; + uint64_t old_epoch_counter; if (!dev->mode_config.poll_enabled) return false; @@ -792,20 +801,39 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev) old_status = connector->status; + old_epoch_counter = connector->epoch_counter; + + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Old epoch counter %llu\n", connector->base.id, + connector->name, + old_epoch_counter); + connector->status = drm_helper_probe_detect(connector, NULL, false); DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n", connector->base.id, connector->name, drm_get_connector_status_name(old_status), drm_get_connector_status_name(connector->status)); - if (old_status != connector->status) + + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] New epoch counter %llu\n", + connector->base.id, + connector->name, + connector->epoch_counter); + + /* + * Check if epoch counter had changed, meaning that we need + * to send a uevent. + */ + if (old_epoch_counter != connector->epoch_counter) { changed = true; + } } drm_connector_list_iter_end(&conn_iter); mutex_unlock(&dev->mode_config.mutex); - if (changed) + if (changed) { drm_kms_helper_hotplug_event(dev); + DRM_DEBUG_KMS("Sent hotplug event\n"); + } return changed; } diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index fd543d1db9b2..e82b367cdfc8 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1329,6 +1329,8 @@ struct drm_connector { enum drm_connector_force force; /** @override_edid: has the EDID been overwritten through debugfs for testing? */ bool override_edid; + /** @epoch_counter: used to detect any other changes in connector, besides status */ + uint64_t epoch_counter; /** * @possible_encoders: Bit mask of encoders that can drive this -- 2.25.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 0/3] Send a hotplug when edid changes @ 2020-06-23 18:57 Kunal Joshi 2020-06-23 18:57 ` [Intel-gfx] [PATCH v6 2/3] drm: Introduce epoch counter to drm_connector Kunal Joshi 0 siblings, 1 reply; 8+ messages in thread From: Kunal Joshi @ 2020-06-23 18:57 UTC (permalink / raw) To: Intel-gfx, dri-devel; +Cc: stanislav.lisovskiy, daniel.vetter, arkadiusz.hiler From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> This series introduce to drm a way to determine if something else except connection_status had changed during probing, which can be used by other drivers as well. Another i915 specific part uses this approach to determine if edid had changed without changing the connection status and send a hotplug event. Stanislav Lisovskiy (3): drm: Add helper to compare edids. drm: Introduce epoch counter to drm_connector drm/i915: Send hotplug event if edid had changed drivers/gpu/drm/drm_connector.c | 16 ++++++++ drivers/gpu/drm/drm_edid.c | 39 +++++++++++++++++++- drivers/gpu/drm/drm_probe_helper.c | 38 ++++++++++++++++--- drivers/gpu/drm/i915/display/intel_hotplug.c | 26 +++++++------ include/drm/drm_connector.h | 2 + include/drm/drm_edid.h | 9 +++++ 6 files changed, 113 insertions(+), 17 deletions(-) -- 2.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH v6 2/3] drm: Introduce epoch counter to drm_connector 2020-06-23 18:57 [PATCH v6 0/3] Send a hotplug when edid changes Kunal Joshi @ 2020-06-23 18:57 ` Kunal Joshi 0 siblings, 0 replies; 8+ messages in thread From: Kunal Joshi @ 2020-06-23 18:57 UTC (permalink / raw) To: Intel-gfx, dri-devel; +Cc: daniel.vetter From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> This counter will be used by drm_helper_probe_detect caller to determine if anything had changed(including edid, connection status and etc). Hardware specific driver detect hooks are responsible for updating this counter when some change is detected to notify the drm part, which can trigger for example hotplug event. Also now call drm_connector_update_edid_property right after we get edid always to make sure there is a unified way to handle edid change, without having to change tons of source code as currently drm_connector_update_edid_property is called only in certain cases like reprobing and not right after edid is actually updated. v2: Added documentation for the new counter. Rename change_counter to epoch_counter. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105540 Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> --- drivers/gpu/drm/drm_connector.c | 16 +++++++++++++ drivers/gpu/drm/drm_edid.c | 6 ++++- drivers/gpu/drm/drm_probe_helper.c | 38 ++++++++++++++++++++++++++---- include/drm/drm_connector.h | 2 ++ 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index b7bd46033807..332686297e45 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -269,6 +269,7 @@ int drm_connector_init(struct drm_device *dev, INIT_LIST_HEAD(&connector->modes); mutex_init(&connector->mutex); connector->edid_blob_ptr = NULL; + connector->epoch_counter = 0; connector->tile_blob_ptr = NULL; connector->status = connector_status_unknown; connector->display_info.panel_orientation = @@ -1979,6 +1980,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector, struct drm_device *dev = connector->dev; size_t size = 0; int ret; + const struct edid *old_edid; /* ignore requests to set edid when overridden */ if (connector->override_edid) @@ -2002,6 +2004,20 @@ int drm_connector_update_edid_property(struct drm_connector *connector, drm_update_tile_info(connector, edid); + if (connector->edid_blob_ptr) { + old_edid = (const struct edid *)connector->edid_blob_ptr->data; + if (old_edid) { + if (!drm_edid_are_equal(edid, old_edid)) { + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Edid was changed.\n", + connector->base.id, connector->name); + + connector->epoch_counter += 1; + DRM_DEBUG_KMS("Updating change counter to %llu\n", + connector->epoch_counter); + } + } + } + drm_object_property_set_value(&connector->base, dev->mode_config.non_desktop_property, connector->display_info.non_desktop); diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 34cabfddcdd3..d029cbd5d037 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2050,13 +2050,17 @@ EXPORT_SYMBOL(drm_probe_ddc); struct edid *drm_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter) { + struct edid *edid; + if (connector->force == DRM_FORCE_OFF) return NULL; if (connector->force == DRM_FORCE_UNSPECIFIED && !drm_probe_ddc(adapter)) return NULL; - return drm_do_get_edid(connector, drm_do_probe_ddc_edid, adapter); + edid = drm_do_get_edid(connector, drm_do_probe_ddc_edid, adapter); + drm_connector_update_edid_property(connector, edid); + return edid; } EXPORT_SYMBOL(drm_get_edid); diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 26e997f1524f..1d5f319d6213 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -290,6 +290,9 @@ drm_helper_probe_detect_ctx(struct drm_connector *connector, bool force) if (WARN_ON(ret < 0)) ret = connector_status_unknown; + if (ret != connector->status) + connector->epoch_counter += 1; + drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); @@ -323,11 +326,16 @@ drm_helper_probe_detect(struct drm_connector *connector, return ret; if (funcs->detect_ctx) - return funcs->detect_ctx(connector, ctx, force); + ret = funcs->detect_ctx(connector, ctx, force); else if (connector->funcs->detect) - return connector->funcs->detect(connector, force); + ret = connector->funcs->detect(connector, force); else - return connector_status_connected; + ret = connector_status_connected; + + if (ret != connector->status) + connector->epoch_counter += 1; + + return ret; } EXPORT_SYMBOL(drm_helper_probe_detect); @@ -777,6 +785,7 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev) struct drm_connector_list_iter conn_iter; enum drm_connector_status old_status; bool changed = false; + uint64_t old_epoch_counter; if (!dev->mode_config.poll_enabled) return false; @@ -790,20 +799,39 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev) old_status = connector->status; + old_epoch_counter = connector->epoch_counter; + + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Old epoch counter %llu\n", connector->base.id, + connector->name, + old_epoch_counter); + connector->status = drm_helper_probe_detect(connector, NULL, false); DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n", connector->base.id, connector->name, drm_get_connector_status_name(old_status), drm_get_connector_status_name(connector->status)); - if (old_status != connector->status) + + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] New epoch counter %llu\n", + connector->base.id, + connector->name, + connector->epoch_counter); + + /* + * Check if epoch counter had changed, meaning that we need + * to send a uevent. + */ + if (old_epoch_counter != connector->epoch_counter) { changed = true; + } } drm_connector_list_iter_end(&conn_iter); mutex_unlock(&dev->mode_config.mutex); - if (changed) + if (changed) { drm_kms_helper_hotplug_event(dev); + DRM_DEBUG_KMS("Sent hotplug event\n"); + } return changed; } diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index fd543d1db9b2..20bdc16eefe2 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1329,6 +1329,8 @@ struct drm_connector { enum drm_connector_force force; /** @override_edid: has the EDID been overwritten through debugfs for testing? */ bool override_edid; + /** @epoch_counter: used to detect any other changes in connector, besides status */ + uint64_t epoch_counter; /** * @possible_encoders: Bit mask of encoders that can drive this -- 2.25.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-07-03 0:31 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-06-30 0:26 [Intel-gfx] [PATCH v6 0/3] Send a hotplug when edid changes Kunal Joshi 2020-06-30 0:26 ` [Intel-gfx] [PATCH v6 1/3] drm: Add helper to compare edids Kunal Joshi 2020-06-30 0:26 ` [Intel-gfx] [PATCH v6 2/3] drm: Introduce epoch counter to drm_connector Kunal Joshi 2020-06-30 0:27 ` [Intel-gfx] [PATCH v6 3/3] drm/i915: Send hotplug event if edid had changed Kunal Joshi 2020-07-03 0:31 ` kernel test robot 2020-06-30 14:37 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Send a hotplug when edid changes (rev10) Patchwork -- strict thread matches above, loose matches on Subject: below -- 2020-06-26 9:13 [Intel-gfx] [PATCH v6 0/3] Send a hotplug when edid changes Kunal Joshi 2020-06-26 9:13 ` [Intel-gfx] [PATCH v6 2/3] drm: Introduce epoch counter to drm_connector Kunal Joshi 2020-06-23 18:57 [PATCH v6 0/3] Send a hotplug when edid changes Kunal Joshi 2020-06-23 18:57 ` [Intel-gfx] [PATCH v6 2/3] drm: Introduce epoch counter to drm_connector Kunal Joshi
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.