drm/i915/debugfs: stop using edid_blob_ptr

Only the EDID code and sysfs should look at the EDID property. Stop
using it.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230602132321.3199445-1-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 2a4df62692a686b17c7e7a5950690bb718fc7b3a..165e2c7e3126a20893dbd93e2da14bba3e1b15c1 100644 (file)
--- 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 @@ out:
        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,