| Message ID | 20220418205221.291891-1-jose.souza@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm/i915/display/drrs: Split the DRRS status per connector | expand |
On Mon, Apr 18, 2022 at 01:52:20PM -0700, José Roberto de Souza wrote: > Instead of keep the DRRS status of all connectors/pipe into a single > i915_drrs_status what makes user-space parsing terrible moving > each eDP connector status to its own folder. > > As legacy support still returning the DRRS status of the first > eDP connector in the main i915_drrs_status. I was thinking more along the lines of crtc/drrs_something -> just the drrs state for this pipe connector/drrs_something -> just the info whether this connector supports drrs or not We could also think about hoisting all this stuf into intel_drrs.c in the hopes of eventually hiding more of the drrs stuff from the rest of the driver. > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > --- > .../drm/i915/display/intel_display_debugfs.c | 65 +++++++++++++------ > 1 file changed, 46 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index 452d773fd4e34..0d7d2e750a4c7 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -1068,43 +1068,35 @@ static int i915_ddb_info(struct seq_file *m, void *unused) > return 0; > } > > -static int i915_drrs_status(struct seq_file *m, void *unused) > +static int intel_drrs_status(struct seq_file *m, struct drm_connector *connector) > { > - struct drm_i915_private *dev_priv = node_to_i915(m->private); > - struct drm_connector_list_iter conn_iter; > - struct intel_connector *connector; > + struct intel_connector *intel_connector = to_intel_connector(connector); > + struct drm_i915_private *dev_priv = to_i915(connector->dev); > struct intel_crtc *crtc; > > - drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); > - for_each_intel_connector_iter(connector, &conn_iter) { > - seq_printf(m, "[CONNECTOR:%d:%s] DRRS type: %s\n", > - connector->base.base.id, connector->base.name, > - intel_drrs_type_str(intel_panel_drrs_type(connector))); > - } > - drm_connector_list_iter_end(&conn_iter); > - > - seq_puts(m, "\n"); > + seq_printf(m, "DRRS type: %s\n", > + intel_drrs_type_str(intel_panel_drrs_type(intel_connector))); > > for_each_intel_crtc(&dev_priv->drm, crtc) { > const struct intel_crtc_state *crtc_state = > to_intel_crtc_state(crtc->base.state); > > - seq_printf(m, "[CRTC:%d:%s]:\n", > - crtc->base.base.id, crtc->base.name); > + if (!(crtc_state->uapi.connector_mask & drm_connector_mask(connector))) > + continue; > > mutex_lock(&crtc->drrs.mutex); > > /* DRRS Supported */ > - seq_printf(m, "\tDRRS Enabled: %s\n", > + seq_printf(m, "DRRS Enabled: %s\n", > str_yes_no(crtc_state->has_drrs)); > > - seq_printf(m, "\tDRRS Active: %s\n", > + seq_printf(m, "DRRS Active: %s\n", > str_yes_no(intel_drrs_is_active(crtc))); > > - seq_printf(m, "\tBusy_frontbuffer_bits: 0x%X\n", > + seq_printf(m, "Busy_frontbuffer_bits: 0x%X\n", > crtc->drrs.busy_frontbuffer_bits); > > - seq_printf(m, "\tDRRS refresh rate: %s\n", > + seq_printf(m, "DRRS refresh rate: %s\n", > crtc->drrs.refresh_rate == DRRS_REFRESH_RATE_LOW ? > "low" : "high"); > > @@ -1114,6 +1106,28 @@ static int i915_drrs_status(struct seq_file *m, void *unused) > return 0; > } > > +static int i915_drrs_status(struct seq_file *m, void *data) > +{ > + struct drm_i915_private *dev_priv = node_to_i915(m->private); > + struct drm_connector_list_iter conn_iter; > + struct drm_connector *connector = NULL; > + > + /* Find the first eDP connector */ > + drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); > + drm_for_each_connector_iter(connector, &conn_iter) { > + if (connector->connector_type != DRM_MODE_CONNECTOR_eDP) > + continue; > + > + break; > + } > + drm_connector_list_iter_end(&conn_iter); > + > + if (!connector) > + return -ENODEV; > + > + return intel_drrs_status(m, connector); > +} > + > static bool > intel_lpsp_power_well_enabled(struct drm_i915_private *i915, > enum i915_power_well_id power_well_id) > @@ -1990,6 +2004,14 @@ static int i915_psr_status_show(struct seq_file *m, void *data) > } > DEFINE_SHOW_ATTRIBUTE(i915_psr_status); > > +static int i915_drrs_status_show(struct seq_file *m, void *data) > +{ > + struct drm_connector *connector = m->private; > + > + return intel_drrs_status(m, connector); > +} > +DEFINE_SHOW_ATTRIBUTE(i915_drrs_status); > + > static int i915_lpsp_capability_show(struct seq_file *m, void *data) > { > struct drm_connector *connector = m->private; > @@ -2232,6 +2254,11 @@ void intel_connector_debugfs_add(struct intel_connector *intel_connector) > connector, &i915_psr_status_fops); > } > > + if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { > + debugfs_create_file("i915_drrs_status", 0444, root, > + connector, &i915_drrs_status_fops); > + } > + > if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort || > connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || > connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) { > -- > 2.35.3
On Thu, 2022-04-21 at 15:17 +0300, Ville Syrjälä wrote: > On Mon, Apr 18, 2022 at 01:52:20PM -0700, José Roberto de Souza wrote: > > Instead of keep the DRRS status of all connectors/pipe into a single > > i915_drrs_status what makes user-space parsing terrible moving > > each eDP connector status to its own folder. > > > > As legacy support still returning the DRRS status of the first > > eDP connector in the main i915_drrs_status. > > I was thinking more along the lines of > crtc/drrs_something -> just the drrs state for this pipe > connector/drrs_something -> just the info whether this connector supports drrs or not In my opinion split the information into 2 different debugfs is not good. Will make IGT more complicated, also this follows along with PSR debugfs. > > We could also think about hoisting all this stuf into intel_drrs.c > in the hopes of eventually hiding more of the drrs stuff from the > rest of the driver. > > > > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > > --- > > .../drm/i915/display/intel_display_debugfs.c | 65 +++++++++++++------ > > 1 file changed, 46 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > index 452d773fd4e34..0d7d2e750a4c7 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > @@ -1068,43 +1068,35 @@ static int i915_ddb_info(struct seq_file *m, void *unused) > > return 0; > > } > > > > -static int i915_drrs_status(struct seq_file *m, void *unused) > > +static int intel_drrs_status(struct seq_file *m, struct drm_connector *connector) > > { > > - struct drm_i915_private *dev_priv = node_to_i915(m->private); > > - struct drm_connector_list_iter conn_iter; > > - struct intel_connector *connector; > > + struct intel_connector *intel_connector = to_intel_connector(connector); > > + struct drm_i915_private *dev_priv = to_i915(connector->dev); > > struct intel_crtc *crtc; > > > > - drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); > > - for_each_intel_connector_iter(connector, &conn_iter) { > > - seq_printf(m, "[CONNECTOR:%d:%s] DRRS type: %s\n", > > - connector->base.base.id, connector->base.name, > > - intel_drrs_type_str(intel_panel_drrs_type(connector))); > > - } > > - drm_connector_list_iter_end(&conn_iter); > > - > > - seq_puts(m, "\n"); > > + seq_printf(m, "DRRS type: %s\n", > > + intel_drrs_type_str(intel_panel_drrs_type(intel_connector))); > > > > for_each_intel_crtc(&dev_priv->drm, crtc) { > > const struct intel_crtc_state *crtc_state = > > to_intel_crtc_state(crtc->base.state); > > > > - seq_printf(m, "[CRTC:%d:%s]:\n", > > - crtc->base.base.id, crtc->base.name); > > + if (!(crtc_state->uapi.connector_mask & drm_connector_mask(connector))) > > + continue; > > > > mutex_lock(&crtc->drrs.mutex); > > > > /* DRRS Supported */ > > - seq_printf(m, "\tDRRS Enabled: %s\n", > > + seq_printf(m, "DRRS Enabled: %s\n", > > str_yes_no(crtc_state->has_drrs)); > > > > - seq_printf(m, "\tDRRS Active: %s\n", > > + seq_printf(m, "DRRS Active: %s\n", > > str_yes_no(intel_drrs_is_active(crtc))); > > > > - seq_printf(m, "\tBusy_frontbuffer_bits: 0x%X\n", > > + seq_printf(m, "Busy_frontbuffer_bits: 0x%X\n", > > crtc->drrs.busy_frontbuffer_bits); > > > > - seq_printf(m, "\tDRRS refresh rate: %s\n", > > + seq_printf(m, "DRRS refresh rate: %s\n", > > crtc->drrs.refresh_rate == DRRS_REFRESH_RATE_LOW ? > > "low" : "high"); > > > > @@ -1114,6 +1106,28 @@ static int i915_drrs_status(struct seq_file *m, void *unused) > > return 0; > > } > > > > +static int i915_drrs_status(struct seq_file *m, void *data) > > +{ > > + struct drm_i915_private *dev_priv = node_to_i915(m->private); > > + struct drm_connector_list_iter conn_iter; > > + struct drm_connector *connector = NULL; > > + > > + /* Find the first eDP connector */ > > + drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); > > + drm_for_each_connector_iter(connector, &conn_iter) { > > + if (connector->connector_type != DRM_MODE_CONNECTOR_eDP) > > + continue; > > + > > + break; > > + } > > + drm_connector_list_iter_end(&conn_iter); > > + > > + if (!connector) > > + return -ENODEV; > > + > > + return intel_drrs_status(m, connector); > > +} > > + > > static bool > > intel_lpsp_power_well_enabled(struct drm_i915_private *i915, > > enum i915_power_well_id power_well_id) > > @@ -1990,6 +2004,14 @@ static int i915_psr_status_show(struct seq_file *m, void *data) > > } > > DEFINE_SHOW_ATTRIBUTE(i915_psr_status); > > > > +static int i915_drrs_status_show(struct seq_file *m, void *data) > > +{ > > + struct drm_connector *connector = m->private; > > + > > + return intel_drrs_status(m, connector); > > +} > > +DEFINE_SHOW_ATTRIBUTE(i915_drrs_status); > > + > > static int i915_lpsp_capability_show(struct seq_file *m, void *data) > > { > > struct drm_connector *connector = m->private; > > @@ -2232,6 +2254,11 @@ void intel_connector_debugfs_add(struct intel_connector *intel_connector) > > connector, &i915_psr_status_fops); > > } > > > > + if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { > > + debugfs_create_file("i915_drrs_status", 0444, root, > > + connector, &i915_drrs_status_fops); > > + } > > + > > if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort || > > connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || > > connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) { > > -- > > 2.35.3 >
On Thu, Apr 21, 2022 at 01:18:17PM +0000, Souza, Jose wrote: > On Thu, 2022-04-21 at 15:17 +0300, Ville Syrjälä wrote: > > On Mon, Apr 18, 2022 at 01:52:20PM -0700, José Roberto de Souza wrote: > > > Instead of keep the DRRS status of all connectors/pipe into a single > > > i915_drrs_status what makes user-space parsing terrible moving > > > each eDP connector status to its own folder. > > > > > > As legacy support still returning the DRRS status of the first > > > eDP connector in the main i915_drrs_status. > > > > I was thinking more along the lines of > > crtc/drrs_something -> just the drrs state for this pipe > > connector/drrs_something -> just the info whether this connector supports drrs or not > > In my opinion split the information into 2 different debugfs is not good. > Will make IGT more complicated, I don't see how it would be more complicated. I think th opposite is true. With the "multiple objects in one file" approach you need ugly code to even find the correct portion of the file to parse. The sysfs "one value per file" would be even nicer to handle in the code since you wouldn't need to parse so much text, but then we'd end up with tons of files which may not be entirely desirable (or we'd need to introce some kind of per-feature directory hierarchy to keep things organized). > also this follows along with PSR debugfs. > > > > > We could also think about hoisting all this stuf into intel_drrs.c > > in the hopes of eventually hiding more of the drrs stuff from the > > rest of the driver. > > > > > > > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > Signed-off-by: José Roberto de Souza <jose.souza@intel.com> > > > --- > > > .../drm/i915/display/intel_display_debugfs.c | 65 +++++++++++++------ > > > 1 file changed, 46 insertions(+), 19 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > > index 452d773fd4e34..0d7d2e750a4c7 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > > > @@ -1068,43 +1068,35 @@ static int i915_ddb_info(struct seq_file *m, void *unused) > > > return 0; > > > } > > > > > > -static int i915_drrs_status(struct seq_file *m, void *unused) > > > +static int intel_drrs_status(struct seq_file *m, struct drm_connector *connector) > > > { > > > - struct drm_i915_private *dev_priv = node_to_i915(m->private); > > > - struct drm_connector_list_iter conn_iter; > > > - struct intel_connector *connector; > > > + struct intel_connector *intel_connector = to_intel_connector(connector); > > > + struct drm_i915_private *dev_priv = to_i915(connector->dev); > > > struct intel_crtc *crtc; > > > > > > - drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); > > > - for_each_intel_connector_iter(connector, &conn_iter) { > > > - seq_printf(m, "[CONNECTOR:%d:%s] DRRS type: %s\n", > > > - connector->base.base.id, connector->base.name, > > > - intel_drrs_type_str(intel_panel_drrs_type(connector))); > > > - } > > > - drm_connector_list_iter_end(&conn_iter); > > > - > > > - seq_puts(m, "\n"); > > > + seq_printf(m, "DRRS type: %s\n", > > > + intel_drrs_type_str(intel_panel_drrs_type(intel_connector))); > > > > > > for_each_intel_crtc(&dev_priv->drm, crtc) { > > > const struct intel_crtc_state *crtc_state = > > > to_intel_crtc_state(crtc->base.state); > > > > > > - seq_printf(m, "[CRTC:%d:%s]:\n", > > > - crtc->base.base.id, crtc->base.name); > > > + if (!(crtc_state->uapi.connector_mask & drm_connector_mask(connector))) > > > + continue; > > > > > > mutex_lock(&crtc->drrs.mutex); > > > > > > /* DRRS Supported */ > > > - seq_printf(m, "\tDRRS Enabled: %s\n", > > > + seq_printf(m, "DRRS Enabled: %s\n", > > > str_yes_no(crtc_state->has_drrs)); > > > > > > - seq_printf(m, "\tDRRS Active: %s\n", > > > + seq_printf(m, "DRRS Active: %s\n", > > > str_yes_no(intel_drrs_is_active(crtc))); > > > > > > - seq_printf(m, "\tBusy_frontbuffer_bits: 0x%X\n", > > > + seq_printf(m, "Busy_frontbuffer_bits: 0x%X\n", > > > crtc->drrs.busy_frontbuffer_bits); > > > > > > - seq_printf(m, "\tDRRS refresh rate: %s\n", > > > + seq_printf(m, "DRRS refresh rate: %s\n", > > > crtc->drrs.refresh_rate == DRRS_REFRESH_RATE_LOW ? > > > "low" : "high"); > > > > > > @@ -1114,6 +1106,28 @@ static int i915_drrs_status(struct seq_file *m, void *unused) > > > return 0; > > > } > > > > > > +static int i915_drrs_status(struct seq_file *m, void *data) > > > +{ > > > + struct drm_i915_private *dev_priv = node_to_i915(m->private); > > > + struct drm_connector_list_iter conn_iter; > > > + struct drm_connector *connector = NULL; > > > + > > > + /* Find the first eDP connector */ > > > + drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); > > > + drm_for_each_connector_iter(connector, &conn_iter) { > > > + if (connector->connector_type != DRM_MODE_CONNECTOR_eDP) > > > + continue; > > > + > > > + break; > > > + } > > > + drm_connector_list_iter_end(&conn_iter); > > > + > > > + if (!connector) > > > + return -ENODEV; > > > + > > > + return intel_drrs_status(m, connector); > > > +} > > > + > > > static bool > > > intel_lpsp_power_well_enabled(struct drm_i915_private *i915, > > > enum i915_power_well_id power_well_id) > > > @@ -1990,6 +2004,14 @@ static int i915_psr_status_show(struct seq_file *m, void *data) > > > } > > > DEFINE_SHOW_ATTRIBUTE(i915_psr_status); > > > > > > +static int i915_drrs_status_show(struct seq_file *m, void *data) > > > +{ > > > + struct drm_connector *connector = m->private; > > > + > > > + return intel_drrs_status(m, connector); > > > +} > > > +DEFINE_SHOW_ATTRIBUTE(i915_drrs_status); > > > + > > > static int i915_lpsp_capability_show(struct seq_file *m, void *data) > > > { > > > struct drm_connector *connector = m->private; > > > @@ -2232,6 +2254,11 @@ void intel_connector_debugfs_add(struct intel_connector *intel_connector) > > > connector, &i915_psr_status_fops); > > > } > > > > > > + if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { > > > + debugfs_create_file("i915_drrs_status", 0444, root, > > > + connector, &i915_drrs_status_fops); > > > + } > > > + > > > if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort || > > > connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || > > > connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) { > > > -- > > > 2.35.3 > > >
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index 452d773fd4e34..0d7d2e750a4c7 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -1068,43 +1068,35 @@ static int i915_ddb_info(struct seq_file *m, void *unused) return 0; } -static int i915_drrs_status(struct seq_file *m, void *unused) +static int intel_drrs_status(struct seq_file *m, struct drm_connector *connector) { - struct drm_i915_private *dev_priv = node_to_i915(m->private); - struct drm_connector_list_iter conn_iter; - struct intel_connector *connector; + struct intel_connector *intel_connector = to_intel_connector(connector); + struct drm_i915_private *dev_priv = to_i915(connector->dev); struct intel_crtc *crtc; - drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); - for_each_intel_connector_iter(connector, &conn_iter) { - seq_printf(m, "[CONNECTOR:%d:%s] DRRS type: %s\n", - connector->base.base.id, connector->base.name, - intel_drrs_type_str(intel_panel_drrs_type(connector))); - } - drm_connector_list_iter_end(&conn_iter); - - seq_puts(m, "\n"); + seq_printf(m, "DRRS type: %s\n", + intel_drrs_type_str(intel_panel_drrs_type(intel_connector))); for_each_intel_crtc(&dev_priv->drm, crtc) { const struct intel_crtc_state *crtc_state = to_intel_crtc_state(crtc->base.state); - seq_printf(m, "[CRTC:%d:%s]:\n", - crtc->base.base.id, crtc->base.name); + if (!(crtc_state->uapi.connector_mask & drm_connector_mask(connector))) + continue; mutex_lock(&crtc->drrs.mutex); /* DRRS Supported */ - seq_printf(m, "\tDRRS Enabled: %s\n", + seq_printf(m, "DRRS Enabled: %s\n", str_yes_no(crtc_state->has_drrs)); - seq_printf(m, "\tDRRS Active: %s\n", + seq_printf(m, "DRRS Active: %s\n", str_yes_no(intel_drrs_is_active(crtc))); - seq_printf(m, "\tBusy_frontbuffer_bits: 0x%X\n", + seq_printf(m, "Busy_frontbuffer_bits: 0x%X\n", crtc->drrs.busy_frontbuffer_bits); - seq_printf(m, "\tDRRS refresh rate: %s\n", + seq_printf(m, "DRRS refresh rate: %s\n", crtc->drrs.refresh_rate == DRRS_REFRESH_RATE_LOW ? "low" : "high"); @@ -1114,6 +1106,28 @@ static int i915_drrs_status(struct seq_file *m, void *unused) return 0; } +static int i915_drrs_status(struct seq_file *m, void *data) +{ + struct drm_i915_private *dev_priv = node_to_i915(m->private); + struct drm_connector_list_iter conn_iter; + struct drm_connector *connector = NULL; + + /* Find the first eDP connector */ + drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + if (connector->connector_type != DRM_MODE_CONNECTOR_eDP) + continue; + + break; + } + drm_connector_list_iter_end(&conn_iter); + + if (!connector) + return -ENODEV; + + return intel_drrs_status(m, connector); +} + static bool intel_lpsp_power_well_enabled(struct drm_i915_private *i915, enum i915_power_well_id power_well_id) @@ -1990,6 +2004,14 @@ static int i915_psr_status_show(struct seq_file *m, void *data) } DEFINE_SHOW_ATTRIBUTE(i915_psr_status); +static int i915_drrs_status_show(struct seq_file *m, void *data) +{ + struct drm_connector *connector = m->private; + + return intel_drrs_status(m, connector); +} +DEFINE_SHOW_ATTRIBUTE(i915_drrs_status); + static int i915_lpsp_capability_show(struct seq_file *m, void *data) { struct drm_connector *connector = m->private; @@ -2232,6 +2254,11 @@ void intel_connector_debugfs_add(struct intel_connector *intel_connector) connector, &i915_psr_status_fops); } + if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) { + debugfs_create_file("i915_drrs_status", 0444, root, + connector, &i915_drrs_status_fops); + } + if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort || connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) {
Instead of keep the DRRS status of all connectors/pipe into a single i915_drrs_status what makes user-space parsing terrible moving each eDP connector status to its own folder. As legacy support still returning the DRRS status of the first eDP connector in the main i915_drrs_status. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: José Roberto de Souza <jose.souza@intel.com> --- .../drm/i915/display/intel_display_debugfs.c | 65 +++++++++++++------ 1 file changed, 46 insertions(+), 19 deletions(-)