Skip to content

Commit 8690be0

Browse files
committed
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
1 parent 718551b commit 8690be0

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/gpu/drm/i915/display/intel_display_debugfs.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <linux/string_helpers.h>
77

88
#include <drm/drm_debugfs.h>
9+
#include <drm/drm_edid.h>
910
#include <drm/drm_fourcc.h>
1011

1112
#include "hsw_ips.h"
@@ -228,19 +229,18 @@ static void intel_hdcp_info(struct seq_file *m,
228229
seq_puts(m, "\n");
229230
}
230231

231-
static void intel_dp_info(struct seq_file *m,
232-
struct intel_connector *intel_connector)
232+
static void intel_dp_info(struct seq_file *m, struct intel_connector *connector)
233233
{
234-
struct intel_encoder *intel_encoder = intel_attached_encoder(intel_connector);
234+
struct intel_encoder *intel_encoder = intel_attached_encoder(connector);
235235
struct intel_dp *intel_dp = enc_to_intel_dp(intel_encoder);
236-
const struct drm_property_blob *edid = intel_connector->base.edid_blob_ptr;
236+
const struct edid *edid = drm_edid_raw(connector->detect_edid);
237237

238238
seq_printf(m, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);
239239
seq_printf(m, "\taudio support: %s\n",
240-
str_yes_no(intel_connector->base.display_info.has_audio));
240+
str_yes_no(connector->base.display_info.has_audio));
241241

242242
drm_dp_downstream_debug(m, intel_dp->dpcd, intel_dp->downstream_ports,
243-
edid ? edid->data : NULL, &intel_dp->aux);
243+
edid, &intel_dp->aux);
244244
}
245245

246246
static void intel_dp_mst_info(struct seq_file *m,

0 commit comments

Comments
 (0)