Message ID | 097390f12da8de57c9d52ad675309d0422dec8fb.1630327990.git.jani.nikula@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/i915/display: debugfs cleanups | expand |
On Mon, Aug 30, 2021 at 03:53:41PM +0300, Jani Nikula wrote: > Clean up the LPSP capability printout. No functional changes. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > .../drm/i915/display/intel_display_debugfs.c | 44 +++++++------------ > 1 file changed, 17 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index d2a14a9c6857..a6dcb95cfc1f 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -2225,14 +2225,12 @@ static int i915_psr_status_show(struct seq_file *m, void *data) > } > DEFINE_SHOW_ATTRIBUTE(i915_psr_status); > > -#define LPSP_CAPABLE(COND) (COND ? seq_puts(m, "LPSP: capable\n") : \ > - seq_puts(m, "LPSP: incapable\n")) > - > static int i915_lpsp_capability_show(struct seq_file *m, void *data) > { > struct drm_connector *connector = m->private; > struct drm_i915_private *i915 = to_i915(connector->dev); > struct intel_encoder *encoder; > + bool lpsp_capable = false; > > encoder = intel_attached_encoder(to_intel_connector(connector)); > if (!encoder) > @@ -2241,35 +2239,27 @@ static int i915_lpsp_capability_show(struct seq_file *m, void *data) > if (connector->status != connector_status_connected) > return -ENODEV; > > - if (DISPLAY_VER(i915) >= 13) { > - LPSP_CAPABLE(encoder->port <= PORT_B); > - return 0; > - } > - > - switch (DISPLAY_VER(i915)) { > - case 12: > + if (DISPLAY_VER(i915) >= 13) > + lpsp_capable = encoder->port <= PORT_B; > + else if (DISPLAY_VER(i915) >= 12) > /* > * Actually TGL can drive LPSP on port till DDI_C > * but there is no physical connected DDI_C on TGL sku's, > * even driver is not initilizing DDI_C port for gen12. > */ > - LPSP_CAPABLE(encoder->port <= PORT_B); > - break; > - case 11: > - LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_DSI || > - connector->connector_type == DRM_MODE_CONNECTOR_eDP); > - break; > - case 10: > - case 9: > - LPSP_CAPABLE(encoder->port == PORT_A && > - (connector->connector_type == DRM_MODE_CONNECTOR_DSI || > - connector->connector_type == DRM_MODE_CONNECTOR_eDP || > - connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)); > - break; > - default: > - if (IS_HASWELL(i915) || IS_BROADWELL(i915)) > - LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_eDP); > - } > + lpsp_capable = encoder->port <= PORT_B; > + else if (DISPLAY_VER(i915) == 11) > + lpsp_capable = (connector->connector_type == DRM_MODE_CONNECTOR_DSI || > + connector->connector_type == DRM_MODE_CONNECTOR_eDP); > + else if (IS_DISPLAY_VER(i915, 9, 10)) > + lpsp_capable = (encoder->port == PORT_A && > + (connector->connector_type == DRM_MODE_CONNECTOR_DSI || > + connector->connector_type == DRM_MODE_CONNECTOR_eDP || > + connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)); > + else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) > + lpsp_capable = connector->connector_type == DRM_MODE_CONNECTOR_eDP; > + > + seq_printf(m, "LPSP: %s\n", lpsp_capable ? "capable" : "incapable"); > > return 0; > } > -- > 2.20.1 >
On Wed, 01 Sep 2021, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > On Mon, Aug 30, 2021 at 03:53:41PM +0300, Jani Nikula wrote: >> Clean up the LPSP capability printout. No functional changes. >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Thanks, pushed the first two for starters. BR, Jani. > >> --- >> .../drm/i915/display/intel_display_debugfs.c | 44 +++++++------------ >> 1 file changed, 17 insertions(+), 27 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> index d2a14a9c6857..a6dcb95cfc1f 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> @@ -2225,14 +2225,12 @@ static int i915_psr_status_show(struct seq_file *m, void *data) >> } >> DEFINE_SHOW_ATTRIBUTE(i915_psr_status); >> >> -#define LPSP_CAPABLE(COND) (COND ? seq_puts(m, "LPSP: capable\n") : \ >> - seq_puts(m, "LPSP: incapable\n")) >> - >> static int i915_lpsp_capability_show(struct seq_file *m, void *data) >> { >> struct drm_connector *connector = m->private; >> struct drm_i915_private *i915 = to_i915(connector->dev); >> struct intel_encoder *encoder; >> + bool lpsp_capable = false; >> >> encoder = intel_attached_encoder(to_intel_connector(connector)); >> if (!encoder) >> @@ -2241,35 +2239,27 @@ static int i915_lpsp_capability_show(struct seq_file *m, void *data) >> if (connector->status != connector_status_connected) >> return -ENODEV; >> >> - if (DISPLAY_VER(i915) >= 13) { >> - LPSP_CAPABLE(encoder->port <= PORT_B); >> - return 0; >> - } >> - >> - switch (DISPLAY_VER(i915)) { >> - case 12: >> + if (DISPLAY_VER(i915) >= 13) >> + lpsp_capable = encoder->port <= PORT_B; >> + else if (DISPLAY_VER(i915) >= 12) >> /* >> * Actually TGL can drive LPSP on port till DDI_C >> * but there is no physical connected DDI_C on TGL sku's, >> * even driver is not initilizing DDI_C port for gen12. >> */ >> - LPSP_CAPABLE(encoder->port <= PORT_B); >> - break; >> - case 11: >> - LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_DSI || >> - connector->connector_type == DRM_MODE_CONNECTOR_eDP); >> - break; >> - case 10: >> - case 9: >> - LPSP_CAPABLE(encoder->port == PORT_A && >> - (connector->connector_type == DRM_MODE_CONNECTOR_DSI || >> - connector->connector_type == DRM_MODE_CONNECTOR_eDP || >> - connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)); >> - break; >> - default: >> - if (IS_HASWELL(i915) || IS_BROADWELL(i915)) >> - LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_eDP); >> - } >> + lpsp_capable = encoder->port <= PORT_B; >> + else if (DISPLAY_VER(i915) == 11) >> + lpsp_capable = (connector->connector_type == DRM_MODE_CONNECTOR_DSI || >> + connector->connector_type == DRM_MODE_CONNECTOR_eDP); >> + else if (IS_DISPLAY_VER(i915, 9, 10)) >> + lpsp_capable = (encoder->port == PORT_A && >> + (connector->connector_type == DRM_MODE_CONNECTOR_DSI || >> + connector->connector_type == DRM_MODE_CONNECTOR_eDP || >> + connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)); >> + else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) >> + lpsp_capable = connector->connector_type == DRM_MODE_CONNECTOR_eDP; >> + >> + seq_printf(m, "LPSP: %s\n", lpsp_capable ? "capable" : "incapable"); >> >> return 0; >> } >> -- >> 2.20.1 >>
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index d2a14a9c6857..a6dcb95cfc1f 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -2225,14 +2225,12 @@ static int i915_psr_status_show(struct seq_file *m, void *data) } DEFINE_SHOW_ATTRIBUTE(i915_psr_status); -#define LPSP_CAPABLE(COND) (COND ? seq_puts(m, "LPSP: capable\n") : \ - seq_puts(m, "LPSP: incapable\n")) - static int i915_lpsp_capability_show(struct seq_file *m, void *data) { struct drm_connector *connector = m->private; struct drm_i915_private *i915 = to_i915(connector->dev); struct intel_encoder *encoder; + bool lpsp_capable = false; encoder = intel_attached_encoder(to_intel_connector(connector)); if (!encoder) @@ -2241,35 +2239,27 @@ static int i915_lpsp_capability_show(struct seq_file *m, void *data) if (connector->status != connector_status_connected) return -ENODEV; - if (DISPLAY_VER(i915) >= 13) { - LPSP_CAPABLE(encoder->port <= PORT_B); - return 0; - } - - switch (DISPLAY_VER(i915)) { - case 12: + if (DISPLAY_VER(i915) >= 13) + lpsp_capable = encoder->port <= PORT_B; + else if (DISPLAY_VER(i915) >= 12) /* * Actually TGL can drive LPSP on port till DDI_C * but there is no physical connected DDI_C on TGL sku's, * even driver is not initilizing DDI_C port for gen12. */ - LPSP_CAPABLE(encoder->port <= PORT_B); - break; - case 11: - LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_DSI || - connector->connector_type == DRM_MODE_CONNECTOR_eDP); - break; - case 10: - case 9: - LPSP_CAPABLE(encoder->port == PORT_A && - (connector->connector_type == DRM_MODE_CONNECTOR_DSI || - connector->connector_type == DRM_MODE_CONNECTOR_eDP || - connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)); - break; - default: - if (IS_HASWELL(i915) || IS_BROADWELL(i915)) - LPSP_CAPABLE(connector->connector_type == DRM_MODE_CONNECTOR_eDP); - } + lpsp_capable = encoder->port <= PORT_B; + else if (DISPLAY_VER(i915) == 11) + lpsp_capable = (connector->connector_type == DRM_MODE_CONNECTOR_DSI || + connector->connector_type == DRM_MODE_CONNECTOR_eDP); + else if (IS_DISPLAY_VER(i915, 9, 10)) + lpsp_capable = (encoder->port == PORT_A && + (connector->connector_type == DRM_MODE_CONNECTOR_DSI || + connector->connector_type == DRM_MODE_CONNECTOR_eDP || + connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)); + else if (IS_HASWELL(i915) || IS_BROADWELL(i915)) + lpsp_capable = connector->connector_type == DRM_MODE_CONNECTOR_eDP; + + seq_printf(m, "LPSP: %s\n", lpsp_capable ? "capable" : "incapable"); return 0; }
Clean up the LPSP capability printout. No functional changes. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- .../drm/i915/display/intel_display_debugfs.c | 44 +++++++------------ 1 file changed, 17 insertions(+), 27 deletions(-)