From: Jani Nikula <jani.nikula@intel.com> To: dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org Subject: [PATCH v2 05/25] drm/edid: keep propagating drm_edid to display info Date: Mon, 9 May 2022 15:03:04 +0300 [thread overview] Message-ID: <5a24629a6788de873c3f01d391b9b2e856d2eb57.1652097712.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1652097712.git.jani.nikula@intel.com> We'll need to propagate drm_edid everywhere. v2: Use drm_edid_legacy_init() Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/drm_edid.c | 48 +++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index f48f1f1a1fa7..96e3f9327044 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2437,13 +2437,13 @@ EXPORT_SYMBOL(drm_edid_duplicate); /** * edid_get_quirks - return quirk flags for a given EDID - * @edid: EDID to process + * @drm_edid: EDID to process * * This tells subsequent routines what fixes they need to apply. */ -static u32 edid_get_quirks(const struct edid *edid) +static u32 edid_get_quirks(const struct drm_edid *drm_edid) { - u32 panel_id = edid_extract_panel_id(edid); + u32 panel_id = edid_extract_panel_id(drm_edid->edid); const struct edid_quirk *quirk; int i; @@ -5466,7 +5466,7 @@ static void drm_parse_microsoft_vsdb(struct drm_connector *connector, } static void drm_parse_cea_ext(struct drm_connector *connector, - const struct edid *edid) + const struct drm_edid *drm_edid) { struct drm_display_info *info = &connector->display_info; struct drm_edid_iter edid_iter; @@ -5474,7 +5474,7 @@ static void drm_parse_cea_ext(struct drm_connector *connector, struct cea_db_iter iter; const u8 *edid_ext; - drm_edid_iter_begin(edid, &edid_iter); + drm_edid_iter_begin(drm_edid->edid, &edid_iter); drm_edid_iter_for_each(edid_ext, &edid_iter) { if (edid_ext[0] != CEA_EXT) continue; @@ -5495,7 +5495,7 @@ static void drm_parse_cea_ext(struct drm_connector *connector, } drm_edid_iter_end(&edid_iter); - cea_db_iter_edid_begin(edid, &iter); + cea_db_iter_edid_begin(drm_edid->edid, &iter); cea_db_iter_for_each(db, &iter) { /* FIXME: convert parsers to use struct cea_db */ const u8 *data = (const u8 *)db; @@ -5541,16 +5541,15 @@ void get_monitor_range(const struct detailed_timing *timing, monitor_range->max_vfreq = range->max_vfreq; } -static -void drm_get_monitor_range(struct drm_connector *connector, - const struct edid *edid) +static void drm_get_monitor_range(struct drm_connector *connector, + const struct drm_edid *drm_edid) { struct drm_display_info *info = &connector->display_info; - if (!version_greater(edid, 1, 1)) + if (!version_greater(drm_edid->edid, 1, 1)) return; - drm_for_each_detailed_block(edid, get_monitor_range, + drm_for_each_detailed_block(drm_edid->edid, get_monitor_range, &info->monitor_range); DRM_DEBUG_KMS("Supported Monitor Refresh rate range is %d Hz - %d Hz\n", @@ -5610,12 +5609,13 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector, info->mso_stream_count, info->mso_pixel_overlap); } -static void drm_update_mso(struct drm_connector *connector, const struct edid *edid) +static void drm_update_mso(struct drm_connector *connector, + const struct drm_edid *drm_edid) { const struct displayid_block *block; struct displayid_iter iter; - displayid_iter_edid_begin(edid, &iter); + displayid_iter_edid_begin(drm_edid->edid, &iter); displayid_iter_for_each(block, &iter) { if (block->tag == DATA_BLOCK_2_VENDOR_SPECIFIC) drm_parse_vesa_mso_data(connector, block); @@ -5654,18 +5654,20 @@ drm_reset_display_info(struct drm_connector *connector) info->mso_pixel_overlap = 0; } -u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edid) +static u32 update_display_info(struct drm_connector *connector, + const struct drm_edid *drm_edid) { struct drm_display_info *info = &connector->display_info; + const struct edid *edid = drm_edid->edid; - u32 quirks = edid_get_quirks(edid); + u32 quirks = edid_get_quirks(drm_edid); drm_reset_display_info(connector); info->width_mm = edid->width_cm * 10; info->height_mm = edid->height_cm * 10; - drm_get_monitor_range(connector, edid); + drm_get_monitor_range(connector, drm_edid); if (edid->revision < 3) goto out; @@ -5674,7 +5676,7 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi goto out; info->color_formats |= DRM_COLOR_FORMAT_RGB444; - drm_parse_cea_ext(connector, edid); + drm_parse_cea_ext(connector, drm_edid); /* * Digital sink with "DFP 1.x compliant TMDS" according to EDID 1.3? @@ -5727,7 +5729,7 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB422) info->color_formats |= DRM_COLOR_FORMAT_YCBCR422; - drm_update_mso(connector, edid); + drm_update_mso(connector, drm_edid); out: if (quirks & EDID_QUIRK_NON_DESKTOP) { @@ -5739,6 +5741,14 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi return quirks; } +u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edid) +{ + struct drm_edid drm_edid; + + return update_display_info(connector, + drm_edid_legacy_init(&drm_edid, edid)); +} + static struct drm_display_mode *drm_mode_displayid_detailed(struct drm_device *dev, struct displayid_detailed_timings_1 *timings, bool type_7) @@ -5851,7 +5861,7 @@ static int drm_edid_connector_update(struct drm_connector *connector, * To avoid multiple parsing of same block, lets parse that map * from sink info, before parsing CEA modes. */ - quirks = drm_add_display_info(connector, edid); + quirks = update_display_info(connector, drm_edid); /* Depends on info->cea_rev set by drm_add_display_info() above */ drm_edid_to_eld(connector, edid); -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@intel.com> To: dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH v2 05/25] drm/edid: keep propagating drm_edid to display info Date: Mon, 9 May 2022 15:03:04 +0300 [thread overview] Message-ID: <5a24629a6788de873c3f01d391b9b2e856d2eb57.1652097712.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1652097712.git.jani.nikula@intel.com> We'll need to propagate drm_edid everywhere. v2: Use drm_edid_legacy_init() Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/drm_edid.c | 48 +++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index f48f1f1a1fa7..96e3f9327044 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2437,13 +2437,13 @@ EXPORT_SYMBOL(drm_edid_duplicate); /** * edid_get_quirks - return quirk flags for a given EDID - * @edid: EDID to process + * @drm_edid: EDID to process * * This tells subsequent routines what fixes they need to apply. */ -static u32 edid_get_quirks(const struct edid *edid) +static u32 edid_get_quirks(const struct drm_edid *drm_edid) { - u32 panel_id = edid_extract_panel_id(edid); + u32 panel_id = edid_extract_panel_id(drm_edid->edid); const struct edid_quirk *quirk; int i; @@ -5466,7 +5466,7 @@ static void drm_parse_microsoft_vsdb(struct drm_connector *connector, } static void drm_parse_cea_ext(struct drm_connector *connector, - const struct edid *edid) + const struct drm_edid *drm_edid) { struct drm_display_info *info = &connector->display_info; struct drm_edid_iter edid_iter; @@ -5474,7 +5474,7 @@ static void drm_parse_cea_ext(struct drm_connector *connector, struct cea_db_iter iter; const u8 *edid_ext; - drm_edid_iter_begin(edid, &edid_iter); + drm_edid_iter_begin(drm_edid->edid, &edid_iter); drm_edid_iter_for_each(edid_ext, &edid_iter) { if (edid_ext[0] != CEA_EXT) continue; @@ -5495,7 +5495,7 @@ static void drm_parse_cea_ext(struct drm_connector *connector, } drm_edid_iter_end(&edid_iter); - cea_db_iter_edid_begin(edid, &iter); + cea_db_iter_edid_begin(drm_edid->edid, &iter); cea_db_iter_for_each(db, &iter) { /* FIXME: convert parsers to use struct cea_db */ const u8 *data = (const u8 *)db; @@ -5541,16 +5541,15 @@ void get_monitor_range(const struct detailed_timing *timing, monitor_range->max_vfreq = range->max_vfreq; } -static -void drm_get_monitor_range(struct drm_connector *connector, - const struct edid *edid) +static void drm_get_monitor_range(struct drm_connector *connector, + const struct drm_edid *drm_edid) { struct drm_display_info *info = &connector->display_info; - if (!version_greater(edid, 1, 1)) + if (!version_greater(drm_edid->edid, 1, 1)) return; - drm_for_each_detailed_block(edid, get_monitor_range, + drm_for_each_detailed_block(drm_edid->edid, get_monitor_range, &info->monitor_range); DRM_DEBUG_KMS("Supported Monitor Refresh rate range is %d Hz - %d Hz\n", @@ -5610,12 +5609,13 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector, info->mso_stream_count, info->mso_pixel_overlap); } -static void drm_update_mso(struct drm_connector *connector, const struct edid *edid) +static void drm_update_mso(struct drm_connector *connector, + const struct drm_edid *drm_edid) { const struct displayid_block *block; struct displayid_iter iter; - displayid_iter_edid_begin(edid, &iter); + displayid_iter_edid_begin(drm_edid->edid, &iter); displayid_iter_for_each(block, &iter) { if (block->tag == DATA_BLOCK_2_VENDOR_SPECIFIC) drm_parse_vesa_mso_data(connector, block); @@ -5654,18 +5654,20 @@ drm_reset_display_info(struct drm_connector *connector) info->mso_pixel_overlap = 0; } -u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edid) +static u32 update_display_info(struct drm_connector *connector, + const struct drm_edid *drm_edid) { struct drm_display_info *info = &connector->display_info; + const struct edid *edid = drm_edid->edid; - u32 quirks = edid_get_quirks(edid); + u32 quirks = edid_get_quirks(drm_edid); drm_reset_display_info(connector); info->width_mm = edid->width_cm * 10; info->height_mm = edid->height_cm * 10; - drm_get_monitor_range(connector, edid); + drm_get_monitor_range(connector, drm_edid); if (edid->revision < 3) goto out; @@ -5674,7 +5676,7 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi goto out; info->color_formats |= DRM_COLOR_FORMAT_RGB444; - drm_parse_cea_ext(connector, edid); + drm_parse_cea_ext(connector, drm_edid); /* * Digital sink with "DFP 1.x compliant TMDS" according to EDID 1.3? @@ -5727,7 +5729,7 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB422) info->color_formats |= DRM_COLOR_FORMAT_YCBCR422; - drm_update_mso(connector, edid); + drm_update_mso(connector, drm_edid); out: if (quirks & EDID_QUIRK_NON_DESKTOP) { @@ -5739,6 +5741,14 @@ u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edi return quirks; } +u32 drm_add_display_info(struct drm_connector *connector, const struct edid *edid) +{ + struct drm_edid drm_edid; + + return update_display_info(connector, + drm_edid_legacy_init(&drm_edid, edid)); +} + static struct drm_display_mode *drm_mode_displayid_detailed(struct drm_device *dev, struct displayid_detailed_timings_1 *timings, bool type_7) @@ -5851,7 +5861,7 @@ static int drm_edid_connector_update(struct drm_connector *connector, * To avoid multiple parsing of same block, lets parse that map * from sink info, before parsing CEA modes. */ - quirks = drm_add_display_info(connector, edid); + quirks = update_display_info(connector, drm_edid); /* Depends on info->cea_rev set by drm_add_display_info() above */ drm_edid_to_eld(connector, edid); -- 2.30.2
next prev parent reply other threads:[~2022-05-09 12:03 UTC|newest] Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-09 12:02 [PATCH v2 00/25] drm/edid: introduce struct drm_edid Jani Nikula 2022-05-09 12:02 ` [Intel-gfx] " Jani Nikula 2022-05-09 12:03 ` [PATCH v2 01/25] drm/edid: use else-if in CTA extension parsing Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-09 12:03 ` [PATCH v2 02/25] drm/edid: convert drm_for_each_detailed_block() to edid iter Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-09 12:03 ` [PATCH v2 03/25] drm/edid: add struct drm_edid container Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 6:26 ` Nautiyal, Ankit K 2022-05-16 8:11 ` Jani Nikula 2022-05-09 12:03 ` [PATCH v2 04/25] drm/edid: start propagating drm_edid to lower levels Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 6:23 ` Nautiyal, Ankit K 2022-05-09 12:03 ` Jani Nikula [this message] 2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 05/25] drm/edid: keep propagating drm_edid to display info Jani Nikula 2022-05-10 6:15 ` Nautiyal, Ankit K 2022-05-10 6:15 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-11 9:21 ` [Intel-gfx] [PATCH v3] " Jani Nikula 2022-05-11 9:21 ` Jani Nikula 2022-05-09 12:03 ` [PATCH v2 06/25] drm/edid: propagate drm_edid to drm_edid_to_eld() Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 6:31 ` Nautiyal, Ankit K 2022-05-10 6:31 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-11 9:23 ` [PATCH v3] " Jani Nikula 2022-05-11 9:23 ` [Intel-gfx] " Jani Nikula 2022-05-09 12:03 ` [PATCH v2 07/25] drm/edid: convert drm_edid_connector_update() to drm_edid fully Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 6:45 ` Nautiyal, Ankit K 2022-05-11 9:26 ` [PATCH v3] " Jani Nikula 2022-05-11 9:26 ` [Intel-gfx] " Jani Nikula 2022-05-09 12:03 ` [PATCH v2 08/25] drm/edid: convert struct detailed_mode_closure to drm_edid Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 7:14 ` Nautiyal, Ankit K 2022-05-10 7:14 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 09/25] drm/edid: convert drm_mode_detailed() " Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 8:57 ` Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 10/25] drm/edid: convert drm_dmt_modes_for_range() " Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 9:04 ` Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 11/25] drm/edid: convert drm_gtf_modes_for_range() " Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 9:05 ` Nautiyal, Ankit K 2022-05-10 9:05 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 12/25] drm/edid: convert drm_cvt_modes_for_range() " Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 9:11 ` Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 13/25] drm/edid: convert drm_mode_std() and children " Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 9:18 ` Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 14/25] drm/edid: convert mode_in_range() and drm_monitor_supports_rb() " Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 9:22 ` Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 15/25] drm/edid: convert get_monitor_name() " Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 9:29 ` Nautiyal, Ankit K 2022-05-10 9:29 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 16/25] drm/edid: convert drm_for_each_detailed_block() " Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 9:36 ` Nautiyal, Ankit K 2022-05-10 9:36 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 17/25] drm/edid: add drm_edid helper for drm_edid_to_sad() Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 9:55 ` Nautiyal, Ankit K 2022-05-10 9:55 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 18/25] drm/edid: add drm_edid helper for drm_edid_to_speaker_allocation() Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 10:08 ` Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 19/25] drm/edid: add drm_edid helper for drm_detect_hdmi_monitor() Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 10:15 ` Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 20/25] drm/edid: add drm_edid helper for drm_detect_monitor_audio() Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 10:17 ` Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 21/25] drm/edid: convert cea_db_iter_edid_begin() to drm_edid Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 10:21 ` Nautiyal, Ankit K 2022-05-10 10:21 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 22/25] drm/edid: convert drm_edid_iter_begin() " Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 10:25 ` Nautiyal, Ankit K 2022-05-10 10:25 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 23/25] drm/edid: add drm_edid helper for drm_update_tile_info() Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 10:28 ` Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 24/25] drm/displayid: convert to drm_edid Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 12:04 ` Nautiyal, Ankit K 2022-05-10 12:04 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-09 12:03 ` [PATCH v2 25/25] drm/edid: convert version_greater() " Jani Nikula 2022-05-09 12:03 ` [Intel-gfx] " Jani Nikula 2022-05-10 12:07 ` Nautiyal, Ankit K 2022-05-10 12:07 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-09 19:16 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/edid: introduce struct drm_edid (rev3) Patchwork 2022-05-09 19:37 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-05-10 6:29 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork 2022-05-11 10:21 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/edid: introduce struct drm_edid (rev6) Patchwork 2022-05-11 10:42 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-05-11 14:29 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2022-05-11 17:35 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/edid: introduce struct drm_edid (rev7) Patchwork 2022-05-11 18:01 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-05-11 22:01 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=5a24629a6788de873c3f01d391b9b2e856d2eb57.1652097712.git.jani.nikula@intel.com \ --to=jani.nikula@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.