[Intel-gfx] [PATCH] Revert "drm/i915/mst: Populate connector->ddc"

[Intel-gfx] [PATCH] Revert "drm/i915/mst: Populate connector->ddc"

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

This reverts commit 959fb1a686528df1b8fb0cc7bec8ff851b1594a5.

Looks like the core MST code might not call i2c_adapter() for us
in time, and thus creating the ddc symlink will fail. This will
in fact fail the entire connector registration, but the MST code
doesn't really seem to care about that and blindly plows ahead.
All we may get in the logs is a nearly back to back
register+unregister debug messages:
 [drm:drm_dp_mst_connector_late_register [drm_display_helper]] registering DPMST remote bus for card0-DP-7
 [drm:intel_dp_hpd_pulse [i915]] DPRX ESI: 42 00 00 02
 [drm:drm_dp_mst_connector_early_unregister [drm_display_helper]] unregistering DPMST remote bus for card0-DP-7

Untangling the initialization order may take some real work,
so let's just revert the ddc symlink addition for now...

Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9357
Fixes: 959fb1a68652 ("drm/i915/mst: Populate connector->ddc")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 80411ce85fc0..ff3accebf0a8 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -1110,10 +1110,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
 	drm_dp_mst_get_port_malloc(port);
 
 	connector = &intel_connector->base;
-	ret = drm_connector_init_with_ddc(dev, connector,
-					  &intel_dp_mst_connector_funcs,
-					  DRM_MODE_CONNECTOR_DisplayPort,
-					  &port->aux.ddc);
+	ret = drm_connector_init(dev, connector, &intel_dp_mst_connector_funcs,
+				 DRM_MODE_CONNECTOR_DisplayPort);
 	if (ret) {
 		drm_dp_mst_put_port_malloc(port);
 		intel_connector_free(intel_connector);
-- 
2.41.0

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Revert "drm/i915/mst: Populate connector->ddc"

[Patchwork]

== Series Details ==

Series: Revert "drm/i915/mst: Populate connector->ddc"
URL   : https://patchwork.freedesktop.org/series/123901/
State : warning

== Summary ==

Error: dim checkpatch failed
c88cd2abd678 Revert "drm/i915/mst: Populate connector->ddc"
-:17: WARNING:COMMIT_LOG_LONG_LINE: Prefer a maximum 75 chars per line (possible unwrapped commit description?)
#17: 
 [drm:drm_dp_mst_connector_late_register [drm_display_helper]] registering DPMST remote bus for card0-DP-7

total: 0 errors, 1 warnings, 0 checks, 12 lines checked

[Intel-gfx] ✗ Fi.CI.BAT: failure for Revert "drm/i915/mst: Populate connector->ddc"

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 5704 bytes --]

== Series Details ==

Series: Revert "drm/i915/mst: Populate connector->ddc"
URL   : https://patchwork.freedesktop.org/series/123901/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_13651 -> Patchwork_123901v1
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_123901v1 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_123901v1, please notify your bug team (lgci.bug.filing@intel.com) to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123901v1/index.html

Participating hosts (38 -> 38)
------------------------------

  Additional (1): bat-rpls-2 
  Missing    (1): fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_123901v1:

### IGT changes ###

#### Possible regressions ####

  * igt@runner@aborted:
    - bat-rpls-2:         NOTRUN -> [FAIL][1]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123901v1/bat-rpls-2/igt@runner@aborted.html

  
Known issues
------------

  Here are the changes found in Patchwork_123901v1 that come from known issues:

### CI changes ###

#### Issues hit ####

  * boot:
    - fi-hsw-4770:        [PASS][2] -> [FAIL][3] ([i915#8293])
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13651/fi-hsw-4770/boot.html
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123901v1/fi-hsw-4770/boot.html

  

### IGT changes ###

#### Issues hit ####

  * igt@gem_busy@busy@all-engines:
    - bat-mtlp-8:         [PASS][4] -> [DMESG-FAIL][5] ([i915#8962] / [i915#9121])
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13651/bat-mtlp-8/igt@gem_busy@busy@all-engines.html
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123901v1/bat-mtlp-8/igt@gem_busy@busy@all-engines.html

  * igt@i915_selftest@live@gt_heartbeat:
    - fi-apl-guc:         [PASS][6] -> [DMESG-FAIL][7] ([i915#5334])
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13651/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123901v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html

  * igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence:
    - bat-dg2-11:         NOTRUN -> [SKIP][8] ([i915#1845]) +3 other tests skip
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123901v1/bat-dg2-11/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence.html

  
#### Possible fixes ####

  * igt@i915_selftest@live@execlists:
    - fi-bsw-n3050:       [ABORT][9] ([i915#7913]) -> [PASS][10]
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13651/fi-bsw-n3050/igt@i915_selftest@live@execlists.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123901v1/fi-bsw-n3050/igt@i915_selftest@live@execlists.html

  * igt@kms_chamelium_edid@hdmi-edid-read:
    - {bat-dg2-13}:       [DMESG-WARN][11] ([i915#7952]) -> [PASS][12]
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13651/bat-dg2-13/igt@kms_chamelium_edid@hdmi-edid-read.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123901v1/bat-dg2-13/igt@kms_chamelium_edid@hdmi-edid-read.html

  * igt@kms_hdmi_inject@inject-audio:
    - fi-kbl-guc:         [FAIL][13] ([IGT#3] / [i915#6121]) -> [PASS][14]
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13651/fi-kbl-guc/igt@kms_hdmi_inject@inject-audio.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123901v1/fi-kbl-guc/igt@kms_hdmi_inject@inject-audio.html

  
#### Warnings ####

  * igt@i915_suspend@basic-s3-without-i915:
    - bat-rpls-1:         [ABORT][15] ([i915#7978] / [i915#8668]) -> [INCOMPLETE][16] ([i915#9136])
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13651/bat-rpls-1/igt@i915_suspend@basic-s3-without-i915.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123901v1/bat-rpls-1/igt@i915_suspend@basic-s3-without-i915.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [IGT#3]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/3
  [i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
  [i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
  [i915#6121]: https://gitlab.freedesktop.org/drm/intel/issues/6121
  [i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
  [i915#7952]: https://gitlab.freedesktop.org/drm/intel/issues/7952
  [i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
  [i915#8293]: https://gitlab.freedesktop.org/drm/intel/issues/8293
  [i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668
  [i915#8962]: https://gitlab.freedesktop.org/drm/intel/issues/8962
  [i915#9121]: https://gitlab.freedesktop.org/drm/intel/issues/9121
  [i915#9136]: https://gitlab.freedesktop.org/drm/intel/issues/9136


Build changes
-------------

  * Linux: CI_DRM_13651 -> Patchwork_123901v1

  CI-20190529: 20190529
  CI_DRM_13651: 61b71c3f061a44a6ab1dcf756918886aa03a5480 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_7493: 2517e42d612e0c1ca096acf8b5f6177f7ef4bce7 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_123901v1: 61b71c3f061a44a6ab1dcf756918886aa03a5480 @ git://anongit.freedesktop.org/gfx-ci/linux


### Linux commits

6b4247824f6e Revert "drm/i915/mst: Populate connector->ddc"

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_123901v1/index.html

[-- Attachment #2: Type: text/html, Size: 6559 bytes --]

Re: [Intel-gfx] [PATCH] Revert "drm/i915/mst: Populate connector->ddc"

[Jani Nikula]

On Tue, 19 Sep 2023, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> This reverts commit 959fb1a686528df1b8fb0cc7bec8ff851b1594a5.
>
> Looks like the core MST code might not call i2c_adapter() for us
> in time, and thus creating the ddc symlink will fail. This will
> in fact fail the entire connector registration, but the MST code
> doesn't really seem to care about that and blindly plows ahead.
> All we may get in the logs is a nearly back to back
> register+unregister debug messages:
>  [drm:drm_dp_mst_connector_late_register [drm_display_helper]] registering DPMST remote bus for card0-DP-7
>  [drm:intel_dp_hpd_pulse [i915]] DPRX ESI: 42 00 00 02
>  [drm:drm_dp_mst_connector_early_unregister [drm_display_helper]] unregistering DPMST remote bus for card0-DP-7
>
> Untangling the initialization order may take some real work,
> so let's just revert the ddc symlink addition for now...
>
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9357
> Fixes: 959fb1a68652 ("drm/i915/mst: Populate connector->ddc")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Acked-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index 80411ce85fc0..ff3accebf0a8 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -1110,10 +1110,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
>  	drm_dp_mst_get_port_malloc(port);
>  
>  	connector = &intel_connector->base;
> -	ret = drm_connector_init_with_ddc(dev, connector,
> -					  &intel_dp_mst_connector_funcs,
> -					  DRM_MODE_CONNECTOR_DisplayPort,
> -					  &port->aux.ddc);
> +	ret = drm_connector_init(dev, connector, &intel_dp_mst_connector_funcs,
> +				 DRM_MODE_CONNECTOR_DisplayPort);
>  	if (ret) {
>  		drm_dp_mst_put_port_malloc(port);
>  		intel_connector_free(intel_connector);

-- 
Jani Nikula, Intel

Re: [Intel-gfx] [PATCH] Revert "drm/i915/mst: Populate connector->ddc"

[Karthik B S]

On 9/19/2023 3:26 PM, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> This reverts commit 959fb1a686528df1b8fb0cc7bec8ff851b1594a5.
>
> Looks like the core MST code might not call i2c_adapter() for us
> in time, and thus creating the ddc symlink will fail. This will
> in fact fail the entire connector registration, but the MST code
> doesn't really seem to care about that and blindly plows ahead.
> All we may get in the logs is a nearly back to back
> register+unregister debug messages:
>   [drm:drm_dp_mst_connector_late_register [drm_display_helper]] registering DPMST remote bus for card0-DP-7
>   [drm:intel_dp_hpd_pulse [i915]] DPRX ESI: 42 00 00 02
>   [drm:drm_dp_mst_connector_early_unregister [drm_display_helper]] unregistering DPMST remote bus for card0-DP-7
>
> Untangling the initialization order may take some real work,
> so let's just revert the ddc symlink addition for now...
>
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9357
> Fixes: 959fb1a68652 ("drm/i915/mst: Populate connector->ddc")
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Karthik B S <karthik.b.s@intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index 80411ce85fc0..ff3accebf0a8 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -1110,10 +1110,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
>   	drm_dp_mst_get_port_malloc(port);
>   
>   	connector = &intel_connector->base;
> -	ret = drm_connector_init_with_ddc(dev, connector,
> -					  &intel_dp_mst_connector_funcs,
> -					  DRM_MODE_CONNECTOR_DisplayPort,
> -					  &port->aux.ddc);
> +	ret = drm_connector_init(dev, connector, &intel_dp_mst_connector_funcs,
> +				 DRM_MODE_CONNECTOR_DisplayPort);
>   	if (ret) {
>   		drm_dp_mst_put_port_malloc(port);
>   		intel_connector_free(intel_connector);

Re: [Intel-gfx] [PATCH] Revert "drm/i915/mst: Populate connector->ddc"

[Ville Syrjälä]

On Thu, Sep 21, 2023 at 12:28:53PM +0530, Karthik B S wrote:
> 
> On 9/19/2023 3:26 PM, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > This reverts commit 959fb1a686528df1b8fb0cc7bec8ff851b1594a5.
> >
> > Looks like the core MST code might not call i2c_adapter() for us
> > in time, and thus creating the ddc symlink will fail. This will
> > in fact fail the entire connector registration, but the MST code
> > doesn't really seem to care about that and blindly plows ahead.
> > All we may get in the logs is a nearly back to back
> > register+unregister debug messages:
> >   [drm:drm_dp_mst_connector_late_register [drm_display_helper]] registering DPMST remote bus for card0-DP-7
> >   [drm:intel_dp_hpd_pulse [i915]] DPRX ESI: 42 00 00 02
> >   [drm:drm_dp_mst_connector_early_unregister [drm_display_helper]] unregistering DPMST remote bus for card0-DP-7
> >
> > Untangling the initialization order may take some real work,
> > so let's just revert the ddc symlink addition for now...
> >
> > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9357
> > Fixes: 959fb1a68652 ("drm/i915/mst: Populate connector->ddc")
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Tested-by: Karthik B S <karthik.b.s@intel.com>

I assume that means it helped with the actual problem -> pushed to din
Thanks.

> > ---
> >   drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 ++----
> >   1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > index 80411ce85fc0..ff3accebf0a8 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > @@ -1110,10 +1110,8 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
> >   	drm_dp_mst_get_port_malloc(port);
> >   
> >   	connector = &intel_connector->base;
> > -	ret = drm_connector_init_with_ddc(dev, connector,
> > -					  &intel_dp_mst_connector_funcs,
> > -					  DRM_MODE_CONNECTOR_DisplayPort,
> > -					  &port->aux.ddc);
> > +	ret = drm_connector_init(dev, connector, &intel_dp_mst_connector_funcs,
> > +				 DRM_MODE_CONNECTOR_DisplayPort);
> >   	if (ret) {
> >   		drm_dp_mst_put_port_malloc(port);
> >   		intel_connector_free(intel_connector);

-- 
Ville Syrjälä
Intel