From: Jani Nikula <jani.nikula@intel.com> To: dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org Subject: [CI RESEND 03/10] drm/edid: clean up connector update error handling and debug logging Date: Wed, 29 Jun 2022 12:27:48 +0300 [thread overview] Message-ID: <de4270b3d2e61fe42b9248490376594d472d19aa.1656494768.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1656494768.git.jani.nikula@intel.com> Bail out on all errors, debug log all errors, and convert to drm device based debug logging. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/drm_edid.c | 41 ++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 62967db78139..e360e1a269f4 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6231,29 +6231,44 @@ static int _drm_connector_update_edid_property(struct drm_connector *connector, if (old_edid) { if (!drm_edid_are_equal(drm_edid ? drm_edid->edid : NULL, 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); + connector->epoch_counter++; + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] EDID changed, epoch counter %llu\n", + connector->base.id, connector->name, + connector->epoch_counter); } } } - drm_object_property_set_value(&connector->base, - dev->mode_config.non_desktop_property, - connector->display_info.non_desktop); - ret = drm_property_replace_global_blob(dev, &connector->edid_blob_ptr, drm_edid ? drm_edid->size : 0, drm_edid ? drm_edid->edid : NULL, &connector->base, dev->mode_config.edid_property); - if (ret) - return ret; - return drm_connector_set_tile_property(connector); + if (ret) { + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] EDID property update failed (%d)\n", + connector->base.id, connector->name, ret); + goto out; + } + + ret = drm_object_property_set_value(&connector->base, + dev->mode_config.non_desktop_property, + connector->display_info.non_desktop); + if (ret) { + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] Non-desktop property update failed (%d)\n", + connector->base.id, connector->name, ret); + goto out; + } + + ret = drm_connector_set_tile_property(connector); + if (ret) { + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] Tile property update failed (%d)\n", + connector->base.id, connector->name, ret); + goto out; + } + +out: + return ret; } /** -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@intel.com> To: dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [CI RESEND 03/10] drm/edid: clean up connector update error handling and debug logging Date: Wed, 29 Jun 2022 12:27:48 +0300 [thread overview] Message-ID: <de4270b3d2e61fe42b9248490376594d472d19aa.1656494768.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1656494768.git.jani.nikula@intel.com> Bail out on all errors, debug log all errors, and convert to drm device based debug logging. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/drm_edid.c | 41 ++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 62967db78139..e360e1a269f4 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6231,29 +6231,44 @@ static int _drm_connector_update_edid_property(struct drm_connector *connector, if (old_edid) { if (!drm_edid_are_equal(drm_edid ? drm_edid->edid : NULL, 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); + connector->epoch_counter++; + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] EDID changed, epoch counter %llu\n", + connector->base.id, connector->name, + connector->epoch_counter); } } } - drm_object_property_set_value(&connector->base, - dev->mode_config.non_desktop_property, - connector->display_info.non_desktop); - ret = drm_property_replace_global_blob(dev, &connector->edid_blob_ptr, drm_edid ? drm_edid->size : 0, drm_edid ? drm_edid->edid : NULL, &connector->base, dev->mode_config.edid_property); - if (ret) - return ret; - return drm_connector_set_tile_property(connector); + if (ret) { + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] EDID property update failed (%d)\n", + connector->base.id, connector->name, ret); + goto out; + } + + ret = drm_object_property_set_value(&connector->base, + dev->mode_config.non_desktop_property, + connector->display_info.non_desktop); + if (ret) { + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] Non-desktop property update failed (%d)\n", + connector->base.id, connector->name, ret); + goto out; + } + + ret = drm_connector_set_tile_property(connector); + if (ret) { + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] Tile property update failed (%d)\n", + connector->base.id, connector->name, ret); + goto out; + } + +out: + return ret; } /** -- 2.30.2
next prev parent reply other threads:[~2022-06-29 9:28 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-29 9:27 [CI RESEND 00/10] drm/edid: expand on struct drm_edid usage Jani Nikula 2022-06-29 9:27 ` [Intel-gfx] " Jani Nikula 2022-06-29 9:27 ` [CI RESEND 01/10] drm/edid: move drm_connector_update_edid_property() to drm_edid.c Jani Nikula 2022-06-29 9:27 ` [Intel-gfx] " Jani Nikula 2022-06-29 9:27 ` [CI RESEND 02/10] drm/edid: convert drm_connector_update_edid_property() to struct drm_edid Jani Nikula 2022-06-29 9:27 ` [Intel-gfx] " Jani Nikula 2022-06-29 9:27 ` Jani Nikula [this message] 2022-06-29 9:27 ` [Intel-gfx] [CI RESEND 03/10] drm/edid: clean up connector update error handling and debug logging Jani Nikula 2022-06-29 9:27 ` [CI RESEND 04/10] drm/edid: abstract debugfs override EDID set/reset Jani Nikula 2022-06-29 9:27 ` [Intel-gfx] " Jani Nikula 2022-06-29 9:27 ` [CI RESEND 05/10] drm/edid: add drm_edid_connector_update() Jani Nikula 2022-06-29 9:27 ` [Intel-gfx] " Jani Nikula 2022-06-29 9:27 ` [CI RESEND 06/10] drm/probe-helper: add drm_connector_helper_get_modes() Jani Nikula 2022-06-29 9:27 ` [Intel-gfx] " Jani Nikula 2022-06-29 9:27 ` [CI RESEND 07/10] drm/edid: add drm_edid_raw() to access the raw EDID data Jani Nikula 2022-06-29 9:27 ` [Intel-gfx] " Jani Nikula 2022-06-29 9:27 ` [CI RESEND 08/10] drm/edid: do invalid block filtering in-place Jani Nikula 2022-06-29 9:27 ` [Intel-gfx] " Jani Nikula 2022-06-29 9:27 ` [CI RESEND 09/10] drm/edid: add HF-EEODB support to EDID read and allocation Jani Nikula 2022-06-29 9:27 ` [Intel-gfx] " Jani Nikula 2022-06-29 9:27 ` [CI RESEND 10/10] drm/edid: take HF-EEODB extension count into account Jani Nikula 2022-06-29 9:27 ` [Intel-gfx] " Jani Nikula 2022-06-29 11:27 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/edid: expand on struct drm_edid usage (rev8) Patchwork 2022-06-29 11:55 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-06-30 3:55 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork 2022-06-30 9:55 ` [CI RESEND 00/10] drm/edid: expand on struct drm_edid usage Jani Nikula 2022-06-30 9:55 ` [Intel-gfx] " Jani Nikula
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=de4270b3d2e61fe42b9248490376594d472d19aa.1656494768.git.jani.nikula@intel.com \ --to=jani.nikula@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.