Re: [PATCH 10/12] drm/client: Use [CONNECTOR:%d:%s] formatting
On Fri, Apr 05, 2024 at 11:23:01AM +0300, Jani Nikula wrote:
> On Thu, 04 Apr 2024, Ville Syrjala wrote:
> > From: Ville Syrjälä
> >
> > Switch to the canonical [CONNECTOR:%d:%s] etc. format for
> > printing out kms objects.
>
> I've been pinging for reviews on [1] for a while now. :/
>
> I'm just doing what you do in patches 9-10 in one go, and I very much
> prefer having the [CONNECTOR:%d:%s] bit as the first thing in the
> debug. For an individual line your style might read better, but for
> reading a log with a bunch of consecutive lines, I think having it as a
> prefix reads better.
>
> BR,
> Jani.
>
>
> [1]
> https://lore.kernel.org/r/f580f7a20bdea45178cef3940b636d491ae3dd92.1709843865.git.jani.nik...@intel.com
>
Looks like you have rbs now. I can rebase this
(and see what's left) after your stuff lands.
>
> >
> > Signed-off-by: Ville Syrjälä
> > ---
> > drivers/gpu/drm/drm_client_modeset.c | 65 +++-
> > 1 file changed, 35 insertions(+), 30 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_client_modeset.c
> > b/drivers/gpu/drm/drm_client_modeset.c
> > index 1751162b7d5c..415d1799337b 100644
> > --- a/drivers/gpu/drm/drm_client_modeset.c
> > +++ b/drivers/gpu/drm/drm_client_modeset.c
> > @@ -251,8 +251,10 @@ static void drm_client_connectors_enabled(struct
> > drm_device *dev,
> > for (i = 0; i < connector_count; i++) {
> > connector = connectors[i];
> > enabled[i] = drm_connector_enabled(connector, true);
> > - drm_dbg_kms(dev, "connector %d enabled? %s\n",
> > connector->base.id,
> > - connector->display_info.non_desktop ? "non desktop"
> > : str_yes_no(enabled[i]));
> > + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] enabled? %s\n",
> > + connector->base.id, connector->name,
> > + connector->display_info.non_desktop ?
> > + "non desktop" : str_yes_no(enabled[i]));
> >
> > any_enabled |= enabled[i];
> > }
> > @@ -368,8 +370,8 @@ static int drm_client_get_tile_offsets(struct
> > drm_device *dev,
> > continue;
> >
> > if (!modes[i] && (h_idx || v_idx)) {
> > - drm_dbg_kms(dev, "no modes for connector tiled %d %d\n",
> > - i, connector->base.id);
> > + drm_dbg_kms(dev, "no modes for tiled
> > [CONNECTOR:%d:%s]\n",
> > + connector->base.id, connector->name);
> > continue;
> > }
> > if (connector->tile_h_loc < h_idx)
> > @@ -438,14 +440,15 @@ static bool drm_client_target_preferred(struct
> > drm_device *dev,
> > drm_client_get_tile_offsets(dev, connectors,
> > connector_count, modes, offsets, i,
> > connector->tile_h_loc,
> > connector->tile_v_loc);
> > }
> > - drm_dbg_kms(dev, "looking for cmdline mode on connector %d\n",
> > - connector->base.id);
> > + drm_dbg_kms(dev, "looking for cmdline mode on
> > [CONNECTOR:%d:%s]\n",
> > + connector->base.id, connector->name);
> >
> > /* got for command line mode first */
> > modes[i] = drm_connector_pick_cmdline_mode(connector);
> > if (!modes[i]) {
> > - drm_dbg_kms(dev, "looking for preferred mode on
> > connector %d %d\n",
> > - connector->base.id, connector->tile_group ?
> > connector->tile_group->id : 0);
> > + drm_dbg_kms(dev, "looking for preferred mode on
> > [CONNECTOR:%d:%s] (tile group: %d)\n",
> > + connector->base.id, connector->name,
> > + connector->tile_group ?
> > connector->tile_group->id : 0);
> > modes[i] = drm_connector_preferred_mode(connector,
> > width, height);
> > }
> > /* No preferred modes, pick one off the list */
> > @@ -465,8 +468,8 @@ static bool drm_client_target_preferred(struct
> > drm_device *dev,
> > (connector->tile_h_loc == 0 &&
> > connector->tile_v_loc == 0 &&
> > !drm_connector_get_tiled_mode(connector))) {
> > - drm_dbg_kms(dev, "Falling back to non tiled
> > mode on Connector %d\n",
> > - connector->base.id);
> > + drm_dbg_kms(dev, "Falling back to non tiled
> > mode on [CONNECTOR:%d:%s]\n",
> > + connector->base.id,
> > connector->name);
> > modes[i] =
> > drm_connector_fallback_non_tiled_mode(connector);
> > } else {
> > modes[i] =
> > drm_connector_get_tiled_mode(connector);
> > @@ -634,15 +637,15 @@ static bool
Re: [PATCH 10/12] drm/client: Use [CONNECTOR:%d:%s] formatting
On Thu, 04 Apr 2024, Ville Syrjala wrote:
> From: Ville Syrjälä
>
> Switch to the canonical [CONNECTOR:%d:%s] etc. format for
> printing out kms objects.
I've been pinging for reviews on [1] for a while now. :/
I'm just doing what you do in patches 9-10 in one go, and I very much
prefer having the [CONNECTOR:%d:%s] bit as the first thing in the
debug. For an individual line your style might read better, but for
reading a log with a bunch of consecutive lines, I think having it as a
prefix reads better.
BR,
Jani.
[1]
https://lore.kernel.org/r/f580f7a20bdea45178cef3940b636d491ae3dd92.1709843865.git.jani.nik...@intel.com
>
> Signed-off-by: Ville Syrjälä
> ---
> drivers/gpu/drm/drm_client_modeset.c | 65 +++-
> 1 file changed, 35 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_client_modeset.c
> b/drivers/gpu/drm/drm_client_modeset.c
> index 1751162b7d5c..415d1799337b 100644
> --- a/drivers/gpu/drm/drm_client_modeset.c
> +++ b/drivers/gpu/drm/drm_client_modeset.c
> @@ -251,8 +251,10 @@ static void drm_client_connectors_enabled(struct
> drm_device *dev,
> for (i = 0; i < connector_count; i++) {
> connector = connectors[i];
> enabled[i] = drm_connector_enabled(connector, true);
> - drm_dbg_kms(dev, "connector %d enabled? %s\n",
> connector->base.id,
> - connector->display_info.non_desktop ? "non desktop"
> : str_yes_no(enabled[i]));
> + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] enabled? %s\n",
> + connector->base.id, connector->name,
> + connector->display_info.non_desktop ?
> + "non desktop" : str_yes_no(enabled[i]));
>
> any_enabled |= enabled[i];
> }
> @@ -368,8 +370,8 @@ static int drm_client_get_tile_offsets(struct drm_device
> *dev,
> continue;
>
> if (!modes[i] && (h_idx || v_idx)) {
> - drm_dbg_kms(dev, "no modes for connector tiled %d %d\n",
> - i, connector->base.id);
> + drm_dbg_kms(dev, "no modes for tiled
> [CONNECTOR:%d:%s]\n",
> + connector->base.id, connector->name);
> continue;
> }
> if (connector->tile_h_loc < h_idx)
> @@ -438,14 +440,15 @@ static bool drm_client_target_preferred(struct
> drm_device *dev,
> drm_client_get_tile_offsets(dev, connectors,
> connector_count, modes, offsets, i,
> connector->tile_h_loc,
> connector->tile_v_loc);
> }
> - drm_dbg_kms(dev, "looking for cmdline mode on connector %d\n",
> - connector->base.id);
> + drm_dbg_kms(dev, "looking for cmdline mode on
> [CONNECTOR:%d:%s]\n",
> + connector->base.id, connector->name);
>
> /* got for command line mode first */
> modes[i] = drm_connector_pick_cmdline_mode(connector);
> if (!modes[i]) {
> - drm_dbg_kms(dev, "looking for preferred mode on
> connector %d %d\n",
> - connector->base.id, connector->tile_group ?
> connector->tile_group->id : 0);
> + drm_dbg_kms(dev, "looking for preferred mode on
> [CONNECTOR:%d:%s] (tile group: %d)\n",
> + connector->base.id, connector->name,
> + connector->tile_group ?
> connector->tile_group->id : 0);
> modes[i] = drm_connector_preferred_mode(connector,
> width, height);
> }
> /* No preferred modes, pick one off the list */
> @@ -465,8 +468,8 @@ static bool drm_client_target_preferred(struct drm_device
> *dev,
> (connector->tile_h_loc == 0 &&
>connector->tile_v_loc == 0 &&
>!drm_connector_get_tiled_mode(connector))) {
> - drm_dbg_kms(dev, "Falling back to non tiled
> mode on Connector %d\n",
> - connector->base.id);
> + drm_dbg_kms(dev, "Falling back to non tiled
> mode on [CONNECTOR:%d:%s]\n",
> + connector->base.id,
> connector->name);
> modes[i] =
> drm_connector_fallback_non_tiled_mode(connector);
> } else {
> modes[i] =
> drm_connector_get_tiled_mode(connector);
> @@ -634,15 +637,15 @@ static bool drm_client_firmware_config(struct
> drm_client_dev *client,
> num_connectors_detected++;
>
> if (!enabled[i]) {
> - drm_dbg_kms(dev, "connector %s not enabled, skipping\n",
> - connector->name);
[PATCH 10/12] drm/client: Use [CONNECTOR:%d:%s] formatting
From: Ville Syrjälä
Switch to the canonical [CONNECTOR:%d:%s] etc. format for
printing out kms objects.
Signed-off-by: Ville Syrjälä
---
drivers/gpu/drm/drm_client_modeset.c | 65 +++-
1 file changed, 35 insertions(+), 30 deletions(-)
diff --git a/drivers/gpu/drm/drm_client_modeset.c
b/drivers/gpu/drm/drm_client_modeset.c
index 1751162b7d5c..415d1799337b 100644
--- a/drivers/gpu/drm/drm_client_modeset.c
+++ b/drivers/gpu/drm/drm_client_modeset.c
@@ -251,8 +251,10 @@ static void drm_client_connectors_enabled(struct
drm_device *dev,
for (i = 0; i < connector_count; i++) {
connector = connectors[i];
enabled[i] = drm_connector_enabled(connector, true);
- drm_dbg_kms(dev, "connector %d enabled? %s\n",
connector->base.id,
- connector->display_info.non_desktop ? "non desktop"
: str_yes_no(enabled[i]));
+ drm_dbg_kms(dev, "[CONNECTOR:%d:%s] enabled? %s\n",
+ connector->base.id, connector->name,
+ connector->display_info.non_desktop ?
+ "non desktop" : str_yes_no(enabled[i]));
any_enabled |= enabled[i];
}
@@ -368,8 +370,8 @@ static int drm_client_get_tile_offsets(struct drm_device
*dev,
continue;
if (!modes[i] && (h_idx || v_idx)) {
- drm_dbg_kms(dev, "no modes for connector tiled %d %d\n",
- i, connector->base.id);
+ drm_dbg_kms(dev, "no modes for tiled
[CONNECTOR:%d:%s]\n",
+ connector->base.id, connector->name);
continue;
}
if (connector->tile_h_loc < h_idx)
@@ -438,14 +440,15 @@ static bool drm_client_target_preferred(struct drm_device
*dev,
drm_client_get_tile_offsets(dev, connectors,
connector_count, modes, offsets, i,
connector->tile_h_loc,
connector->tile_v_loc);
}
- drm_dbg_kms(dev, "looking for cmdline mode on connector %d\n",
- connector->base.id);
+ drm_dbg_kms(dev, "looking for cmdline mode on
[CONNECTOR:%d:%s]\n",
+ connector->base.id, connector->name);
/* got for command line mode first */
modes[i] = drm_connector_pick_cmdline_mode(connector);
if (!modes[i]) {
- drm_dbg_kms(dev, "looking for preferred mode on
connector %d %d\n",
- connector->base.id, connector->tile_group ?
connector->tile_group->id : 0);
+ drm_dbg_kms(dev, "looking for preferred mode on
[CONNECTOR:%d:%s] (tile group: %d)\n",
+ connector->base.id, connector->name,
+ connector->tile_group ?
connector->tile_group->id : 0);
modes[i] = drm_connector_preferred_mode(connector,
width, height);
}
/* No preferred modes, pick one off the list */
@@ -465,8 +468,8 @@ static bool drm_client_target_preferred(struct drm_device
*dev,
(connector->tile_h_loc == 0 &&
connector->tile_v_loc == 0 &&
!drm_connector_get_tiled_mode(connector))) {
- drm_dbg_kms(dev, "Falling back to non tiled
mode on Connector %d\n",
- connector->base.id);
+ drm_dbg_kms(dev, "Falling back to non tiled
mode on [CONNECTOR:%d:%s]\n",
+ connector->base.id,
connector->name);
modes[i] =
drm_connector_fallback_non_tiled_mode(connector);
} else {
modes[i] =
drm_connector_get_tiled_mode(connector);
@@ -634,15 +637,15 @@ static bool drm_client_firmware_config(struct
drm_client_dev *client,
num_connectors_detected++;
if (!enabled[i]) {
- drm_dbg_kms(dev, "connector %s not enabled, skipping\n",
- connector->name);
+ drm_dbg_kms(dev, "[CONNECTOR:%d:%s] not enabled,
skipping\n",
+ connector->base.id, connector->name);
conn_configured |= BIT(i);
continue;
}
if (connector->force == DRM_FORCE_OFF) {
- drm_dbg_kms(dev, "connector %s is disabled by user,
skipping\n",
- connector->name);
+ drm_dbg_kms(dev, "[CONNECTOR:%d:%s] is disabled by
user, skipping\n",
+
