From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v2 02/16] drm/i915/hdmi: stop using connector->override_edid
Date: Mon, 24 Oct 2022 18:13:37 +0300 [thread overview]
Message-ID: <Y1aroUDytxF716ck@intel.com> (raw)
In-Reply-To: <c8b45867cf37134ab40be23e22825ca45adc6041.1666614699.git.jani.nikula@intel.com>
On Mon, Oct 24, 2022 at 03:33:30PM +0300, Jani Nikula wrote:
> The connector->override_edid flag is strictly for EDID override debugfs
> management, and drivers have no business using it.
>
> The check for override_edid was added in commit 301906290553 ("drm/i915:
> Ignore TMDS clock limit for DP++ when EDID override is set") to
> facilitate mode list cross-checking against modes in override EDID when
> the connector in question isn't even connected. The dual mode detect
> fallback would do VBT based limiting in this case.
>
> Instead of override EDID, check for connector forcing in the fallback.
>
> v2: Simply use !connector->force (Ville)
>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdmi.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index a332eaac86cd..02f8374ea51f 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -2374,10 +2374,7 @@ intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector)
> * if the port is a dual mode capable DP port.
> */
> if (type == DRM_DP_DUAL_MODE_UNKNOWN) {
> - /* An overridden EDID imply that we want this port for testing.
> - * Make sure not to set limits for that port.
> - */
> - if (!connector->override_edid &&
> + if (!connector->force &&
> intel_bios_is_port_dp_dual_mode(dev_priv, port)) {
> drm_dbg_kms(&dev_priv->drm,
> "Assuming DP dual mode adaptor presence based on VBT\n");
> --
> 2.34.1
--
Ville Syrjälä
Intel
WARNING: multiple messages have this Message-ID (diff)
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v2 02/16] drm/i915/hdmi: stop using connector->override_edid
Date: Mon, 24 Oct 2022 18:13:37 +0300 [thread overview]
Message-ID: <Y1aroUDytxF716ck@intel.com> (raw)
In-Reply-To: <c8b45867cf37134ab40be23e22825ca45adc6041.1666614699.git.jani.nikula@intel.com>
On Mon, Oct 24, 2022 at 03:33:30PM +0300, Jani Nikula wrote:
> The connector->override_edid flag is strictly for EDID override debugfs
> management, and drivers have no business using it.
>
> The check for override_edid was added in commit 301906290553 ("drm/i915:
> Ignore TMDS clock limit for DP++ when EDID override is set") to
> facilitate mode list cross-checking against modes in override EDID when
> the connector in question isn't even connected. The dual mode detect
> fallback would do VBT based limiting in this case.
>
> Instead of override EDID, check for connector forcing in the fallback.
>
> v2: Simply use !connector->force (Ville)
>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdmi.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index a332eaac86cd..02f8374ea51f 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -2374,10 +2374,7 @@ intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector)
> * if the port is a dual mode capable DP port.
> */
> if (type == DRM_DP_DUAL_MODE_UNKNOWN) {
> - /* An overridden EDID imply that we want this port for testing.
> - * Make sure not to set limits for that port.
> - */
> - if (!connector->override_edid &&
> + if (!connector->force &&
> intel_bios_is_port_dp_dual_mode(dev_priv, port)) {
> drm_dbg_kms(&dev_priv->drm,
> "Assuming DP dual mode adaptor presence based on VBT\n");
> --
> 2.34.1
--
Ville Syrjälä
Intel
next prev parent reply other threads:[~2022-10-24 15:13 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-24 12:33 [Intel-gfx] [PATCH v2 00/16] drm/edid: EDID override refactoring and fixes Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 01/16] drm/i915/hdmi: do dual mode detect only if connected Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 02/16] drm/i915/hdmi: stop using connector->override_edid Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 15:13 ` Ville Syrjälä [this message]
2022-10-24 15:13 ` Ville Syrjälä
2022-10-24 12:33 ` [PATCH v2 03/16] drm/amd/display: " Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] " Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 04/16] drm/edid: debug log EDID override set/reset Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 05/16] drm/edid: abstract debugfs override EDID show better Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 06/16] drm/edid: rename drm_add_override_edid_modes() to drm_edid_override_connector_update() Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 07/16] drm/edid: split drm_edid block count helper Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 08/16] drm/edid: add function for checking drm_edid validity Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 09/16] drm/edid: detach debugfs EDID override from EDID property update Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 17:53 ` [Intel-gfx] " Ville Syrjälä
2022-10-24 17:53 ` Ville Syrjälä
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 10/16] drm/edid/firmware: drop redundant connector_name variable/parameter Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 11/16] drm/edid/firmware: rename drm_load_edid_firmware() to drm_edid_load_firmware() Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 12/16] drm/edid: use struct drm_edid for override/firmware EDID Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 13/16] drm/edid: move edid load declarations to internal header Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 14/16] drm/edid/firmware: convert to drm device specific logging Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 16:00 ` [Intel-gfx] " Ville Syrjälä
2022-10-24 16:00 ` Ville Syrjälä
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 15/16] drm/edid: add [CONNECTOR:%d:%s] to debug logging Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 13:27 ` [Intel-gfx] " Simon Ser
2022-10-24 13:27 ` Simon Ser
2022-10-24 12:33 ` [Intel-gfx] [PATCH v2 16/16] drm/edid: convert to device specific logging Jani Nikula
2022-10-24 12:33 ` Jani Nikula
2022-10-24 16:02 ` [Intel-gfx] " Ville Syrjälä
2022-10-24 16:02 ` Ville Syrjälä
2022-10-24 14:43 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/edid: EDID override refactoring and fixes (rev2) Patchwork
2022-10-24 14:43 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-10-24 15:05 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2022-10-25 12:35 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/edid: EDID override refactoring and fixes (rev3) Patchwork
2022-10-25 12:57 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-10-25 18:25 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2022-10-26 8:33 ` [Intel-gfx] [PATCH v2 00/16] drm/edid: EDID override refactoring and fixes Jani Nikula
2022-10-26 8:33 ` 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=Y1aroUDytxF716ck@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/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: link
Be 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.