| Message ID | 20230602132321.3199445-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/debugfs: stop using edid_blob_ptr | expand |
On Fri, 2023-06-02 at 16:23 +0300, Jani Nikula wrote: > Only the EDID code and sysfs should look at the EDID property. Stop > using it. Reviewed-by: Jouni Högander <jouni.hogander@intel.com> > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display_debugfs.c | 12 ++++++---- > -- > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index 2a4df62692a6..165e2c7e3126 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -6,6 +6,7 @@ > #include <linux/string_helpers.h> > > #include <drm/drm_debugfs.h> > +#include <drm/drm_edid.h> > #include <drm/drm_fourcc.h> > > #include "hsw_ips.h" > @@ -228,19 +229,18 @@ static void intel_hdcp_info(struct seq_file *m, > seq_puts(m, "\n"); > } > > -static void intel_dp_info(struct seq_file *m, > - struct intel_connector *intel_connector) > +static void intel_dp_info(struct seq_file *m, struct intel_connector > *connector) > { > - struct intel_encoder *intel_encoder = > intel_attached_encoder(intel_connector); > + struct intel_encoder *intel_encoder = > intel_attached_encoder(connector); > struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder); > - const struct drm_property_blob *edid = intel_connector- > >base.edid_blob_ptr; > + const struct edid *edid = drm_edid_raw(connector- > >detect_edid); > > seq_printf(m, "\tDPCD rev: %x\n", intel_dp- > >dpcd[DP_DPCD_REV]); > seq_printf(m, "\taudio support: %s\n", > - str_yes_no(intel_connector- > >base.display_info.has_audio)); > + str_yes_no(connector- > >base.display_info.has_audio)); > > drm_dp_downstream_debug(m, intel_dp->dpcd, intel_dp- > >downstream_ports, > - edid ? edid->data : NULL, &intel_dp- > >aux); > + edid, &intel_dp->aux); > } > > static void intel_dp_mst_info(struct seq_file *m,
On Wed, 07 Jun 2023, "Hogander, Jouni" <jouni.hogander@intel.com> wrote: > On Fri, 2023-06-02 at 16:23 +0300, Jani Nikula wrote: >> Only the EDID code and sysfs should look at the EDID property. Stop >> using it. > > Reviewed-by: Jouni Högander <jouni.hogander@intel.com> Thanks, pushed to drm-intel-next. BR, Jani. > >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> --- >> drivers/gpu/drm/i915/display/intel_display_debugfs.c | 12 ++++++---- >> -- >> 1 file changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> b/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> index 2a4df62692a6..165e2c7e3126 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c >> @@ -6,6 +6,7 @@ >> #include <linux/string_helpers.h> >> >> #include <drm/drm_debugfs.h> >> +#include <drm/drm_edid.h> >> #include <drm/drm_fourcc.h> >> >> #include "hsw_ips.h" >> @@ -228,19 +229,18 @@ static void intel_hdcp_info(struct seq_file *m, >> seq_puts(m, "\n"); >> } >> >> -static void intel_dp_info(struct seq_file *m, >> - struct intel_connector *intel_connector) >> +static void intel_dp_info(struct seq_file *m, struct intel_connector >> *connector) >> { >> - struct intel_encoder *intel_encoder = >> intel_attached_encoder(intel_connector); >> + struct intel_encoder *intel_encoder = >> intel_attached_encoder(connector); >> struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder); >> - const struct drm_property_blob *edid = intel_connector- >> >base.edid_blob_ptr; >> + const struct edid *edid = drm_edid_raw(connector- >> >detect_edid); >> >> seq_printf(m, "\tDPCD rev: %x\n", intel_dp- >> >dpcd[DP_DPCD_REV]); >> seq_printf(m, "\taudio support: %s\n", >> - str_yes_no(intel_connector- >> >base.display_info.has_audio)); >> + str_yes_no(connector- >> >base.display_info.has_audio)); >> >> drm_dp_downstream_debug(m, intel_dp->dpcd, intel_dp- >> >downstream_ports, >> - edid ? edid->data : NULL, &intel_dp- >> >aux); >> + edid, &intel_dp->aux); >> } >> >> static void intel_dp_mst_info(struct seq_file *m, >
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index 2a4df62692a6..165e2c7e3126 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -6,6 +6,7 @@ #include <linux/string_helpers.h> #include <drm/drm_debugfs.h> +#include <drm/drm_edid.h> #include <drm/drm_fourcc.h> #include "hsw_ips.h" @@ -228,19 +229,18 @@ static void intel_hdcp_info(struct seq_file *m, seq_puts(m, "\n"); } -static void intel_dp_info(struct seq_file *m, - struct intel_connector *intel_connector) +static void intel_dp_info(struct seq_file *m, struct intel_connector *connector) { - struct intel_encoder *intel_encoder = intel_attached_encoder(intel_connector); + struct intel_encoder *intel_encoder = intel_attached_encoder(connector); struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder); - const struct drm_property_blob *edid = intel_connector->base.edid_blob_ptr; + const struct edid *edid = drm_edid_raw(connector->detect_edid); seq_printf(m, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]); seq_printf(m, "\taudio support: %s\n", - str_yes_no(intel_connector->base.display_info.has_audio)); + str_yes_no(connector->base.display_info.has_audio)); drm_dp_downstream_debug(m, intel_dp->dpcd, intel_dp->downstream_ports, - edid ? edid->data : NULL, &intel_dp->aux); + edid, &intel_dp->aux); } static void intel_dp_mst_info(struct seq_file *m,
Only the EDID code and sysfs should look at the EDID property. Stop using it. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_display_debugfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)