On Fri, 2021-02-19 at 15:42 -0800, Randy Dunlap wrote:

On 2/19/21 1:52 PM, Lyude Paul wrote:

...

Since we're about to be adding some more fields and update this documentation, let's rewrap it to the new column limit of 100 beforehand. No actual doc or functional changes are made here.

The preferred column limit is still 80. For some (exceptional) cases, going up to 100 is OK, but I don't see any reason here to go beyond 80.

Found some posts online that discussed this in detail:

https://linux.slashdot.org/story/20/05/31/211211/linus-torvalds-argues-again...

so I guess I'm fine with rewrapping these to 80 cols (although honestly, it'd be really nice to just have a single col limit to make things easier on text editors :) in the next respin.

Signed-off-by: Lyude Paul lyude@redhat.com

include/drm/drm_dp_helper.h | 42 ++++++++++++++++---------------------  1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index edffd1dcca3e..2891a98eebc8 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -1839,34 +1839,28 @@ struct drm_dp_aux_cec {   * @crc_count: counter of captured frame CRCs   * @transfer: transfers a message representing a single AUX transaction   *

• • The .dev field should be set to a pointer to the device that implements
• • the AUX channel.

• • The .dev field should be set to a pointer to the device that implements

the AUX channel.   *

• • The .name field may be used to specify the name of the I2C adapter. If set

to

• • NULL, dev_name() of .dev will be used.

• • The .name field may be used to specify the name of the I2C adapter. If set

to NULL, dev_name() of

• • .dev will be used.

*

• • Drivers provide a hardware-specific implementation of how transactions
• • are executed via the .transfer() function. A pointer to a drm_dp_aux_msg
• • structure describing the transaction is passed into this function. Upon
• • success, the implementation should return the number of payload bytes
• • that were transferred, or a negative error-code on failure. Helpers
• • propagate errors from the .transfer() function, with the exception of
• • the -EBUSY error, which causes a transaction to be retried. On a short,
• • helpers will return -EPROTO to make it simpler to check for failure.

• • Drivers provide a hardware-specific implementation of how transactions are

executed via the

• • .transfer() function. A pointer to a drm_dp_aux_msg structure describing

the transaction is

• • passed into this function. Upon success, the implementation should return

the number of payload

• • bytes that were transferred, or a negative error-code on failure. Helpers

propagate errors from

• • the .transfer() function, with the exception of the -EBUSY error, which

causes a transaction to

• • be retried. On a short, helpers will return -EPROTO to make it simpler to

check for failure.   *

• • An AUX channel can also be used to transport I2C messages to a sink. A
• • typical application of that is to access an EDID that's present in the
• • sink device. The .transfer() function can also be used to execute such
• • transactions. The drm_dp_aux_register() function registers an I2C
• • adapter that can be passed to drm_probe_ddc(). Upon removal, drivers
• • should call drm_dp_aux_unregister() to remove the I2C adapter.
• • The I2C adapter uses long transfers by default; if a partial response is
• • received, the adapter will drop down to the size given by the partial
• • response for this transaction only.

• • An AUX channel can also be used to transport I2C messages to a sink. A

typical application of

• • that is to access an EDID that's present in the sink device. The

.transfer() function can also be

• • used to execute such transactions. The drm_dp_aux_register() function

registers an I2C adapter

• • that can be passed to drm_probe_ddc(). Upon removal, drivers should call

drm_dp_aux_unregister()

• • to remove the I2C adapter. The I2C adapter uses long transfers by default;

if a partial response

• • is received, the adapter will drop down to the size given by the partial

response for this

• • transaction only.

*

• • Note that the aux helper code assumes that the .transfer() function
• • only modifies the reply field of the drm_dp_aux_msg structure.  The
• • retry logic and i2c helpers assume this is the case.

• • Note that the aux helper code assumes that the .transfer() function only

modifies the reply field

• • of the drm_dp_aux_msg structure. The retry logic and i2c helpers assume

this is the case.   */  struct drm_dp_aux {         const char *name;

On Fri, Feb 19, 2021 at 04:52:59PM -0500, Lyude Paul wrote:

As pointed out by the documentation for drm_dp_aux_register(), drm_dp_aux_init() should be used in situations where the AUX channel for a display driver can potentially be registered before it's respective DRM driver. This is the case with Tegra, since the DP aux channel exists as a platform device instead of being a grandchild of the DRM device.

Since we're about to add a backpointer to a DP AUX channel's respective DRM device, let's fix this so that we don't potentially allow userspace to use the AUX channel before we've associated it with it's DRM connector.

Signed-off-by: Lyude Paul lyude@redhat.com

drivers/gpu/drm/tegra/dpaux.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c index 105fb9cdbb3b..ea56c6ec25e4 100644 --- a/drivers/gpu/drm/tegra/dpaux.c +++ b/drivers/gpu/drm/tegra/dpaux.c @@ -534,9 +534,7 @@ static int tegra_dpaux_probe(struct platform_device *pdev) dpaux->aux.transfer = tegra_dpaux_transfer; dpaux->aux.dev = &pdev->dev;

• err = drm_dp_aux_register(&dpaux->aux);
• if (err < 0)

• return err;
  

• drm_dp_aux_init(&dpaux->aux);

I just noticed that this change causes an error on some setups that I haven't seen before. The problem is that the SOR driver tries to grab a reference to the I2C device to make sure it doesn't go away while it has a pointer to it.

However, since now the I2C adapter hasn't been registered yet, I get this:

[ 15.013969] kobject: '(null)' (000000005c903e43): is not initialized, yet kobject_get() is being called.

I recall that you wanted to make this change so that a backpointer to the DRM device could be added (I think that's patch 15 of the series), but I didn't see that patch get merged, so it's a bit difficult to try and fix this up.

Has the situation changed? Do we no longer need the backpointer? If we still want it, what's the plan for merging the change? Should I work under the assumption that patch will make it in sometime and try to fix this on top of that?

I'm thinking that perhaps we can move the I2C adapter registration into drm_dp_aux_init() since that's independent of the DRM device. It would also make a bit more sense from the Tegra driver's point of view where all devices would be created during the ->probe() path, and only during the ->init() path would the connection between DRM device and DRM DP AUX device be established.

Thierry

Hi Lyude,

Thank you for the patch.

On Fri, Feb 19, 2021 at 04:53:02PM -0500, Lyude Paul wrote:

Since we're about to add a back-pointer to drm_dev in drm_dp_aux, let's move the AUX adapter registration to the first point where we know which DRM device we'll be working with - when the drm_bridge is attached. Likewise, we unregister the AUX adapter on bridge detachment by adding a ti_sn_bridge_detach() callback.

Signed-off-by: Lyude Paul lyude@redhat.com

Reviewed-by: Laurent Pinchart laurent.pinchart@ideasonboard.com

---

drivers/gpu/drm/bridge/ti-sn65dsi86.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index f27306c51e4d..88df4dd0f39d 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -362,12 +362,18 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, return -EINVAL; }

• ret = drm_dp_aux_register(&pdata->aux);
• if (ret < 0) {

• drm_err(bridge->dev, "Failed to register DP AUX channel: %d\n", ret);
  

• return ret;
  

• }
• ret = drm_connector_init(bridge->dev, &pdata->connector, &ti_sn_bridge_connector_funcs, DRM_MODE_CONNECTOR_eDP); if (ret) { DRM_ERROR("Failed to initialize connector with drm\n");

• return ret;
  

• goto err_conn_init;
  

  }

  drm_connector_helper_add(&pdata->connector,

@@ -424,9 +430,16 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, mipi_dsi_device_unregister(dsi); err_dsi_host: drm_connector_cleanup(&pdata->connector); +err_conn_init:

• drm_dp_aux_unregister(&pdata->aux); return ret;

}

+static void ti_sn_bridge_detach(struct drm_bridge *bridge) +{

• drm_dp_aux_unregister(&bridge_to_ti_sn_bridge(bridge)->aux);

+}

static void ti_sn_bridge_disable(struct drm_bridge *bridge) { struct ti_sn_bridge *pdata = bridge_to_ti_sn_bridge(bridge); @@ -863,6 +876,7 @@ static void ti_sn_bridge_post_disable(struct drm_bridge *bridge)

static const struct drm_bridge_funcs ti_sn_bridge_funcs = { .attach = ti_sn_bridge_attach,

• .detach = ti_sn_bridge_detach, .pre_enable = ti_sn_bridge_pre_enable, .enable = ti_sn_bridge_enable, .disable = ti_sn_bridge_disable,

@@ -1287,7 +1301,7 @@ static int ti_sn_bridge_probe(struct i2c_client *client, pdata->aux.name = "ti-sn65dsi86-aux"; pdata->aux.dev = pdata->dev; pdata->aux.transfer = ti_sn_aux_transfer;

• drm_dp_aux_register(&pdata->aux);

• drm_dp_aux_init(&pdata->aux);

  pdata->bridge.funcs = &ti_sn_bridge_funcs; pdata->bridge.of_node = client->dev.of_node;

Hey Lyude,

Thanks for the patch, it looks good to me.

Reviewed-by: Robert Foss robert.foss@linaro.org

On Fri, 19 Feb 2021 at 22:56, Lyude Paul lyude@redhat.com wrote:

Surprisingly, this bridge actually registers it's AUX adapter at the correct time already. Nice job! However, it does forget to actually unregister the AUX adapter, so let's add a bridge function to handle that.

Signed-off-by: Lyude Paul lyude@redhat.com

drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c index 81debd02c169..ec4607dc01eb 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c @@ -942,6 +942,11 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge, return 0; }

+static void anx78xx_bridge_detach(struct drm_bridge *bridge) +{

•   drm_dp_aux_unregister(&bridge_to_anx78xx(bridge)->aux);
  

+}

static enum drm_mode_status anx78xx_bridge_mode_valid(struct drm_bridge *bridge, const struct drm_display_info *info, @@ -1013,6 +1018,7 @@ static void anx78xx_bridge_enable(struct drm_bridge *bridge)

static const struct drm_bridge_funcs anx78xx_bridge_funcs = { .attach = anx78xx_bridge_attach,

•   .detach = anx78xx_bridge_detach,
    .mode_valid = anx78xx_bridge_mode_valid,
    .disable = anx78xx_bridge_disable,
    .mode_set = anx78xx_bridge_mode_set,
  

-- 2.29.2

Hey Lyude,

Thanks for the patch, it looks good to me.

Reviewed-by: Robert Foss robert.foss@linaro.org

On Fri, 19 Feb 2021 at 22:56, Lyude Paul lyude@redhat.com wrote:

Since encoder mappings for connectors are exposed to userspace, we should be attaching the encoder before exposing the connector to userspace. Just a drive-by fix for an issue I noticed while fixing up usages of drm_dp_aux_init()/drm_dp_aux_register() across the tree.

Signed-off-by: Lyude Paul lyude@redhat.com

drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c index ec4607dc01eb..338dd8531d4b 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c @@ -924,12 +924,6 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge, drm_connector_helper_add(&anx78xx->connector, &anx78xx_connector_helper_funcs);

•   err = drm_connector_register(&anx78xx->connector);
  

•   if (err) {
  

•           DRM_ERROR("Failed to register connector: %d\n", err);
  

•           return err;
  

•   }
  

•   anx78xx->connector.polled = DRM_CONNECTOR_POLL_HPD;
  
    err = drm_connector_attach_encoder(&anx78xx->connector,
  

@@ -939,6 +933,12 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge, return err; }

•   err = drm_connector_register(&anx78xx->connector);
  

•   if (err) {
  

•           DRM_ERROR("Failed to register connector: %d\n", err);
  

•           return err;
  

•   }
  

•   return 0;
  

}

-- 2.29.2

Hey Lyude,

Thanks for the patch, it looks good to me.

Reviewed-by: Robert Foss robert.foss@linaro.org

On Fri, 19 Feb 2021 at 22:56, Lyude Paul lyude@redhat.com wrote:

Just another issue I noticed while correcting usages of drm_dp_aux_init()/drm_dp_aux_register() around the tree. If any of the steps in anx78xx_bridge_attach() fail, we end up leaking resources. So, let's fix that (and fix leaking a DP AUX adapter in the process) by unrolling on errors.

Signed-off-by: Lyude Paul lyude@redhat.com

drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c index 338dd8531d4b..f20558618220 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c @@ -918,7 +918,7 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge, DRM_MODE_CONNECTOR_DisplayPort); if (err) { DRM_ERROR("Failed to initialize connector: %d\n", err);

•           return err;
  

•           goto aux_unregister;
    }
  
    drm_connector_helper_add(&anx78xx->connector,
  

@@ -930,16 +930,21 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge, bridge->encoder); if (err) { DRM_ERROR("Failed to link up connector to encoder: %d\n", err);

•           return err;
  

•           goto connector_cleanup;
    }
  
    err = drm_connector_register(&anx78xx->connector);
    if (err) {
            DRM_ERROR("Failed to register connector: %d\n", err);
  

•           return err;
  

•           goto connector_cleanup;
    }
  
    return 0;
  

+connector_cleanup:

•   drm_connector_cleanup(&anx78xx->connector);
  

+aux_unregister:

•   drm_dp_aux_unregister(&anx78xx->aux);
  

•   return err;
  

}

static void anx78xx_bridge_detach(struct drm_bridge *bridge)

2.29.2

Hey Lyude,

Thanks for the patch, it looks good to me.

Reviewed-by: Robert Foss robert.foss@linaro.org

On Fri, 19 Feb 2021 at 22:58, Lyude Paul lyude@redhat.com wrote:

Another driver I found that seems to forget to unregister it's DP AUX device. Let's fix this by adding anx6345_bridge_detach().

Signed-off-by: Lyude Paul lyude@redhat.com

drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c index d9164fab044d..8e016ba7c54a 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c @@ -574,6 +574,11 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge, return 0; }

+static void anx6345_bridge_detach(struct drm_bridge *bridge) +{

•   drm_dp_aux_unregister(&bridge_to_anx6345(bridge)->aux);
  

+}

static enum drm_mode_status anx6345_bridge_mode_valid(struct drm_bridge *bridge, const struct drm_display_info *info, @@ -624,6 +629,7 @@ static void anx6345_bridge_enable(struct drm_bridge *bridge)

static const struct drm_bridge_funcs anx6345_bridge_funcs = { .attach = anx6345_bridge_attach,

•   .detach = anx6345_bridge_detach,
    .mode_valid = anx6345_bridge_mode_valid,
    .disable = anx6345_bridge_disable,
    .enable = anx6345_bridge_enable,
  

-- 2.29.2

Hey Lyude,

Thanks for the patch, it looks good to me.

Reviewed-by: Robert Foss robert.foss@linaro.org

On Fri, 19 Feb 2021 at 22:58, Lyude Paul lyude@redhat.com wrote:

Another case of linking an encoder to a connector after the connector's been registered. The proper place to do this is before connector registration, so let's fix that.

Signed-off-by: Lyude Paul lyude@redhat.com

drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c index 8e016ba7c54a..6258f16da0e8 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c @@ -556,12 +556,6 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge, drm_connector_helper_add(&anx6345->connector, &anx6345_connector_helper_funcs);

•   err = drm_connector_register(&anx6345->connector);
  

•   if (err) {
  

•           DRM_ERROR("Failed to register connector: %d\n", err);
  

•           return err;
  

•   }
  

•   anx6345->connector.polled = DRM_CONNECTOR_POLL_HPD;
  
    err = drm_connector_attach_encoder(&anx6345->connector,
  

@@ -571,6 +565,12 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge, return err; }

•   err = drm_connector_register(&anx6345->connector);
  

•   if (err) {
  

•           DRM_ERROR("Failed to register connector: %d\n", err);
  

•           return err;
  

•   }
  

•   return 0;
  

}

-- 2.29.2

Hey Lyude,

Thanks for the patch, it looks good to me.

Reviewed-by: Robert Foss robert.foss@linaro.org

On Fri, 19 Feb 2021 at 22:58, Lyude Paul lyude@redhat.com wrote:

Another drive-by fix I found when fixing DP AUX adapter across the kernel tree - make sure we don't leak resources (and by proxy-AUX adapters) on failures in anx6345_bridge_attach() by unrolling on errors.

Signed-off-by: Lyude Paul lyude@redhat.com

drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c index 6258f16da0e8..aa6cda458eb9 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c @@ -550,7 +550,7 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge, DRM_MODE_CONNECTOR_eDP); if (err) { DRM_ERROR("Failed to initialize connector: %d\n", err);

•           return err;
  

•           goto aux_unregister;
    }
  
    drm_connector_helper_add(&anx6345->connector,
  

@@ -562,16 +562,21 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge, bridge->encoder); if (err) { DRM_ERROR("Failed to link up connector to encoder: %d\n", err);

•           return err;
  

•           goto connector_cleanup;
    }
  
    err = drm_connector_register(&anx6345->connector);
    if (err) {
            DRM_ERROR("Failed to register connector: %d\n", err);
  

•           return err;
  

•           goto connector_cleanup;
    }
  
    return 0;
  

+connector_cleanup:

•   drm_connector_cleanup(&anx6345->connector);
  

+aux_unregister:

•   drm_dp_aux_unregister(&anx6345->aux);
  

•   return err;
  

}

static void anx6345_bridge_detach(struct drm_bridge *bridge)

2.29.2

Hey Lyude,

Thanks for the patch, it looks good to me.

Reviewed-by: Robert Foss robert.foss@linaro.org

On Fri, 19 Feb 2021 at 22:58, Lyude Paul lyude@redhat.com wrote:

Just another drive-by fix I noticed while going through the tree to cleanup DP aux adapter registration - make sure we unregister the DP AUX dev if analogix_dp_probe() fails.

Signed-off-by: Lyude Paul lyude@redhat.com

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index aa1bb86293fd..f115233b1cb9 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1782,6 +1782,7 @@ int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev)

err_disable_pm_runtime: pm_runtime_disable(dp->dev);

•   drm_dp_aux_unregister(&dp->aux);
  
    return ret;
  

}

2.29.2

On Sun, 2021-02-21 at 20:21 +0200, Laurent Pinchart wrote:

Hi Lyude,

Thank you for the patch.

On Fri, Feb 19, 2021 at 04:53:11PM -0500, Lyude Paul wrote:

...

This is something that we've wanted for a while now: the ability to actually look up the respective drm_device for a given drm_dp_aux struct. This will also allow us to transition over to using the drm_dbg_*() helpers for debug message printing, as we'll finally have a drm_device to reference for doing so.

Isn't it better to use the existing dev field ? If you have multiple DP outputs for one DRM device, using the DRM device name in debug messages won't tell which output the message corresponds to.

Well the thing is dev won't tell you that either - on most SoCs the DP AUX adapter is it's own platform device that isn't a child of the DRM device. Also, that's what the ability to name AUX channels is supposed to be there for.

...

Note that there is one limitation with this - because some DP AUX adapters exist as platform devices which are initialized independently of their respective DRM devices, one cannot rely on drm_dp_aux->drm_dev to always be non-NULL until drm_dp_aux_register() has been called. We make sure to point this out in the documentation for struct drm_dp_aux.

Signed-off-by: Lyude Paul lyude@redhat.com

drivers/gpu/drm/amd/amdgpu/atombios_dp.c                 | 1 +  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c  | 1 +  drivers/gpu/drm/bridge/analogix/analogix-anx6345.c       | 1 +  drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c       | 1 +  drivers/gpu/drm/bridge/analogix/analogix_dp_core.c       | 1 +  drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c      | 1 +  drivers/gpu/drm/bridge/tc358767.c                        | 1 +  drivers/gpu/drm/bridge/ti-sn65dsi86.c                    | 1 +  drivers/gpu/drm/drm_dp_aux_dev.c                         | 6 ++++++  drivers/gpu/drm/drm_dp_mst_topology.c                    | 1 +  drivers/gpu/drm/i915/display/intel_dp_aux.c              | 1 +  drivers/gpu/drm/msm/edp/edp.h                            | 3 +--  drivers/gpu/drm/msm/edp/edp_aux.c                        | 5 +++--  drivers/gpu/drm/msm/edp/edp_ctrl.c                       | 2 +-  drivers/gpu/drm/nouveau/nouveau_connector.c              | 1 +  drivers/gpu/drm/radeon/atombios_dp.c                     | 1 +  drivers/gpu/drm/tegra/dpaux.c                            | 1 +  drivers/gpu/drm/xlnx/zynqmp_dp.c                         | 1 +  include/drm/drm_dp_helper.h                              | 9 ++++++++-  19 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c index a3ba9ca11e98..6d35da65e09f 100644 --- a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c +++ b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c @@ -188,6 +188,7 @@ void amdgpu_atombios_dp_aux_init(struct amdgpu_connector *amdgpu_connector)  {         amdgpu_connector->ddc_bus->rec.hpd = amdgpu_connector->hpd.hpd;         amdgpu_connector->ddc_bus->aux.transfer = amdgpu_atombios_dp_aux_transfer; +       amdgpu_connector->ddc_bus->aux.drm_dev = amdgpu_connector->base.dev;         drm_dp_aux_init(&amdgpu_connector->ddc_bus->aux);         amdgpu_connector->ddc_bus->has_aux = true;  } diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 41b09ab22233..163641b44339 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -431,6 +431,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,                           link_index);         aconnector->dm_dp_aux.aux.transfer = dm_dp_aux_transfer;         aconnector->dm_dp_aux.ddc_service = aconnector->dc_link->ddc; +       aconnector->dm_dp_aux.aux.drm_dev = dm->ddev;           drm_dp_aux_init(&aconnector->dm_dp_aux.aux);         drm_dp_cec_register_connector(&aconnector->dm_dp_aux.aux, diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c index aa6cda458eb9..e33cd077595a 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c @@ -537,6 +537,7 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge,         /* Register aux channel */         anx6345->aux.name = "DP-AUX";         anx6345->aux.dev = &anx6345->client->dev; +       anx6345->aux.drm_dev = bridge->dev;         anx6345->aux.transfer = anx6345_aux_transfer;           err = drm_dp_aux_register(&anx6345->aux); diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c index f20558618220..5e6a0ed39199 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c @@ -905,6 +905,7 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge,         /* Register aux channel */         anx78xx->aux.name = "DP-AUX";         anx78xx->aux.dev = &anx78xx->client->dev; +       anx78xx->aux.drm_dev = bridge->dev;         anx78xx->aux.transfer = anx78xx_aux_transfer;           err = drm_dp_aux_register(&anx78xx->aux); diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index f115233b1cb9..550814ca2139 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -1765,6 +1765,7 @@ int analogix_dp_bind(struct analogix_dp_device *dp, struct drm_device *drm_dev)         dp->aux.name = "DP-AUX";         dp->aux.transfer = analogix_dpaux_transfer;         dp->aux.dev = dp->dev; +       dp->aux.drm_dev = drm_dev;           ret = drm_dp_aux_register(&dp->aux);         if (ret) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c index d966a33743b5..fe821ad628ec 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c @@ -1674,6 +1674,7 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge,           dev_dbg(mhdp->dev, "%s\n", __func__);   +       mhdp->aux.drm_dev = bridge->dev;         ret = drm_dp_aux_register(&mhdp->aux);         if (ret < 0)                 return ret; diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index da89922721ed..23a6f90b694b 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -1414,6 +1414,7 @@ static int tc_bridge_attach(struct drm_bridge *bridge,         if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)                 return 0;   +       tc->aux.drm_dev = drm;         ret = drm_dp_aux_register(&tc->aux);         if (ret < 0)                 return ret; diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index 88df4dd0f39d..8e24272bbf00 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -362,6 +362,7 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge,                 return -EINVAL;         }   +       pdata->aux.drm_dev = bridge->dev;         ret = drm_dp_aux_register(&pdata->aux);         if (ret < 0) {                 drm_err(bridge->dev, "Failed to register DP AUX channel: %d\n", ret); diff --git a/drivers/gpu/drm/drm_dp_aux_dev.c b/drivers/gpu/drm/drm_dp_aux_dev.c index e25181bf2c48..06b374cae956 100644 --- a/drivers/gpu/drm/drm_dp_aux_dev.c +++ b/drivers/gpu/drm/drm_dp_aux_dev.c @@ -278,6 +278,12 @@ void drm_dp_aux_unregister_devnode(struct drm_dp_aux *aux)         if (!aux_dev) /* attach must have failed */                 return;   +       /* +        * As some AUX adapters may exist as platform devices which outlive their respective DRM +        * devices, we clear drm_dev to ensure that we never accidentally reference a stale pointer +        */ +       aux->drm_dev = NULL;

mutex_lock(&aux_idr_mutex);         idr_remove(&aux_idr, aux_dev->index);         mutex_unlock(&aux_idr_mutex); diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 932c4641ec3e..cf4f2f85711e 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2349,6 +2349,7 @@ drm_dp_mst_add_port(struct drm_device *dev,         port->aux.is_remote = true;           /* initialize the MST downstream port's AUX crc work queue */ +       port->aux.drm_dev = dev;         drm_dp_remote_aux_init(&port->aux);           /* diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux.c b/drivers/gpu/drm/i915/display/intel_dp_aux.c index eaebf123310a..0571c0794226 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_aux.c +++ b/drivers/gpu/drm/i915/display/intel_dp_aux.c @@ -675,6 +675,7 @@ void intel_dp_aux_init(struct intel_dp *intel_dp)         else                 intel_dp->get_aux_send_ctl = g4x_get_aux_send_ctl;   +       intel_dp->aux.drm_dev = &dev_priv->drm;         drm_dp_aux_init(&intel_dp->aux);           /* Failure to allocate our preferred name is not critical */ diff --git a/drivers/gpu/drm/msm/edp/edp.h b/drivers/gpu/drm/msm/edp/edp.h index eb34243dad53..8590f2ce274d 100644 --- a/drivers/gpu/drm/msm/edp/edp.h +++ b/drivers/gpu/drm/msm/edp/edp.h @@ -46,8 +46,7 @@ void edp_bridge_destroy(struct drm_bridge *bridge);  struct drm_connector *msm_edp_connector_init(struct msm_edp *edp);    /* AUX */ -void *msm_edp_aux_init(struct device *dev, void __iomem *regbase, -                       struct drm_dp_aux **drm_aux); +void *msm_edp_aux_init(struct msm_edp *edp, void __iomem *regbase, struct drm_dp_aux **drm_aux);  void msm_edp_aux_destroy(struct device *dev, struct edp_aux *aux);  irqreturn_t msm_edp_aux_irq(struct edp_aux *aux, u32 isr);  void msm_edp_aux_ctrl(struct edp_aux *aux, int enable); diff --git a/drivers/gpu/drm/msm/edp/edp_aux.c b/drivers/gpu/drm/msm/edp/edp_aux.c index df10a0196d94..e3d85c622cfb 100644 --- a/drivers/gpu/drm/msm/edp/edp_aux.c +++ b/drivers/gpu/drm/msm/edp/edp_aux.c @@ -184,9 +184,9 @@ static ssize_t edp_aux_transfer(struct drm_dp_aux *drm_aux,         return ret;  }   -void *msm_edp_aux_init(struct device *dev, void __iomem *regbase, -       struct drm_dp_aux **drm_aux) +void *msm_edp_aux_init(struct msm_edp *edp, void __iomem *regbase, struct drm_dp_aux **drm_aux)  { +       struct device *dev = &edp->pdev->dev;         struct edp_aux *aux = NULL;         int ret;   @@ -201,6 +201,7 @@ void *msm_edp_aux_init(struct device *dev, void __iomem *regbase,           aux->drm_aux.name = "msm_edp_aux";         aux->drm_aux.dev = dev; +       aux->drm_aux.drm_dev = edp->dev;         aux->drm_aux.transfer = edp_aux_transfer;         ret = drm_dp_aux_register(&aux->drm_aux);         if (ret) { diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c index 0d9657cc70db..57af3d8b6699 100644 --- a/drivers/gpu/drm/msm/edp/edp_ctrl.c +++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c @@ -1153,7 +1153,7 @@ int msm_edp_ctrl_init(struct msm_edp *edp)         }           /* Init aux and phy */ -       ctrl->aux = msm_edp_aux_init(dev, ctrl->base, &ctrl->drm_aux); +       ctrl->aux = msm_edp_aux_init(edp, ctrl->base, &ctrl->drm_aux);         if (!ctrl->aux || !ctrl->drm_aux) {                 pr_err("%s:failed to init aux\n", __func__);                 return -ENOMEM; diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index bfce762adcf0..d1b49508ecb9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -1355,6 +1355,7 @@ nouveau_connector_create(struct drm_device *dev,         case DRM_MODE_CONNECTOR_DisplayPort:         case DRM_MODE_CONNECTOR_eDP:                 nv_connector->aux.dev = connector->kdev; +               nv_connector->aux.drm_dev = dev;                 nv_connector->aux.transfer = nouveau_connector_aux_xfer;                 snprintf(aux_name, sizeof(aux_name), "sor-%04x-%04x",                          dcbe->hasht, dcbe->hashm); diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index 15b00a347560..c50c504bad50 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c @@ -232,6 +232,7 @@ void radeon_dp_aux_init(struct radeon_connector *radeon_connector)           radeon_connector->ddc_bus->rec.hpd = radeon_connector->hpd.hpd;         radeon_connector->ddc_bus->aux.dev = radeon_connector->base.kdev; +       radeon_connector->ddc_bus->aux.drm_dev = radeon_connector->base.dev;         if (ASIC_IS_DCE5(rdev)) {                 if (radeon_auxch)                         radeon_connector->ddc_bus->aux.transfer = radeon_dp_aux_transfer_native; diff --git a/drivers/gpu/drm/tegra/dpaux.c b/drivers/gpu/drm/tegra/dpaux.c index ea56c6ec25e4..7d7cc90b6fc9 100644 --- a/drivers/gpu/drm/tegra/dpaux.c +++ b/drivers/gpu/drm/tegra/dpaux.c @@ -719,6 +719,7 @@ int drm_dp_aux_attach(struct drm_dp_aux *aux, struct tegra_output *output)         unsigned long timeout;         int err;   +       aux->drm_dev = output->connector.dev;         err = drm_dp_aux_register(aux);         if (err < 0)                 return err; diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c index 99158ee67d02..8272eee03adc 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c @@ -1069,6 +1069,7 @@ static int zynqmp_dp_aux_init(struct zynqmp_dp *dp)           dp->aux.name = "ZynqMP DP AUX";         dp->aux.dev = dp->dev; +       dp->aux.drm_dev = dp->drm;         dp->aux.transfer = zynqmp_dp_aux_transfer;           return drm_dp_aux_register(&dp->aux); diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index b35a1c1339e8..45ec74862212 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -1833,13 +1833,19 @@ struct drm_dp_aux_cec {   * @name: user-visible name of this AUX channel and the I2C-over-AUX adapter   * @ddc: I2C adapter that can be used for I2C-over-AUX communication   * @dev: pointer to struct device that is the parent for this AUX channel

• • @drm_dev: pointer to the &drm_device that owns this AUX channel. Beware,

this may be %NULL

• • before drm_dp_aux_register() has been called.

* @crtc: backpointer to the crtc that is currently using this AUX channel   * @hw_mutex: internal mutex used for locking transfers   * @crc_work: worker that captures CRCs for each frame   * @crc_count: counter of captured frame CRCs   * @transfer: transfers a message representing a single AUX transaction   *

• • The @dev field should be set to a pointer to the device that implements

the AUX channel.

• • The @dev field should be set to a pointer to the device that implements

the AUX channel. As well,

• • the @drm_dev field should be set to the &drm_device that will be using

this AUX channel as early

• • as possible. For many graphics drivers this should happen before

drm_dp_aux_init(), however it's

• • perfectly fine to set this field later so long as it's assigned before

calling

• • drm_dp_aux_register().

*   * The @name field may be used to specify the name of the I2C adapter. If set to %NULL, dev_name()   * of @dev will be used. @@ -1866,6 +1872,7 @@ struct drm_dp_aux {         const char *name;         struct i2c_adapter ddc;         struct device *dev; +       struct drm_device *drm_dev;         struct drm_crtc *crtc;         struct mutex hw_mutex;         struct work_struct crc_work;

Hey Lyude,

Thanks for the patch,

On Fri, 19 Feb 2021 at 22:59, Lyude Paul lyude@redhat.com wrote:

Since we're about to move drm_dp_helper.c over to drm_dbg_*(), we'll want to make sure that we can also add ratelimited versions of these macros in order to retain some of the previous debugging output behavior we had.

However, as I was preparing to do this I noticed that the current rate limited macros we have are kind of bogus. It looks like when I wrote these, I didn't notice that we'd always be calling __ratelimit() even if the debugging message we'd be printing would normally be filtered out due to the relevant DRM debugging category being disabled.

So, let's fix this by making sure to check drm_debug_enabled() in our ratelimited macros before calling __ratelimit(), and start using drm_dev_printk() in order to print debugging messages since that will save us from doing a redundant drm_debug_enabled() check. And while we're at it, let's move the code for this into another macro that we can reuse for defining new ratelimited DRM debug macros more easily.

Signed-off-by: Lyude Paul lyude@redhat.com

include/drm/drm_print.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index f32d179e139d..3a0c3fe4d292 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -524,16 +524,20 @@ void __drm_err(const char *format, ...); #define DRM_DEBUG_DP(fmt, ...) \ __drm_dbg(DRM_UT_DP, fmt, ## __VA_ARGS__)

-#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) \ -({ \

•   static DEFINE_RATELIMIT_STATE(_rs,                              \
  

•                                 DEFAULT_RATELIMIT_INTERVAL,       \
  

•                                 DEFAULT_RATELIMIT_BURST);         \
  

•   if (__ratelimit(&_rs))                                          \
  

•           drm_dev_dbg(NULL, DRM_UT_KMS, fmt, ##__VA_ARGS__);      \
  

+#define __DRM_DEFINE_DBG_RATELIMITED(category, drm, fmt, ...) \ +({ \

•   static DEFINE_RATELIMIT_STATE(rs_, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); \
  

•   const struct drm_device *drm_ = (drm);                                                   \
  

•                                                                                             \
  

•   if (drm_debug_enabled(DRM_UT_ ## category) && __ratelimit(&rs_))                         \
  

•           drm_dev_printk(drm_ ? drm_->dev : NULL, KERN_DEBUG, fmt, ## __VA_ARGS__);        \
  

})

checkpatch --strict is unhappy about the tabs/spaces in this patch

ERROR: code indent should use tabs where possible #48: FILE: include/drm/drm_print.h:531: + $

WARNING: please, no spaces at the start of a line #48: FILE: include/drm/drm_print.h:531: + $

+#define drm_dbg_kms_ratelimited(drm, fmt, ...) \

•   __DRM_DEFINE_DBG_RATELIMITED(KMS, drm, fmt, ## __VA_ARGS__)
  

+#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) drm_dbg_kms_ratelimited(NULL, fmt, ## __VA_ARGS__)

/*

• struct drm_device based WARNs

-- 2.29.2

Hi Lyude,

Thank you for the patch.

On Fri, Feb 19, 2021 at 04:53:15PM -0500, Lyude Paul wrote:

So that we can start using drm_dbg_*() in drm_dp_link_train_clock_recovery_delay().

Signed-off-by: Lyude Paul lyude@redhat.com

Reviewed-by: Laurent Pinchart laurent.pinchart@ideasonboard.com

---

drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 2 +- drivers/gpu/drm/drm_dp_helper.c | 3 ++- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 2 +- drivers/gpu/drm/msm/edp/edp_ctrl.c | 2 +- drivers/gpu/drm/radeon/atombios_dp.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +- include/drm/drm_dp_helper.h | 4 +++- 8 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c index 6d35da65e09f..4468f9d6b4dd 100644 --- a/drivers/gpu/drm/amd/amdgpu/atombios_dp.c +++ b/drivers/gpu/drm/amd/amdgpu/atombios_dp.c @@ -611,7 +611,7 @@ amdgpu_atombios_dp_link_train_cr(struct amdgpu_atombios_dp_link_train_info *dp_i dp_info->tries = 0; voltage = 0xff; while (1) {

• drm_dp_link_train_clock_recovery_delay(dp_info->dpcd);
  

• drm_dp_link_train_clock_recovery_delay(dp_info->aux, dp_info->dpcd);
  
  

  if (drm_dp_dpcd_read_link_status(dp_info->aux, dp_info->link_status) <= 0) {

diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 194e0c273809..ce08eb3bface 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -132,7 +132,8 @@ u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZ } EXPORT_SYMBOL(drm_dp_get_adjust_request_post_cursor);

-void drm_dp_link_train_clock_recovery_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]) +void drm_dp_link_train_clock_recovery_delay(const struct drm_dp_aux *aux,

• 			    const u8 dpcd[DP_RECEIVER_CAP_SIZE])
  

{ unsigned long rd_interval = dpcd[DP_TRAINING_AUX_RD_INTERVAL] & DP_TRAINING_AUX_RD_MASK; diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 892d7db7d94f..222073d46bdb 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -441,7 +441,7 @@ static void intel_dp_link_training_clock_recovery_delay(struct intel_dp *intel_d enum drm_dp_phy dp_phy) { if (dp_phy == DP_PHY_DPRX)

• drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd);
  

• drm_dp_link_train_clock_recovery_delay(&intel_dp->aux, intel_dp->dpcd);
  

  else drm_dp_lttpr_link_train_clock_recovery_delay();

} diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c index 36b39c381b3f..2501a6b326a3 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -1103,7 +1103,7 @@ static int dp_ctrl_link_train_1(struct dp_ctrl_private *ctrl, tries = 0; old_v_level = ctrl->link->phy_params.v_level; for (tries = 0; tries < maximum_retries; tries++) {

• drm_dp_link_train_clock_recovery_delay(ctrl->panel->dpcd);
  

• drm_dp_link_train_clock_recovery_delay(ctrl->aux, ctrl->panel->dpcd);
  
  

  ret = dp_ctrl_read_link_status(ctrl, link_status); if (ret)

diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c index 57af3d8b6699..6501598448b4 100644 --- a/drivers/gpu/drm/msm/edp/edp_ctrl.c +++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c @@ -608,7 +608,7 @@ static int edp_start_link_train_1(struct edp_ctrl *ctrl) tries = 0; old_v_level = ctrl->v_level; while (1) {

• drm_dp_link_train_clock_recovery_delay(ctrl->dpcd);
  

• drm_dp_link_train_clock_recovery_delay(ctrl->drm_aux, ctrl->dpcd);
  
  

  rlen = drm_dp_dpcd_read_link_status(ctrl->drm_aux, link_status); if (rlen < DP_LINK_STATUS_SIZE) {

diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index c50c504bad50..299b9d8da376 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c @@ -680,7 +680,7 @@ static int radeon_dp_link_train_cr(struct radeon_dp_link_train_info *dp_info) dp_info->tries = 0; voltage = 0xff; while (1) {

• drm_dp_link_train_clock_recovery_delay(dp_info->dpcd);
  

• drm_dp_link_train_clock_recovery_delay(dp_info->aux, dp_info->dpcd);
  
  

  if (drm_dp_dpcd_read_link_status(dp_info->aux, dp_info->link_status) <= 0) {

diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c index 8272eee03adc..5cc295d8ba9f 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c @@ -713,7 +713,7 @@ static int zynqmp_dp_link_train_cr(struct zynqmp_dp *dp) if (ret) return ret;

• drm_dp_link_train_clock_recovery_delay(dp->dpcd);
  

• drm_dp_link_train_clock_recovery_delay(&dp->aux, dp->dpcd);
  

  ret = drm_dp_dpcd_read_link_status(&dp->aux, link_status); if (ret < 0) return ret;

diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 45ec74862212..e4681665231e 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -29,6 +29,7 @@ #include <drm/drm_connector.h>

struct drm_device; +struct drm_dp_aux;

/*

• Unless otherwise noted, all values are from the DP 1.1a spec. Note that

@@ -1475,7 +1476,8 @@ u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZ #define DP_LTTPR_COMMON_CAP_SIZE 8 #define DP_LTTPR_PHY_CAP_SIZE 3

-void drm_dp_link_train_clock_recovery_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]); +void drm_dp_link_train_clock_recovery_delay(const struct drm_dp_aux *aux,

• 			    const u8 dpcd[DP_RECEIVER_CAP_SIZE]);
  

void drm_dp_lttpr_link_train_clock_recovery_delay(void); void drm_dp_link_train_channel_eq_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]); void drm_dp_lttpr_link_train_channel_eq_delay(const u8 caps[DP_LTTPR_PHY_CAP_SIZE]);

Hey Lyude,

Thanks for the patch

On Fri, 19 Feb 2021 at 23:03, Lyude Paul lyude@redhat.com wrote:

And finally, convert all of the code in drm_dp_mst_topology.c over to using drm_err() and drm_dbg*(). Note that this refactor would have been a lot more complicated to have tried writing a coccinelle script for, so this whole thing was done by hand.

Signed-off-by: Lyude Paul lyude@redhat.com

drivers/gpu/drm/drm_dp_mst_topology.c | 369 +++++++++++++------------- 1 file changed, 187 insertions(+), 182 deletions(-)

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index fb66df39e0bb..f66232954689 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -286,7 +286,8 @@ static void drm_dp_encode_sideband_msg_hdr(struct drm_dp_sideband_msg_hdr *hdr, *len = idx; }

-static bool drm_dp_decode_sideband_msg_hdr(struct drm_dp_sideband_msg_hdr *hdr, +static bool drm_dp_decode_sideband_msg_hdr(const struct drm_dp_mst_topology_mgr *mgr,

•                                      struct drm_dp_sideband_msg_hdr *hdr,
                                       u8 *buf, int buflen, u8 *hdrlen)
  

{ u8 crc4; @@ -303,7 +304,7 @@ static bool drm_dp_decode_sideband_msg_hdr(struct drm_dp_sideband_msg_hdr *hdr, crc4 = drm_dp_msg_header_crc4(buf, (len * 2) - 1);

    if ((crc4 & 0xf) != (buf[len - 1] & 0xf)) {

•           DRM_DEBUG_KMS("crc4 mismatch 0x%x 0x%x\n", crc4, buf[len - 1]);
  

•           drm_dbg_kms(mgr->dev, "crc4 mismatch 0x%x 0x%x\n", crc4, buf[len - 1]);
            return false;
    }
  
  

@@ -789,7 +790,8 @@ static bool drm_dp_sideband_append_payload(struct drm_dp_sideband_msg_rx *msg, return true; }

-static bool drm_dp_sideband_parse_link_address(struct drm_dp_sideband_msg_rx *raw, +static bool drm_dp_sideband_parse_link_address(const struct drm_dp_mst_topology_mgr *mgr,

•                                          struct drm_dp_sideband_msg_rx *raw,
                                           struct drm_dp_sideband_msg_reply_body *repmsg)
  

{ int idx = 1; @@ -1014,7 +1016,8 @@ drm_dp_sideband_parse_query_stream_enc_status( return true; }

-static bool drm_dp_sideband_parse_reply(struct drm_dp_sideband_msg_rx *raw, +static bool drm_dp_sideband_parse_reply(const struct drm_dp_mst_topology_mgr *mgr,

•                                   struct drm_dp_sideband_msg_rx *raw,
                                    struct drm_dp_sideband_msg_reply_body *msg)
  

{ memset(msg, 0, sizeof(*msg)); @@ -1030,7 +1033,7 @@ static bool drm_dp_sideband_parse_reply(struct drm_dp_sideband_msg_rx *raw,

    switch (msg->req_type) {
    case DP_LINK_ADDRESS:

•           return drm_dp_sideband_parse_link_address(raw, msg);
  

•           return drm_dp_sideband_parse_link_address(mgr, raw, msg);
    case DP_QUERY_PAYLOAD:
            return drm_dp_sideband_parse_query_payload_ack(raw, msg);
    case DP_REMOTE_DPCD_READ:
  

@@ -1053,14 +1056,16 @@ static bool drm_dp_sideband_parse_reply(struct drm_dp_sideband_msg_rx *raw, case DP_QUERY_STREAM_ENC_STATUS: return drm_dp_sideband_parse_query_stream_enc_status(raw, msg); default:

•           DRM_ERROR("Got unknown reply 0x%02x (%s)\n", msg->req_type,
  

•                     drm_dp_mst_req_type_str(msg->req_type));
  

•           drm_err(mgr->dev, "Got unknown reply 0x%02x (%s)\n",
  

•                   msg->req_type, drm_dp_mst_req_type_str(msg->req_type));
            return false;
    }
  

}

-static bool drm_dp_sideband_parse_connection_status_notify(struct drm_dp_sideband_msg_rx *raw,

•                                                      struct drm_dp_sideband_msg_req_body *msg)
  

+static bool +drm_dp_sideband_parse_connection_status_notify(const struct drm_dp_mst_topology_mgr *mgr,

•                                          struct drm_dp_sideband_msg_rx *raw,
  

•                                          struct drm_dp_sideband_msg_req_body *msg)
  

{ int idx = 1;

@@ -1082,12 +1087,14 @@ static bool drm_dp_sideband_parse_connection_status_notify(struct drm_dp_sideban idx++; return true; fail_len:

•   DRM_DEBUG_KMS("connection status reply parse length fail %d %d\n", idx, raw->curlen);
  

•   drm_dbg_kms(mgr->dev, "connection status reply parse length fail %d %d\n",
  

•               idx, raw->curlen);
    return false;
  

}

-static bool drm_dp_sideband_parse_resource_status_notify(struct drm_dp_sideband_msg_rx *raw,

•                                                      struct drm_dp_sideband_msg_req_body *msg)
  

+static bool drm_dp_sideband_parse_resource_status_notify(const struct drm_dp_mst_topology_mgr *mgr,

•                                                    struct drm_dp_sideband_msg_rx *raw,
  

•                                                    struct drm_dp_sideband_msg_req_body *msg)
  

{ int idx = 1;

@@ -1105,11 +1112,12 @@ static bool drm_dp_sideband_parse_resource_status_notify(struct drm_dp_sideband_ idx++; return true; fail_len:

•   DRM_DEBUG_KMS("resource status reply parse length fail %d %d\n", idx, raw->curlen);
  

•   drm_dbg_kms(mgr->dev, "resource status reply parse length fail %d %d\n", idx, raw->curlen);
    return false;
  

}

-static bool drm_dp_sideband_parse_req(struct drm_dp_sideband_msg_rx *raw, +static bool drm_dp_sideband_parse_req(const struct drm_dp_mst_topology_mgr *mgr,

•                                 struct drm_dp_sideband_msg_rx *raw,
                                  struct drm_dp_sideband_msg_req_body *msg)
  

{ memset(msg, 0, sizeof(*msg)); @@ -1117,12 +1125,12 @@ static bool drm_dp_sideband_parse_req(struct drm_dp_sideband_msg_rx *raw,

    switch (msg->req_type) {
    case DP_CONNECTION_STATUS_NOTIFY:

•           return drm_dp_sideband_parse_connection_status_notify(raw, msg);
  

•           return drm_dp_sideband_parse_connection_status_notify(mgr, raw, msg);
    case DP_RESOURCE_STATUS_NOTIFY:
  

•           return drm_dp_sideband_parse_resource_status_notify(raw, msg);
  

•           return drm_dp_sideband_parse_resource_status_notify(mgr, raw, msg);
    default:
  

•           DRM_ERROR("Got unknown request 0x%02x (%s)\n", msg->req_type,
  

•                     drm_dp_mst_req_type_str(msg->req_type));
  

•           drm_err(mgr->dev, "Got unknown request 0x%02x (%s)\n",
  

•                   msg->req_type, drm_dp_mst_req_type_str(msg->req_type));
            return false;
    }
  

} @@ -1231,14 +1239,14 @@ static int drm_dp_mst_assign_payload_id(struct drm_dp_mst_topology_mgr *mgr, ret = find_first_zero_bit(&mgr->payload_mask, mgr->max_payloads + 1); if (ret > mgr->max_payloads) { ret = -EINVAL;

•           DRM_DEBUG_KMS("out of payload ids %d\n", ret);
  

•           drm_dbg_kms(mgr->dev, "out of payload ids %d\n", ret);
            goto out_unlock;
    }
  
    vcpi_ret = find_first_zero_bit(&mgr->vcpi_mask, mgr->max_payloads + 1);
    if (vcpi_ret > mgr->max_payloads) {
            ret = -EINVAL;
  

•           DRM_DEBUG_KMS("out of vcpi ids %d\n", ret);
  

•           drm_dbg_kms(mgr->dev, "out of vcpi ids %d\n", ret);
            goto out_unlock;
    }
  
  

@@ -1260,7 +1268,7 @@ static void drm_dp_mst_put_payload_id(struct drm_dp_mst_topology_mgr *mgr, return;

    mutex_lock(&mgr->payload_lock);

•   DRM_DEBUG_KMS("putting payload %d\n", vcpi);
  

•   drm_dbg_kms(mgr->dev, "putting payload %d\n", vcpi);
    clear_bit(vcpi - 1, &mgr->vcpi_mask);
  
    for (i = 0; i < mgr->max_payloads; i++) {
  

@@ -1330,7 +1338,8 @@ static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb, goto out; } } else {

•           DRM_DEBUG_KMS("timedout msg send %p %d %d\n", txmsg, txmsg->state, txmsg->seqno);
  

•           drm_dbg_kms(mgr->dev, "timedout msg send %p %d %d\n",
  

•                       txmsg, txmsg->state, txmsg->seqno);
  
            /* dump some state */
            ret = -EIO;
  

@@ -1484,7 +1493,7 @@ static void drm_dp_mst_get_mstb_malloc(struct drm_dp_mst_branch *mstb) { kref_get(&mstb->malloc_kref);

•   DRM_DEBUG("mstb %p (%d)\n", mstb, kref_read(&mstb->malloc_kref));
  

•   drm_dbg(mstb->mgr->dev, "mstb %p (%d)\n", mstb, kref_read(&mstb->malloc_kref));
  

}

/** @@ -1501,7 +1510,7 @@ drm_dp_mst_get_mstb_malloc(struct drm_dp_mst_branch *mstb) static void drm_dp_mst_put_mstb_malloc(struct drm_dp_mst_branch *mstb) {

•   DRM_DEBUG("mstb %p (%d)\n", mstb, kref_read(&mstb->malloc_kref) - 1);
  

•   drm_dbg(mstb->mgr->dev, "mstb %p (%d)\n", mstb, kref_read(&mstb->malloc_kref) - 1);
    kref_put(&mstb->malloc_kref, drm_dp_free_mst_branch_device);
  

}

@@ -1535,7 +1544,7 @@ void drm_dp_mst_get_port_malloc(struct drm_dp_mst_port *port) { kref_get(&port->malloc_kref);

•   DRM_DEBUG("port %p (%d)\n", port, kref_read(&port->malloc_kref));
  

•   drm_dbg(port->mgr->dev, "port %p (%d)\n", port, kref_read(&port->malloc_kref));
  

} EXPORT_SYMBOL(drm_dp_mst_get_port_malloc);

@@ -1552,7 +1561,7 @@ EXPORT_SYMBOL(drm_dp_mst_get_port_malloc); void drm_dp_mst_put_port_malloc(struct drm_dp_mst_port *port) {

•   DRM_DEBUG("port %p (%d)\n", port, kref_read(&port->malloc_kref) - 1);
  

•   drm_dbg(port->mgr->dev, "port %p (%d)\n", port, kref_read(&port->malloc_kref) - 1);
    kref_put(&port->malloc_kref, drm_dp_free_mst_port);
  

} EXPORT_SYMBOL(drm_dp_mst_put_port_malloc); @@ -1777,8 +1786,7 @@ drm_dp_mst_topology_try_get_mstb(struct drm_dp_mst_branch *mstb) topology_ref_history_lock(mstb->mgr); ret = kref_get_unless_zero(&mstb->topology_kref); if (ret) {

•           DRM_DEBUG("mstb %p (%d)\n",
  

•                     mstb, kref_read(&mstb->topology_kref));
  

•           drm_dbg(mstb->mgr->dev, "mstb %p (%d)\n", mstb, kref_read(&mstb->topology_kref));
            save_mstb_topology_ref(mstb, DRM_DP_MST_TOPOLOGY_REF_GET);
    }
  
  

@@ -1808,7 +1816,7 @@ static void drm_dp_mst_topology_get_mstb(struct drm_dp_mst_branch *mstb) save_mstb_topology_ref(mstb, DRM_DP_MST_TOPOLOGY_REF_GET); WARN_ON(kref_read(&mstb->topology_kref) == 0); kref_get(&mstb->topology_kref);

•   DRM_DEBUG("mstb %p (%d)\n", mstb, kref_read(&mstb->topology_kref));
  

•   drm_dbg(mstb->mgr->dev, "mstb %p (%d)\n", mstb, kref_read(&mstb->topology_kref));
  
    topology_ref_history_unlock(mstb->mgr);
  

} @@ -1830,8 +1838,7 @@ drm_dp_mst_topology_put_mstb(struct drm_dp_mst_branch *mstb) { topology_ref_history_lock(mstb->mgr);

•   DRM_DEBUG("mstb %p (%d)\n",
  

•             mstb, kref_read(&mstb->topology_kref) - 1);
  

•   drm_dbg(mstb->mgr->dev, "mstb %p (%d)\n", mstb, kref_read(&mstb->topology_kref) - 1);
    save_mstb_topology_ref(mstb, DRM_DP_MST_TOPOLOGY_REF_PUT);
  
    topology_ref_history_unlock(mstb->mgr);
  

@@ -1894,8 +1901,7 @@ drm_dp_mst_topology_try_get_port(struct drm_dp_mst_port *port) topology_ref_history_lock(port->mgr); ret = kref_get_unless_zero(&port->topology_kref); if (ret) {

•           DRM_DEBUG("port %p (%d)\n",
  

•                     port, kref_read(&port->topology_kref));
  

•           drm_dbg(port->mgr->dev, "port %p (%d)\n", port, kref_read(&port->topology_kref));
            save_port_topology_ref(port, DRM_DP_MST_TOPOLOGY_REF_GET);
    }
  
  

@@ -1922,7 +1928,7 @@ static void drm_dp_mst_topology_get_port(struct drm_dp_mst_port *port)

    WARN_ON(kref_read(&port->topology_kref) == 0);
    kref_get(&port->topology_kref);

•   DRM_DEBUG("port %p (%d)\n", port, kref_read(&port->topology_kref));
  

•   drm_dbg(port->mgr->dev, "port %p (%d)\n", port, kref_read(&port->topology_kref));
    save_port_topology_ref(port, DRM_DP_MST_TOPOLOGY_REF_GET);
  
    topology_ref_history_unlock(port->mgr);
  

@@ -1943,8 +1949,7 @@ static void drm_dp_mst_topology_put_port(struct drm_dp_mst_port *port) { topology_ref_history_lock(port->mgr);

•   DRM_DEBUG("port %p (%d)\n",
  

•             port, kref_read(&port->topology_kref) - 1);
  

•   drm_dbg(port->mgr->dev, "port %p (%d)\n", port, kref_read(&port->topology_kref) - 1);
    save_port_topology_ref(port, DRM_DP_MST_TOPOLOGY_REF_PUT);
  
    topology_ref_history_unlock(port->mgr);
  

@@ -2129,8 +2134,7 @@ drm_dp_port_set_pdt(struct drm_dp_mst_port *port, u8 new_pdt, mstb = drm_dp_add_mst_branch_device(lct, rad); if (!mstb) { ret = -ENOMEM;

•                           DRM_ERROR("Failed to create MSTB for port %p",
  

•                                     port);
  

•                           drm_err(mgr->dev, "Failed to create MSTB for port %p", port);
                            goto out;
                    }
  
  

@@ -2260,8 +2264,8 @@ static void build_mst_prop_path(const struct drm_dp_mst_branch *mstb, int drm_dp_mst_connector_late_register(struct drm_connector *connector, struct drm_dp_mst_port *port) {

•   DRM_DEBUG_KMS("registering %s remote bus for %s\n",
  

•                 port->aux.name, connector->kdev->kobj.name);
  

•   drm_dbg_kms(port->mgr->dev, "registering %s remote bus for %s\n",
  

•               port->aux.name, connector->kdev->kobj.name);
  
    port->aux.dev = connector->kdev;
    return drm_dp_aux_register_devnode(&port->aux);
  

@@ -2280,8 +2284,8 @@ EXPORT_SYMBOL(drm_dp_mst_connector_late_register); void drm_dp_mst_connector_early_unregister(struct drm_connector *connector, struct drm_dp_mst_port *port) {

•   DRM_DEBUG_KMS("unregistering %s remote bus for %s\n",
  

•                 port->aux.name, connector->kdev->kobj.name);
  

•   drm_dbg_kms(port->mgr->dev, "unregistering %s remote bus for %s\n",
  

•               port->aux.name, connector->kdev->kobj.name);
    drm_dp_aux_unregister_devnode(&port->aux);
  

} EXPORT_SYMBOL(drm_dp_mst_connector_early_unregister); @@ -2311,7 +2315,7 @@ drm_dp_mst_port_add_connector(struct drm_dp_mst_branch *mstb, return;

error:

•   DRM_ERROR("Failed to create connector for port %p: %d\n", port, ret);
  

•   drm_err(mgr->dev, "Failed to create connector for port %p: %d\n", port, ret);
  

}

/* @@ -2451,8 +2455,7 @@ drm_dp_mst_handle_link_address_port(struct drm_dp_mst_branch *mstb, if (ret == 1) { send_link_addr = true; } else if (ret < 0) {

•           DRM_ERROR("Failed to change PDT on port %p: %d\n",
  

•                     port, ret);
  

•           drm_err(dev, "Failed to change PDT on port %p: %d\n", port, ret);
            goto fail;
    }
  
  

@@ -2547,8 +2550,7 @@ drm_dp_mst_handle_conn_stat(struct drm_dp_mst_branch *mstb, if (ret == 1) { dowork = true; } else if (ret < 0) {

•           DRM_ERROR("Failed to change PDT for port %p: %d\n",
  

•                     port, ret);
  

•           drm_err(mgr->dev, "Failed to change PDT for port %p: %d\n", port, ret);
            dowork = false;
    }
  
  

@@ -2607,7 +2609,9 @@ static struct drm_dp_mst_branch *drm_dp_get_mst_branch_device(struct drm_dp_mst_ if (port->port_num == port_num) { mstb = port->mstb; if (!mstb) {

•                                   DRM_ERROR("failed to lookup MSTB with lct %d, rad %02x\n", lct, rad[0]);
  

•                                   drm_err(mgr->dev,
  

•                                           "failed to lookup MSTB with lct %d, rad %02x\n",
  

•                                           lct, rad[0]);
                                    goto out;
                            }
  
  

@@ -2743,7 +2747,7 @@ static void drm_dp_mst_link_probe_work(struct work_struct *work) * things work again. */ if (clear_payload_id_table) {

•           DRM_DEBUG_KMS("Clearing payload ID table\n");
  

•           drm_dbg_kms(dev, "Clearing payload ID table\n");
            drm_dp_send_clear_payload_id_table(mgr, mstb);
    }
  
  

@@ -2805,7 +2809,7 @@ static int drm_dp_send_sideband_msg(struct drm_dp_mst_topology_mgr *mgr, retries++; goto retry; }

•                   DRM_DEBUG_KMS("failed to dpcd write %d %d\n", tosend, ret);
  

•                   drm_dbg_kms(mgr->dev, "failed to dpcd write %d %d\n", tosend, ret);
  
                    return -EIO;
            }
  

@@ -2912,7 +2916,7 @@ static void process_single_down_tx_qlock(struct drm_dp_mst_topology_mgr *mgr) struct drm_dp_sideband_msg_tx, next); ret = process_single_tx_qlock(mgr, txmsg, false); if (ret < 0) {

•           DRM_DEBUG_KMS("failed to send msg in q %d\n", ret);
  

•           drm_dbg_kms(mgr->dev, "failed to send msg in q %d\n", ret);
            list_del(&txmsg->next);
            txmsg->state = DRM_DP_SIDEBAND_TX_TIMEOUT;
            wake_up_all(&mgr->tx_waitq);
  

@@ -2937,24 +2941,26 @@ static void drm_dp_queue_down_tx(struct drm_dp_mst_topology_mgr *mgr, }

static void -drm_dp_dump_link_address(struct drm_dp_link_address_ack_reply *reply) +drm_dp_dump_link_address(const struct drm_dp_mst_topology_mgr *mgr,

•                    struct drm_dp_link_address_ack_reply *reply)
  

{ struct drm_dp_link_addr_reply_port *port_reply; int i;

    for (i = 0; i < reply->nports; i++) {
            port_reply = &reply->ports[i];

•           DRM_DEBUG_KMS("port %d: input %d, pdt: %d, pn: %d, dpcd_rev: %02x, mcs: %d, ddps: %d, ldps %d, sdp %d/%d\n",
  

•                         i,
  

•                         port_reply->input_port,
  

•                         port_reply->peer_device_type,
  

•                         port_reply->port_number,
  

•                         port_reply->dpcd_revision,
  

•                         port_reply->mcs,
  

•                         port_reply->ddps,
  

•                         port_reply->legacy_device_plug_status,
  

•                         port_reply->num_sdp_streams,
  

•                         port_reply->num_sdp_stream_sinks);
  

•           drm_dbg_kms(mgr->dev,
  

•                       "port %d: input %d, pdt: %d, pn: %d, dpcd_rev: %02x, mcs: %d, ddps: %d, ldps %d, sdp %d/%d\n",
  

•                       i,
  

•                       port_reply->input_port,
  

•                       port_reply->peer_device_type,
  

•                       port_reply->port_number,
  

•                       port_reply->dpcd_revision,
  

•                       port_reply->mcs,
  

•                       port_reply->ddps,
  

•                       port_reply->legacy_device_plug_status,
  

•                       port_reply->num_sdp_streams,
  

•                       port_reply->num_sdp_stream_sinks);
    }
  

}

@@ -2980,26 +2986,25 @@ static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr, /* FIXME: Actually do some real error handling here */ ret = drm_dp_mst_wait_tx_reply(mstb, txmsg); if (ret <= 0) {

•           DRM_ERROR("Sending link address failed with %d\n", ret);
  

•           drm_err(mgr->dev, "Sending link address failed with %d\n", ret);
            goto out;
    }
    if (txmsg->reply.reply_type == DP_SIDEBAND_REPLY_NAK) {
  

•           DRM_ERROR("link address NAK received\n");
  

•           drm_err(mgr->dev, "link address NAK received\n");
            ret = -EIO;
            goto out;
    }
  
    reply = &txmsg->reply.u.link_addr;
  

•   DRM_DEBUG_KMS("link address reply: %d\n", reply->nports);
  

•   drm_dp_dump_link_address(reply);
  

•   drm_dbg_kms(mgr->dev, "link address reply: %d\n", reply->nports);
  

•   drm_dp_dump_link_address(mgr, reply);
  
    ret = drm_dp_check_mstb_guid(mstb, reply->guid);
    if (ret) {
            char buf[64];
  
            drm_dp_mst_rad_to_str(mstb->rad, mstb->lct, buf, sizeof(buf));
  

•           DRM_ERROR("GUID check on %s failed: %d\n",
  

•                     buf, ret);
  

•           drm_err(mgr->dev, "GUID check on %s failed: %d\n", buf, ret);
            goto out;
    }
  
  

@@ -3023,8 +3028,8 @@ static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr, if (port_mask & BIT(port->port_num)) continue;

•           DRM_DEBUG_KMS("port %d was not in link address, removing\n",
  

•                         port->port_num);
  

•           drm_dbg_kms(mgr->dev, "port %d was not in link address, removing\n",
  

•                       port->port_num);
            list_del(&port->next);
            drm_dp_mst_topology_put_port(port);
            changed = true;
  

@@ -3056,7 +3061,7 @@ drm_dp_send_clear_payload_id_table(struct drm_dp_mst_topology_mgr *mgr,

    ret = drm_dp_mst_wait_tx_reply(mstb, txmsg);
    if (ret > 0 && txmsg->reply.reply_type == DP_SIDEBAND_REPLY_NAK)

•           DRM_DEBUG_KMS("clear payload table id nak received\n");
  

•           drm_dbg_kms(mgr->dev, "clear payload table id nak received\n");
  
    kfree(txmsg);
  

} @@ -3085,15 +3090,15 @@ drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr, path_res = &txmsg->reply.u.path_resources;

            if (txmsg->reply.reply_type == DP_SIDEBAND_REPLY_NAK) {

•                   DRM_DEBUG_KMS("enum path resources nak received\n");
  

•                   drm_dbg_kms(mgr->dev, "enum path resources nak received\n");
            } else {
                    if (port->port_num != path_res->port_number)
                            DRM_ERROR("got incorrect port in response\n");
  
  

•                   DRM_DEBUG_KMS("enum path resources %d: %d %d\n",
  

•                                 path_res->port_number,
  

•                                 path_res->full_payload_bw_number,
  

•                                 path_res->avail_payload_bw_number);
  

•                   drm_dbg_kms(mgr->dev, "enum path resources %d: %d %d\n",
  

•                               path_res->port_number,
  

•                               path_res->full_payload_bw_number,
  

•                               path_res->avail_payload_bw_number);
  
                    /*
                     * If something changed, make sure we send a
  

@@ -3339,7 +3344,7 @@ static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr, int id, struct drm_dp_payload *payload) {

•   DRM_DEBUG_KMS("\n");
  

•   drm_dbg_kms(mgr->dev, "\n");
    /* it's okay for these to fail */
    if (port) {
            drm_dp_payload_send_msg(mgr, port, id, 0);
  

@@ -3445,7 +3450,7 @@ int drm_dp_update_payload_part1(struct drm_dp_mst_topology_mgr *mgr) continue; }

•           DRM_DEBUG_KMS("removing payload %d\n", i);
  

•           drm_dbg_kms(mgr->dev, "removing payload %d\n", i);
            for (j = i; j < mgr->max_payloads - 1; j++) {
                    mgr->payloads[j] = mgr->payloads[j + 1];
                    mgr->proposed_vcpis[j] = mgr->proposed_vcpis[j + 1];
  

@@ -3492,7 +3497,7 @@ int drm_dp_update_payload_part2(struct drm_dp_mst_topology_mgr *mgr)

            port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi);

•           DRM_DEBUG_KMS("payload %d %d\n", i, mgr->payloads[i].payload_state);
  

•           drm_dbg_kms(mgr->dev, "payload %d %d\n", i, mgr->payloads[i].payload_state);
            if (mgr->payloads[i].payload_state == DP_PAYLOAD_LOCAL) {
                    ret = drm_dp_create_payload_step2(mgr, port, mgr->proposed_vcpis[i]->vcpi, &mgr->payloads[i]);
            } else if (mgr->payloads[i].payload_state == DP_PAYLOAD_DELETE_LOCAL) {
  

@@ -3537,8 +3542,8 @@ static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr,

    /* DPCD read should never be NACKed */
    if (txmsg->reply.reply_type == 1) {

•           DRM_ERROR("mstb %p port %d: DPCD read on addr 0x%x for %d bytes NAKed\n",
  

•                     mstb, port->port_num, offset, size);
  

•           drm_err(mgr->dev, "mstb %p port %d: DPCD read on addr 0x%x for %d bytes NAKed\n",
  

•                   mstb, port->port_num, offset, size);
            ret = -EIO;
            goto fail_free;
    }
  

@@ -3644,8 +3649,8 @@ int drm_dp_get_vc_payload_bw(const struct drm_dp_mst_topology_mgr *mgr, int link_rate, int link_lane_count) { if (link_rate == 0 || link_lane_count == 0)

•           DRM_DEBUG_KMS("invalid link rate/lane count: (%d / %d)\n",
  

•                         link_rate, link_lane_count);
  

•           drm_dbg_kms(mgr->dev, "invalid link rate/lane count: (%d / %d)\n",
  

•                       link_rate, link_lane_count);
  
    /* See DP v2.0 2.6.4.2, VCPayload_Bandwidth_for_OneTimeSlotPer_MTP_Allocation */
    return link_rate * link_lane_count / 54000;
  

@@ -3702,7 +3707,7 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms /* get dpcd info */ ret = drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, mgr->dpcd, DP_RECEIVER_CAP_SIZE); if (ret != DP_RECEIVER_CAP_SIZE) {

•                   DRM_DEBUG_KMS("failed to read DPCD\n");
  

•                   drm_dbg_kms(mgr->dev, "failed to read DPCD\n");
                    goto out_unlock;
            }
  
  

@@ -3837,7 +3842,7 @@ int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr, ret = drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, mgr->dpcd, DP_RECEIVER_CAP_SIZE); if (ret != DP_RECEIVER_CAP_SIZE) {

•           DRM_DEBUG_KMS("dpcd read failed - undocked during suspend?\n");
  

•           drm_dbg_kms(mgr->dev, "dpcd read failed - undocked during suspend?\n");
            goto out_fail;
    }
  
  

@@ -3846,20 +3851,20 @@ int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr, DP_UP_REQ_EN | DP_UPSTREAM_IS_SRC); if (ret < 0) {

•           DRM_DEBUG_KMS("mst write failed - undocked during suspend?\n");
  

•           drm_dbg_kms(mgr->dev, "mst write failed - undocked during suspend?\n");
            goto out_fail;
    }
  
    /* Some hubs forget their guids after they resume */
    ret = drm_dp_dpcd_read(mgr->aux, DP_GUID, guid, 16);
    if (ret != 16) {
  

•           DRM_DEBUG_KMS("dpcd read failed - undocked during suspend?\n");
  

•           drm_dbg_kms(mgr->dev, "dpcd read failed - undocked during suspend?\n");
            goto out_fail;
    }
  
    ret = drm_dp_check_mstb_guid(mgr->mst_primary, guid);
    if (ret) {
  

•           DRM_DEBUG_KMS("check mstb failed - undocked during suspend?\n");
  

•           drm_dbg_kms(mgr->dev, "check mstb failed - undocked during suspend?\n");
            goto out_fail;
    }
  
  

@@ -3872,7 +3877,8 @@ int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr, mutex_unlock(&mgr->lock);

    if (sync) {

•           DRM_DEBUG_KMS("Waiting for link probe work to finish re-syncing topology...\n");
  

•           drm_dbg_kms(mgr->dev,
  

•                       "Waiting for link probe work to finish re-syncing topology...\n");
            flush_work(&mgr->work);
    }
  
  

@@ -3905,15 +3911,15 @@ drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr *mgr, bool up, len = min(mgr->max_dpcd_transaction_bytes, 16); ret = drm_dp_dpcd_read(mgr->aux, basereg, replyblock, len); if (ret != len) {

•           DRM_DEBUG_KMS("failed to read DPCD down rep %d %d\n", len, ret);
  

•           drm_dbg_kms(mgr->dev, "failed to read DPCD down rep %d %d\n", len, ret);
            return false;
    }
  
  

•   ret = drm_dp_decode_sideband_msg_hdr(&hdr, replyblock, len, &hdrlen);
  

•   ret = drm_dp_decode_sideband_msg_hdr(mgr, &hdr, replyblock, len, &hdrlen);
    if (ret == false) {
            print_hex_dump(KERN_DEBUG, "failed hdr", DUMP_PREFIX_NONE, 16,
                           1, replyblock, len, false);
  

•           DRM_DEBUG_KMS("ERROR: failed header\n");
  

•           drm_dbg_kms(mgr->dev, "ERROR: failed header\n");
            return false;
    }
  
  

@@ -3921,22 +3927,20 @@ drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr *mgr, bool up, /* Caller is responsible for giving back this reference */ *mstb = drm_dp_get_mst_branch_device(mgr, hdr.lct, hdr.rad); if (!*mstb) {

•                   DRM_DEBUG_KMS("Got MST reply from unknown device %d\n",
  

•                                 hdr.lct);
  

•                   drm_dbg_kms(mgr->dev, "Got MST reply from unknown device %d\n", hdr.lct);
                    return false;
            }
    }
  
    if (!drm_dp_sideband_msg_set_header(msg, &hdr, hdrlen)) {
  

•           DRM_DEBUG_KMS("sideband msg set header failed %d\n",
  

•                         replyblock[0]);
  

•           drm_dbg_kms(mgr->dev, "sideband msg set header failed %d\n", replyblock[0]);
            return false;
    }
  
    replylen = min(msg->curchunk_len, (u8)(len - hdrlen));
    ret = drm_dp_sideband_append_payload(msg, replyblock + hdrlen, replylen);
    if (!ret) {
  

•           DRM_DEBUG_KMS("sideband msg build failed %d\n", replyblock[0]);
  

•           drm_dbg_kms(mgr->dev, "sideband msg build failed %d\n", replyblock[0]);
            return false;
    }
  
  

@@ -3947,14 +3951,14 @@ drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr *mgr, bool up, ret = drm_dp_dpcd_read(mgr->aux, basereg + curreply, replyblock, len); if (ret != len) {

•                   DRM_DEBUG_KMS("failed to read a chunk (len %d, ret %d)\n",
  

•                                 len, ret);
  

•                   drm_dbg_kms(mgr->dev, "failed to read a chunk (len %d, ret %d)\n",
  

•                               len, ret);
                    return false;
            }
  
            ret = drm_dp_sideband_append_payload(msg, replyblock, len);
            if (!ret) {
  

•                   DRM_DEBUG_KMS("failed to build sideband msg\n");
  

•                   drm_dbg_kms(mgr->dev, "failed to build sideband msg\n");
                    return false;
            }
  
  

@@ -3988,21 +3992,21 @@ static int drm_dp_mst_handle_down_rep(struct drm_dp_mst_topology_mgr *mgr) struct drm_dp_sideband_msg_hdr *hdr;

            hdr = &msg->initial_hdr;

•           DRM_DEBUG_KMS("Got MST reply with no msg %p %d %d %02x %02x\n",
  

•                         mstb, hdr->seqno, hdr->lct, hdr->rad[0],
  

•                         msg->msg[0]);
  

•           drm_dbg_kms(mgr->dev, "Got MST reply with no msg %p %d %d %02x %02x\n",
  

•                       mstb, hdr->seqno, hdr->lct, hdr->rad[0], msg->msg[0]);
            goto out_clear_reply;
    }
  
  

•   drm_dp_sideband_parse_reply(msg, &txmsg->reply);
  

•   drm_dp_sideband_parse_reply(mgr, msg, &txmsg->reply);
  
    if (txmsg->reply.reply_type == DP_SIDEBAND_REPLY_NAK) {
  

•           DRM_DEBUG_KMS("Got NAK reply: req 0x%02x (%s), reason 0x%02x (%s), nak data 0x%02x\n",
  

•                         txmsg->reply.req_type,
  

•                         drm_dp_mst_req_type_str(txmsg->reply.req_type),
  

•                         txmsg->reply.u.nak.reason,
  

•                         drm_dp_mst_nak_reason_str(txmsg->reply.u.nak.reason),
  

•                         txmsg->reply.u.nak.nak_data);
  

•           drm_dbg_kms(mgr->dev,
  

•                       "Got NAK reply: req 0x%02x (%s), reason 0x%02x (%s), nak data 0x%02x\n",
  

•                       txmsg->reply.req_type,
  

•                       drm_dp_mst_req_type_str(txmsg->reply.req_type),
  

•                       txmsg->reply.u.nak.reason,
  

•                       drm_dp_mst_nak_reason_str(txmsg->reply.u.nak.reason),
  

•                       txmsg->reply.u.nak.nak_data);
    }
  
    memset(msg, 0, sizeof(struct drm_dp_sideband_msg_rx));
  

@@ -4050,8 +4054,7 @@ drm_dp_mst_process_up_req(struct drm_dp_mst_topology_mgr *mgr, }

    if (!mstb) {

•           DRM_DEBUG_KMS("Got MST reply from unknown device %d\n",
  

•                         hdr->lct);
  

•           drm_dbg_kms(mgr->dev, "Got MST reply from unknown device %d\n", hdr->lct);
            return false;
    }
  
  

@@ -4107,17 +4110,17 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr)

    up_req = kzalloc(sizeof(*up_req), GFP_KERNEL);
    if (!up_req) {

•           DRM_ERROR("Not enough memory to process MST up req\n");
  

•           drm_err(mgr->dev, "Not enough memory to process MST up req\n");
  

checkpatch --strict is unhappy about this chunk

WARNING: Possible unnecessary 'out of memory' message #692: FILE: drivers/gpu/drm/drm_dp_mst_topology.c:4120: if (!up_req) { + drm_err(mgr->dev, "Not enough memory to process MST up req\n");

This issue wasn't introduced by this patch, but might be worth fixing. Rationale for checkpatch error: https://lkml.org/lkml/2014/6/10/382

            return -ENOMEM;
    }
    INIT_LIST_HEAD(&up_req->next);

•   drm_dp_sideband_parse_req(&mgr->up_req_recv, &up_req->msg);
  

•   drm_dp_sideband_parse_req(mgr, &mgr->up_req_recv, &up_req->msg);
  
    if (up_req->msg.req_type != DP_CONNECTION_STATUS_NOTIFY &&
        up_req->msg.req_type != DP_RESOURCE_STATUS_NOTIFY) {
  

•           DRM_DEBUG_KMS("Received unknown up req type, ignoring: %x\n",
  

•                         up_req->msg.req_type);
  

•           drm_dbg_kms(mgr->dev, "Received unknown up req type, ignoring: %x\n",
  

•                       up_req->msg.req_type);
            kfree(up_req);
            goto out;
    }
  

@@ -4129,20 +4132,20 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr) const struct drm_dp_connection_status_notify *conn_stat = &up_req->msg.u.conn_stat;

•           DRM_DEBUG_KMS("Got CSN: pn: %d ldps:%d ddps: %d mcs: %d ip: %d pdt: %d\n",
  

•                         conn_stat->port_number,
  

•                         conn_stat->legacy_device_plug_status,
  

•                         conn_stat->displayport_device_plug_status,
  

•                         conn_stat->message_capability_status,
  

•                         conn_stat->input_port,
  

•                         conn_stat->peer_device_type);
  

•           drm_dbg_kms(mgr->dev, "Got CSN: pn: %d ldps:%d ddps: %d mcs: %d ip: %d pdt: %d\n",
  

•                       conn_stat->port_number,
  

•                       conn_stat->legacy_device_plug_status,
  

•                       conn_stat->displayport_device_plug_status,
  

•                       conn_stat->message_capability_status,
  

•                       conn_stat->input_port,
  

•                       conn_stat->peer_device_type);
    } else if (up_req->msg.req_type == DP_RESOURCE_STATUS_NOTIFY) {
            const struct drm_dp_resource_status_notify *res_stat =
                    &up_req->msg.u.resource_stat;
  
  

•           DRM_DEBUG_KMS("Got RSN: pn: %d avail_pbn %d\n",
  

•                         res_stat->port_number,
  

•                         res_stat->available_pbn);
  

•           drm_dbg_kms(mgr->dev, "Got RSN: pn: %d avail_pbn %d\n",
  

•                       res_stat->port_number,
  

•                       res_stat->available_pbn);
    }
  
    up_req->hdr = mgr->up_req_recv.initial_hdr;
  

@@ -4382,8 +4385,9 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state, * which is an error */ if (WARN_ON(!prev_slots)) {

•                           DRM_ERROR("cannot allocate and release VCPI on [MST PORT:%p] in the same state\n",
  

•                                     port);
  

•                           drm_err(mgr->dev,
  

•                                   "cannot allocate and release VCPI on [MST PORT:%p] in the same state\n",
  

•                                   port);
                            return -EINVAL;
                    }
  
  

@@ -4400,12 +4404,12 @@ int drm_dp_atomic_find_vcpi_slots(struct drm_atomic_state *state,

    req_slots = DIV_ROUND_UP(pbn, pbn_div);

•   DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] [MST PORT:%p] VCPI %d -> %d\n",
  

•                    port->connector->base.id, port->connector->name,
  

•                    port, prev_slots, req_slots);
  

•   DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] [MST PORT:%p] PBN %d -> %d\n",
  

•                    port->connector->base.id, port->connector->name,
  

•                    port, prev_bw, pbn);
  

•   drm_dbg_atomic(mgr->dev, "[CONNECTOR:%d:%s] [MST PORT:%p] VCPI %d -> %d\n",
  

•                  port->connector->base.id, port->connector->name,
  

•                  port, prev_slots, req_slots);
  

•   drm_dbg_atomic(mgr->dev, "[CONNECTOR:%d:%s] [MST PORT:%p] PBN %d -> %d\n",
  

•                  port->connector->base.id, port->connector->name,
  

•                  port, prev_bw, pbn);
  
    /* Add the new allocation to the state */
    if (!vcpi) {
  

@@ -4469,12 +4473,12 @@ int drm_dp_atomic_release_vcpi_slots(struct drm_atomic_state *state, } } if (WARN_ON(!found)) {

•           DRM_ERROR("no VCPI for [MST PORT:%p] found in mst state %p\n",
  

•                     port, &topology_state->base);
  

•           drm_err(mgr->dev, "no VCPI for [MST PORT:%p] found in mst state %p\n",
  

•                   port, &topology_state->base);
            return -EINVAL;
    }
  
  

•   DRM_DEBUG_ATOMIC("[MST PORT:%p] VCPI %d -> 0\n", port, pos->vcpi);
  

•   drm_dbg_atomic(mgr->dev, "[MST PORT:%p] VCPI %d -> 0\n", port, pos->vcpi);
    if (pos->vcpi) {
            drm_dp_mst_put_port_malloc(port);
            pos->vcpi = 0;
  

@@ -4505,8 +4509,9 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, return false;

    if (port->vcpi.vcpi > 0) {

•           DRM_DEBUG_KMS("payload: vcpi %d already allocated for pbn %d - requested pbn %d\n",
  

•                         port->vcpi.vcpi, port->vcpi.pbn, pbn);
  

•           drm_dbg_kms(mgr->dev,
  

•                       "payload: vcpi %d already allocated for pbn %d - requested pbn %d\n",
  

•                       port->vcpi.vcpi, port->vcpi.pbn, pbn);
            if (pbn == port->vcpi.pbn) {
                    drm_dp_mst_topology_put_port(port);
                    return true;
  

@@ -4515,13 +4520,12 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr,

    ret = drm_dp_init_vcpi(mgr, &port->vcpi, pbn, slots);
    if (ret) {

•           DRM_DEBUG_KMS("failed to init vcpi slots=%d max=63 ret=%d\n",
  

•                         DIV_ROUND_UP(pbn, mgr->pbn_div), ret);
  

•           drm_dbg_kms(mgr->dev, "failed to init vcpi slots=%d max=63 ret=%d\n",
  

•                       DIV_ROUND_UP(pbn, mgr->pbn_div), ret);
            drm_dp_mst_topology_put_port(port);
            goto out;
    }
  

•   DRM_DEBUG_KMS("initing vcpi for pbn=%d slots=%d\n",
  

•                 pbn, port->vcpi.num_slots);
  

•   drm_dbg_kms(mgr->dev, "initing vcpi for pbn=%d slots=%d\n", pbn, port->vcpi.num_slots);
  
    /* Keep port allocated until its payload has been removed */
    drm_dp_mst_get_port_malloc(port);
  

@@ -4603,14 +4607,14 @@ static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr,

    ret = drm_dp_dpcd_write(mgr->aux, DP_PAYLOAD_ALLOCATE_SET, payload_alloc, 3);
    if (ret != 3) {

•           DRM_DEBUG_KMS("failed to write payload allocation %d\n", ret);
  

•           drm_dbg_kms(mgr->dev, "failed to write payload allocation %d\n", ret);
            goto fail;
    }
  
  

retry: ret = drm_dp_dpcd_readb(mgr->aux, DP_PAYLOAD_TABLE_UPDATE_STATUS, &status); if (ret < 0) {

•           DRM_DEBUG_KMS("failed to read payload table status %d\n", ret);
  

•           drm_dbg_kms(mgr->dev, "failed to read payload table status %d\n", ret);
            goto fail;
    }
  
  

@@ -4620,7 +4624,8 @@ static int drm_dp_dpcd_write_payload(struct drm_dp_mst_topology_mgr *mgr, usleep_range(10000, 20000); goto retry; }

•           DRM_DEBUG_KMS("status not set after read payload table status %d\n", status);
  

•           drm_dbg_kms(mgr->dev, "status not set after read payload table status %d\n",
  

•                       status);
            ret = -EINVAL;
            goto fail;
    }
  

@@ -4667,16 +4672,15 @@ int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr) status & DP_PAYLOAD_ACT_HANDLED || status < 0, 200, timeout_ms * USEC_PER_MSEC); if (ret < 0 && status >= 0) {

•           DRM_ERROR("Failed to get ACT after %dms, last status: %02x\n",
  

•                     timeout_ms, status);
  

•           drm_err(mgr->dev, "Failed to get ACT after %dms, last status: %02x\n",
  

•                   timeout_ms, status);
            return -EINVAL;
    } else if (status < 0) {
            /*
             * Failure here isn't unexpected - the hub may have
             * just been unplugged
             */
  

•           DRM_DEBUG_KMS("Failed to read payload table status: %d\n",
  

•                         status);
  

•           drm_dbg_kms(mgr->dev, "Failed to read payload table status: %d\n", status);
            return status;
    }
  
  

@@ -5079,12 +5083,10 @@ drm_dp_mst_atomic_check_mstb_bw_limit(struct drm_dp_mst_branch *mstb, return 0;

    if (mstb->port_parent)

•           DRM_DEBUG_ATOMIC("[MSTB:%p] [MST PORT:%p] Checking bandwidth limits on [MSTB:%p]\n",
  

•                            mstb->port_parent->parent, mstb->port_parent,
  

•                            mstb);
  

•           drm_dbg_atomic(mstb->mgr->dev, "[MSTB:%p] [MST PORT:%p] Checking bandwidth limits on [MSTB:%p]\n",
  

checkpatch --strict is unhappy about this chunk

WARNING: line length of 114 exceeds 100 columns #870: FILE: drivers/gpu/drm/drm_dp_mst_topology.c:5093: + drm_dbg_atomic(mstb->mgr->dev, "[MSTB:%p] [MST PORT:%p] Checking bandwidth limits on [MSTB:%p]\n",

•                          mstb->port_parent->parent, mstb->port_parent, mstb);
    else
  

•           DRM_DEBUG_ATOMIC("[MSTB:%p] Checking bandwidth limits\n",
  

•                            mstb);
  

•           drm_dbg_atomic(mstb->mgr->dev, "[MSTB:%p] Checking bandwidth limits\n", mstb);
  
    list_for_each_entry(port, &mstb->ports, next) {
            ret = drm_dp_mst_atomic_check_port_bw_limit(port, state);
  

@@ -5142,14 +5144,14 @@ drm_dp_mst_atomic_check_port_bw_limit(struct drm_dp_mst_port *port, }

    if (pbn_used > port->full_pbn) {

•           DRM_DEBUG_ATOMIC("[MSTB:%p] [MST PORT:%p] required PBN of %d exceeds port limit of %d\n",
  

•                            port->parent, port, pbn_used,
  

•                            port->full_pbn);
  

•           drm_dbg_atomic(port->mgr->dev,
  

•                          "[MSTB:%p] [MST PORT:%p] required PBN of %d exceeds port limit of %d\n",
  

•                          port->parent, port, pbn_used, port->full_pbn);
            return -ENOSPC;
    }
  
  

•   DRM_DEBUG_ATOMIC("[MSTB:%p] [MST PORT:%p] uses %d out of %d PBN\n",
  

•                    port->parent, port, pbn_used, port->full_pbn);
  

•   drm_dbg_atomic(port->mgr->dev, "[MSTB:%p] [MST PORT:%p] uses %d out of %d PBN\n",
  

•                  port->parent, port, pbn_used, port->full_pbn);
  
    return pbn_used;
  

} @@ -5164,31 +5166,31 @@ drm_dp_mst_atomic_check_vcpi_alloc_limit(struct drm_dp_mst_topology_mgr *mgr, list_for_each_entry(vcpi, &mst_state->vcpis, next) { /* Releasing VCPI is always OK-even if the port is gone */ if (!vcpi->vcpi) {

•                   DRM_DEBUG_ATOMIC("[MST PORT:%p] releases all VCPI slots\n",
  

•                                    vcpi->port);
  

•                   drm_dbg_atomic(mgr->dev, "[MST PORT:%p] releases all VCPI slots\n",
  

•                                  vcpi->port);
                    continue;
            }
  
  

•           DRM_DEBUG_ATOMIC("[MST PORT:%p] requires %d vcpi slots\n",
  

•                            vcpi->port, vcpi->vcpi);
  

•           drm_dbg_atomic(mgr->dev, "[MST PORT:%p] requires %d vcpi slots\n",
  

•                          vcpi->port, vcpi->vcpi);
  
            avail_slots -= vcpi->vcpi;
            if (avail_slots < 0) {
  

•                   DRM_DEBUG_ATOMIC("[MST PORT:%p] not enough VCPI slots in mst state %p (avail=%d)\n",
  

•                                    vcpi->port, mst_state,
  

•                                    avail_slots + vcpi->vcpi);
  

•                   drm_dbg_atomic(mgr->dev,
  

•                                  "[MST PORT:%p] not enough VCPI slots in mst state %p (avail=%d)\n",
  

•                                  vcpi->port, mst_state, avail_slots + vcpi->vcpi);
                    return -ENOSPC;
            }
  
            if (++payload_count > mgr->max_payloads) {
  

•                   DRM_DEBUG_ATOMIC("[MST MGR:%p] state %p has too many payloads (max=%d)\n",
  

•                                    mgr, mst_state, mgr->max_payloads);
  

•                   drm_dbg_atomic(mgr->dev,
  

•                                  "[MST MGR:%p] state %p has too many payloads (max=%d)\n",
  

•                                  mgr, mst_state, mgr->max_payloads);
                    return -EINVAL;
            }
    }
  

•   DRM_DEBUG_ATOMIC("[MST MGR:%p] mst state %p VCPI avail=%d used=%d\n",
  

•                    mgr, mst_state, avail_slots,
  

•                    63 - avail_slots);
  

•   drm_dbg_atomic(mgr->dev, "[MST MGR:%p] mst state %p VCPI avail=%d used=%d\n",
  

•                  mgr, mst_state, avail_slots, 63 - avail_slots);
  
    return 0;
  

} @@ -5245,8 +5247,8 @@ int drm_dp_mst_add_affected_dsc_crtcs(struct drm_atomic_state *state, struct drm if (IS_ERR(crtc_state)) return PTR_ERR(crtc_state);

•           DRM_DEBUG_ATOMIC("[MST MGR:%p] Setting mode_changed flag on CRTC %p\n",
  

•                            mgr, crtc);
  

•           drm_dbg_atomic(mgr->dev, "[MST MGR:%p] Setting mode_changed flag on CRTC %p\n",
  

•                          mgr, crtc);
  
            crtc_state->mode_changed = true;
    }
  

@@ -5291,21 +5293,24 @@ int drm_dp_mst_atomic_enable_dsc(struct drm_atomic_state *state, }

    if (!found) {

•           DRM_DEBUG_ATOMIC("[MST PORT:%p] Couldn't find VCPI allocation in mst state %p\n",
  

•                            port, mst_state);
  

•           drm_dbg_atomic(state->dev,
  

•                          "[MST PORT:%p] Couldn't find VCPI allocation in mst state %p\n",
  

•                          port, mst_state);
            return -EINVAL;
    }
  
    if (pos->dsc_enabled == enable) {
  

•           DRM_DEBUG_ATOMIC("[MST PORT:%p] DSC flag is already set to %d, returning %d VCPI slots\n",
  

•                            port, enable, pos->vcpi);
  

•           drm_dbg_atomic(state->dev,
  

•                          "[MST PORT:%p] DSC flag is already set to %d, returning %d VCPI slots\n",
  

•                          port, enable, pos->vcpi);
            vcpi = pos->vcpi;
    }
  
    if (enable) {
            vcpi = drm_dp_atomic_find_vcpi_slots(state, port->mgr, port, pbn, pbn_div);
  

•           DRM_DEBUG_ATOMIC("[MST PORT:%p] Enabling DSC flag, reallocating %d VCPI slots on the port\n",
  

•                            port, vcpi);
  

•           drm_dbg_atomic(state->dev,
  

•                          "[MST PORT:%p] Enabling DSC flag, reallocating %d VCPI slots on the port\n",
  

•                          port, vcpi);
            if (vcpi < 0)
                    return -EINVAL;
    }
  

@@ -5652,7 +5657,7 @@ static int drm_dp_mst_i2c_xfer(struct i2c_adapter *adapter, } else if (remote_i2c_write_ok(msgs, num)) { ret = drm_dp_mst_i2c_write(mstb, port, msgs, num); } else {

•           DRM_DEBUG_KMS("Unsupported I2C transaction for MST device\n");
  

•           drm_dbg_kms(mgr->dev, "Unsupported I2C transaction for MST device\n");
            ret = -EIO;
    }
  
  

-- 2.29.2