| Message ID | 1480334827-112273-1-git-send-email-libin.yang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 28 Nov 2016, libin.yang@intel.com wrote: > From: Libin Yang <libin.yang@intel.com> > > Add the DP MST info dump in debugfs. > > Signed-off-by: Libin Yang <libin.yang@intel.com> > Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> > Reviewed-by: Lyude <cpaul@redhat.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> I don't think Rodrigo's sob is proper here, even if he pushed the original version of the patch that got later reverted. Anyway, Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- > 1 file changed, 18 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index e7f731f..f5f88b2 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -2877,6 +2877,20 @@ static void intel_dp_info(struct seq_file *m, > &intel_dp->aux); > } > > +static void intel_dp_mst_info(struct seq_file *m, > + struct intel_connector *intel_connector) > +{ > + struct intel_encoder *intel_encoder = intel_connector->encoder; > + struct intel_dp_mst_encoder *intel_mst = > + enc_to_mst(&intel_encoder->base); > + struct intel_digital_port *intel_dig_port = intel_mst->primary; > + struct intel_dp *intel_dp = &intel_dig_port->dp; > + bool has_audio = drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, > + intel_connector->port); > + > + seq_printf(m, "\taudio support: %s\n", yesno(has_audio)); > +} > + > static void intel_hdmi_info(struct seq_file *m, > struct intel_connector *intel_connector) > { > @@ -2919,7 +2933,10 @@ static void intel_connector_info(struct seq_file *m, > switch (connector->connector_type) { > case DRM_MODE_CONNECTOR_DisplayPort: > case DRM_MODE_CONNECTOR_eDP: > - intel_dp_info(m, intel_connector); > + if (intel_encoder->type == INTEL_OUTPUT_DP_MST) > + intel_dp_mst_info(m, intel_connector); > + else > + intel_dp_info(m, intel_connector); > break; > case DRM_MODE_CONNECTOR_LVDS: > if (intel_encoder->type == INTEL_OUTPUT_LVDS)
On Tue, 29 Nov 2016, Jani Nikula <jani.nikula@linux.intel.com> wrote: > On Mon, 28 Nov 2016, libin.yang@intel.com wrote: >> From: Libin Yang <libin.yang@intel.com> >> >> Add the DP MST info dump in debugfs. >> >> Signed-off-by: Libin Yang <libin.yang@intel.com> >> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> >> Reviewed-by: Lyude <cpaul@redhat.com> >> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > I don't think Rodrigo's sob is proper here, even if he pushed the > original version of the patch that got later reverted. Pushed the series, with the tags fixed a bit, thanks for the patches. BR, Jani. > > Anyway, > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> > >> --- >> drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- >> 1 file changed, 18 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c >> index e7f731f..f5f88b2 100644 >> --- a/drivers/gpu/drm/i915/i915_debugfs.c >> +++ b/drivers/gpu/drm/i915/i915_debugfs.c >> @@ -2877,6 +2877,20 @@ static void intel_dp_info(struct seq_file *m, >> &intel_dp->aux); >> } >> >> +static void intel_dp_mst_info(struct seq_file *m, >> + struct intel_connector *intel_connector) >> +{ >> + struct intel_encoder *intel_encoder = intel_connector->encoder; >> + struct intel_dp_mst_encoder *intel_mst = >> + enc_to_mst(&intel_encoder->base); >> + struct intel_digital_port *intel_dig_port = intel_mst->primary; >> + struct intel_dp *intel_dp = &intel_dig_port->dp; >> + bool has_audio = drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, >> + intel_connector->port); >> + >> + seq_printf(m, "\taudio support: %s\n", yesno(has_audio)); >> +} >> + >> static void intel_hdmi_info(struct seq_file *m, >> struct intel_connector *intel_connector) >> { >> @@ -2919,7 +2933,10 @@ static void intel_connector_info(struct seq_file *m, >> switch (connector->connector_type) { >> case DRM_MODE_CONNECTOR_DisplayPort: >> case DRM_MODE_CONNECTOR_eDP: >> - intel_dp_info(m, intel_connector); >> + if (intel_encoder->type == INTEL_OUTPUT_DP_MST) >> + intel_dp_mst_info(m, intel_connector); >> + else >> + intel_dp_info(m, intel_connector); >> break; >> case DRM_MODE_CONNECTOR_LVDS: >> if (intel_encoder->type == INTEL_OUTPUT_LVDS)
On Tue, 2016-11-29 at 11:24 +0200, Jani Nikula wrote: > On Mon, 28 Nov 2016, libin.yang@intel.com wrote: > > From: Libin Yang <libin.yang@intel.com> > > > > Add the DP MST info dump in debugfs. > > > > Signed-off-by: Libin Yang <libin.yang@intel.com> > > Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> > > Reviewed-by: Lyude <cpaul@redhat.com> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > I don't think Rodrigo's sob is proper here, even if he pushed the > original version of the patch that got later reverted. Jani is right. I haven't signed this off. I believe the idea was to CC me probably. > > Anyway, > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > > --- > > drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- > > 1 file changed, 18 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > > index e7f731f..f5f88b2 100644 > > --- a/drivers/gpu/drm/i915/i915_debugfs.c > > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > > @@ -2877,6 +2877,20 @@ static void intel_dp_info(struct seq_file *m, > > &intel_dp->aux); > > } > > > > +static void intel_dp_mst_info(struct seq_file *m, > > + struct intel_connector *intel_connector) > > +{ > > + struct intel_encoder *intel_encoder = intel_connector->encoder; > > + struct intel_dp_mst_encoder *intel_mst = > > + enc_to_mst(&intel_encoder->base); > > + struct intel_digital_port *intel_dig_port = intel_mst->primary; > > + struct intel_dp *intel_dp = &intel_dig_port->dp; > > + bool has_audio = drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, > > + intel_connector->port); > > + > > + seq_printf(m, "\taudio support: %s\n", yesno(has_audio)); > > +} > > + > > static void intel_hdmi_info(struct seq_file *m, > > struct intel_connector *intel_connector) > > { > > @@ -2919,7 +2933,10 @@ static void intel_connector_info(struct seq_file *m, > > switch (connector->connector_type) { > > case DRM_MODE_CONNECTOR_DisplayPort: > > case DRM_MODE_CONNECTOR_eDP: > > - intel_dp_info(m, intel_connector); > > + if (intel_encoder->type == INTEL_OUTPUT_DP_MST) > > + intel_dp_mst_info(m, intel_connector); > > + else > > + intel_dp_info(m, intel_connector); > > break; > > case DRM_MODE_CONNECTOR_LVDS: > > if (intel_encoder->type == INTEL_OUTPUT_LVDS) >
>-----Original Message----- >From: Vivi, Rodrigo >Sent: Wednesday, November 30, 2016 1:22 AM >To: jani.nikula@linux.intel.com >Cc: ville.syrjala@linux.intel.com; intel-gfx@lists.freedesktop.org; Yang, Libin ><libin.yang@intel.com>; Vetter, Daniel <daniel.vetter@intel.com>; >tiwai@suse.de; Pandiyan, Dhinakaran <dhinakaran.pandiyan@intel.com> >Subject: Re: [PATCH 1/3] drm/i915/debugfs: add dp mst info > >On Tue, 2016-11-29 at 11:24 +0200, Jani Nikula wrote: >> On Mon, 28 Nov 2016, libin.yang@intel.com wrote: >> > From: Libin Yang <libin.yang@intel.com> >> > >> > Add the DP MST info dump in debugfs. >> > >> > Signed-off-by: Libin Yang <libin.yang@intel.com> >> > Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> >> > Reviewed-by: Lyude <cpaul@redhat.com> >> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> >> >> I don't think Rodrigo's sob is proper here, even if he pushed the >> original version of the patch that got later reverted. > >Jani is right. I haven't signed this off. >I believe the idea was to CC me probably. Get it. I will take care next time. I added you because the original patch has your signed-off :) Regards, Libin > >> >> Anyway, >> >> Reviewed-by: Jani Nikula <jani.nikula@intel.com> >> >> > --- >> > drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- >> > 1 file changed, 18 insertions(+), 1 deletion(-) >> > >> > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c >> > b/drivers/gpu/drm/i915/i915_debugfs.c >> > index e7f731f..f5f88b2 100644 >> > --- a/drivers/gpu/drm/i915/i915_debugfs.c >> > +++ b/drivers/gpu/drm/i915/i915_debugfs.c >> > @@ -2877,6 +2877,20 @@ static void intel_dp_info(struct seq_file *m, >> > &intel_dp->aux); >> > } >> > >> > +static void intel_dp_mst_info(struct seq_file *m, >> > + struct intel_connector *intel_connector) { >> > + struct intel_encoder *intel_encoder = intel_connector->encoder; >> > + struct intel_dp_mst_encoder *intel_mst = >> > + enc_to_mst(&intel_encoder->base); >> > + struct intel_digital_port *intel_dig_port = intel_mst->primary; >> > + struct intel_dp *intel_dp = &intel_dig_port->dp; >> > + bool has_audio = drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, >> > + intel_connector->port); >> > + >> > + seq_printf(m, "\taudio support: %s\n", yesno(has_audio)); } >> > + >> > static void intel_hdmi_info(struct seq_file *m, >> > struct intel_connector *intel_connector) { @@ - >2919,7 >> > +2933,10 @@ static void intel_connector_info(struct seq_file *m, >> > switch (connector->connector_type) { >> > case DRM_MODE_CONNECTOR_DisplayPort: >> > case DRM_MODE_CONNECTOR_eDP: >> > - intel_dp_info(m, intel_connector); >> > + if (intel_encoder->type == INTEL_OUTPUT_DP_MST) >> > + intel_dp_mst_info(m, intel_connector); >> > + else >> > + intel_dp_info(m, intel_connector); >> > break; >> > case DRM_MODE_CONNECTOR_LVDS: >> > if (intel_encoder->type == INTEL_OUTPUT_LVDS) >>
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index e7f731f..f5f88b2 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2877,6 +2877,20 @@ static void intel_dp_info(struct seq_file *m, &intel_dp->aux); } +static void intel_dp_mst_info(struct seq_file *m, + struct intel_connector *intel_connector) +{ + struct intel_encoder *intel_encoder = intel_connector->encoder; + struct intel_dp_mst_encoder *intel_mst = + enc_to_mst(&intel_encoder->base); + struct intel_digital_port *intel_dig_port = intel_mst->primary; + struct intel_dp *intel_dp = &intel_dig_port->dp; + bool has_audio = drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, + intel_connector->port); + + seq_printf(m, "\taudio support: %s\n", yesno(has_audio)); +} + static void intel_hdmi_info(struct seq_file *m, struct intel_connector *intel_connector) { @@ -2919,7 +2933,10 @@ static void intel_connector_info(struct seq_file *m, switch (connector->connector_type) { case DRM_MODE_CONNECTOR_DisplayPort: case DRM_MODE_CONNECTOR_eDP: - intel_dp_info(m, intel_connector); + if (intel_encoder->type == INTEL_OUTPUT_DP_MST) + intel_dp_mst_info(m, intel_connector); + else + intel_dp_info(m, intel_connector); break; case DRM_MODE_CONNECTOR_LVDS: if (intel_encoder->type == INTEL_OUTPUT_LVDS)