From: "Nautiyal, Ankit K" <ankit.k.nautiyal@intel.com>
To: Jani Nikula <jani.nikula@intel.com>, <dri-devel@lists.freedesktop.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v2 07/25] drm/edid: convert drm_edid_connector_update() to drm_edid fully
Date: Tue, 10 May 2022 12:15:24 +0530 [thread overview]
Message-ID: <50b247cc-ff03-bf64-ea56-bf043c9e9b15@intel.com> (raw)
In-Reply-To: <aa04fb75f0c769122a17ee60dc92c2242983f3b8.1652097712.git.jani.nikula@intel.com>
On 5/9/2022 5:33 PM, Jani Nikula wrote:
> We'll need to propagate drm_edid everywhere.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/drm_edid.c | 95 ++++++++++++++++++--------------------
> 1 file changed, 46 insertions(+), 49 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index e4fdf742645b..f54699422bca 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -3253,16 +3253,16 @@ do_inferred_modes(const struct detailed_timing *timing, void *c)
> }
> }
>
> -static int
> -add_inferred_modes(struct drm_connector *connector, const struct edid *edid)
> +static int add_inferred_modes(struct drm_connector *connector,
> + const struct drm_edid *drm_edid)
> {
> struct detailed_mode_closure closure = {
> .connector = connector,
> - .edid = edid,
> + .edid = drm_edid->edid,
> };
>
> - if (version_greater(edid, 1, 0))
> - drm_for_each_detailed_block(edid, do_inferred_modes, &closure);
> + if (version_greater(drm_edid->edid, 1, 0))
> + drm_for_each_detailed_block(drm_edid->edid, do_inferred_modes, &closure);
>
> return closure.modes;
> }
> @@ -3312,10 +3312,11 @@ do_established_modes(const struct detailed_timing *timing, void *c)
> * bitmap of the supported "established modes" list (defined above). Tease them
> * out and add them to the global modes list.
> */
> -static int
> -add_established_modes(struct drm_connector *connector, const struct edid *edid)
> +static int add_established_modes(struct drm_connector *connector,
> + const struct drm_edid *drm_edid)
> {
> struct drm_device *dev = connector->dev;
> + const struct edid *edid = drm_edid->edid;
> unsigned long est_bits = edid->established_timings.t1 |
> (edid->established_timings.t2 << 8) |
> ((edid->established_timings.mfg_rsvd & 0x80) << 9);
> @@ -3338,7 +3339,7 @@ add_established_modes(struct drm_connector *connector, const struct edid *edid)
> }
>
> if (version_greater(edid, 1, 0))
> - drm_for_each_detailed_block(edid, do_established_modes,
> + drm_for_each_detailed_block(drm_edid->edid, do_established_modes,
> &closure);
>
> return modes + closure.modes;
> @@ -3373,28 +3374,28 @@ do_standard_modes(const struct detailed_timing *timing, void *c)
> * using the appropriate standard (DMT, GTF, or CVT). Grab them from EDID and
> * add them to the list.
> */
> -static int
> -add_standard_modes(struct drm_connector *connector, const struct edid *edid)
> +static int add_standard_modes(struct drm_connector *connector,
> + const struct drm_edid *drm_edid)
> {
> int i, modes = 0;
> struct detailed_mode_closure closure = {
> .connector = connector,
> - .edid = edid,
> + .edid = drm_edid->edid,
> };
>
> for (i = 0; i < EDID_STD_TIMINGS; i++) {
> struct drm_display_mode *newmode;
>
> - newmode = drm_mode_std(connector, edid,
> - &edid->standard_timings[i]);
> + newmode = drm_mode_std(connector, drm_edid->edid,
> + &drm_edid->edid->standard_timings[i]);
> if (newmode) {
> drm_mode_probed_add(connector, newmode);
> modes++;
> }
> }
>
> - if (version_greater(edid, 1, 0))
> - drm_for_each_detailed_block(edid, do_standard_modes,
> + if (version_greater(drm_edid->edid, 1, 0))
> + drm_for_each_detailed_block(drm_edid->edid, do_standard_modes,
> &closure);
>
> /* XXX should also look for standard codes in VTB blocks */
> @@ -3466,15 +3467,15 @@ do_cvt_mode(const struct detailed_timing *timing, void *c)
> }
>
> static int
> -add_cvt_modes(struct drm_connector *connector, const struct edid *edid)
> +add_cvt_modes(struct drm_connector *connector, const struct drm_edid *drm_edid)
> {
> struct detailed_mode_closure closure = {
> .connector = connector,
> - .edid = edid,
> + .edid = drm_edid->edid,
> };
>
> - if (version_greater(edid, 1, 2))
> - drm_for_each_detailed_block(edid, do_cvt_mode, &closure);
> + if (version_greater(drm_edid->edid, 1, 2))
> + drm_for_each_detailed_block(drm_edid->edid, do_cvt_mode, &closure);
>
> /* XXX should also look for CVT codes in VTB blocks */
>
> @@ -3519,22 +3520,21 @@ do_detailed_mode(const struct detailed_timing *timing, void *c)
> * @edid: EDID block to scan
This needs to be @drm_edid
With this changed:
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Regards,
Ankit
> * @quirks: quirks to apply
> */
> -static int
> -add_detailed_modes(struct drm_connector *connector, const struct edid *edid,
> - u32 quirks)
> +static int add_detailed_modes(struct drm_connector *connector,
> + const struct drm_edid *drm_edid, u32 quirks)
> {
> struct detailed_mode_closure closure = {
> .connector = connector,
> - .edid = edid,
> + .edid = drm_edid->edid,
> .preferred = true,
> .quirks = quirks,
> };
>
> - if (closure.preferred && !version_greater(edid, 1, 3))
> + if (closure.preferred && !version_greater(drm_edid->edid, 1, 3))
> closure.preferred =
> - (edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING);
> + (drm_edid->edid->features & DRM_EDID_FEATURE_PREFERRED_TIMING);
>
> - drm_for_each_detailed_block(edid, do_detailed_mode, &closure);
> + drm_for_each_detailed_block(drm_edid->edid, do_detailed_mode, &closure);
>
> return closure.modes;
> }
> @@ -3588,7 +3588,7 @@ const u8 *drm_find_edid_extension(const struct edid *edid,
> }
>
> /* Return true if the EDID has a CTA extension or a DisplayID CTA data block */
> -static bool drm_edid_has_cta_extension(const struct edid *edid)
> +static bool drm_edid_has_cta_extension(const struct drm_edid *drm_edid)
> {
> const struct displayid_block *block;
> struct displayid_iter iter;
> @@ -3596,11 +3596,11 @@ static bool drm_edid_has_cta_extension(const struct edid *edid)
> bool found = false;
>
> /* Look for a top level CEA extension block */
> - if (drm_find_edid_extension(edid, CEA_EXT, &ext_index))
> + if (drm_find_edid_extension(drm_edid->edid, CEA_EXT, &ext_index))
> return true;
>
> /* CEA blocks can also be found embedded in a DisplayID block */
> - 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_CTA) {
> found = true;
> @@ -3874,8 +3874,8 @@ static bool drm_valid_hdmi_vic(u8 vic)
> return vic > 0 && vic < ARRAY_SIZE(edid_4k_modes);
> }
>
> -static int
> -add_alternate_cea_modes(struct drm_connector *connector, const struct edid *edid)
> +static int add_alternate_cea_modes(struct drm_connector *connector,
> + const struct drm_edid *drm_edid)
> {
> struct drm_device *dev = connector->dev;
> struct drm_display_mode *mode, *tmp;
> @@ -3883,7 +3883,7 @@ add_alternate_cea_modes(struct drm_connector *connector, const struct edid *edid
> int modes = 0;
>
> /* Don't add CTA modes if the CTA extension block is missing */
> - if (!drm_edid_has_cta_extension(edid))
> + if (!drm_edid_has_cta_extension(drm_edid))
> return 0;
>
> /*
> @@ -4666,14 +4666,14 @@ static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector,
> hdmi->y420_cmdb_map = map;
> }
>
> -static int
> -add_cea_modes(struct drm_connector *connector, const struct edid *edid)
> +static int add_cea_modes(struct drm_connector *connector,
> + const struct drm_edid *drm_edid)
> {
> const struct cea_db *db;
> struct cea_db_iter iter;
> int modes = 0;
>
> - cea_db_iter_edid_begin(edid, &iter);
> + cea_db_iter_edid_begin(drm_edid->edid, &iter);
> cea_db_iter_for_each(db, &iter) {
> const u8 *hdmi = NULL, *video = NULL;
> u8 hdmi_len = 0, video_len = 0;
> @@ -5824,13 +5824,13 @@ static int add_displayid_detailed_1_modes(struct drm_connector *connector,
> }
>
> static int add_displayid_detailed_modes(struct drm_connector *connector,
> - const struct edid *edid)
> + const struct drm_edid *drm_edid)
> {
> const struct displayid_block *block;
> struct displayid_iter iter;
> int num_modes = 0;
>
> - 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_TYPE_1_DETAILED_TIMING ||
> block->tag == DATA_BLOCK_2_TYPE_7_DETAILED_TIMING)
> @@ -5844,7 +5844,6 @@ static int add_displayid_detailed_modes(struct drm_connector *connector,
> static int drm_edid_connector_update(struct drm_connector *connector,
> const struct drm_edid *drm_edid)
> {
> - const struct edid *edid;
> int num_modes = 0;
> u32 quirks;
>
> @@ -5854,8 +5853,6 @@ static int drm_edid_connector_update(struct drm_connector *connector,
> return 0;
> }
>
> - edid = drm_edid->edid;
> -
> /*
> * CEA-861-F adds ycbcr capability map block, for HDMI 2.0 sinks.
> * To avoid multiple parsing of same block, lets parse that map
> @@ -5880,15 +5877,15 @@ static int drm_edid_connector_update(struct drm_connector *connector,
> *
> * XXX order for additional mode types in extension blocks?
> */
> - num_modes += add_detailed_modes(connector, edid, quirks);
> - num_modes += add_cvt_modes(connector, edid);
> - num_modes += add_standard_modes(connector, edid);
> - num_modes += add_established_modes(connector, edid);
> - num_modes += add_cea_modes(connector, edid);
> - num_modes += add_alternate_cea_modes(connector, edid);
> - num_modes += add_displayid_detailed_modes(connector, edid);
> - if (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)
> - num_modes += add_inferred_modes(connector, edid);
> + num_modes += add_detailed_modes(connector, drm_edid, quirks);
> + num_modes += add_cvt_modes(connector, drm_edid);
> + num_modes += add_standard_modes(connector, drm_edid);
> + num_modes += add_established_modes(connector, drm_edid);
> + num_modes += add_cea_modes(connector, drm_edid);
> + num_modes += add_alternate_cea_modes(connector, drm_edid);
> + num_modes += add_displayid_detailed_modes(connector, drm_edid);
> + if (drm_edid->edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)
> + num_modes += add_inferred_modes(connector, drm_edid);
>
> if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
> edid_fixup_preferred(connector, quirks);
next prev parent reply other threads:[~2022-05-10 6:45 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 12:02 [Intel-gfx] [PATCH v2 00/25] drm/edid: introduce struct drm_edid Jani Nikula
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 01/25] drm/edid: use else-if in CTA extension parsing Jani Nikula
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 02/25] drm/edid: convert drm_for_each_detailed_block() to edid iter Jani Nikula
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 03/25] drm/edid: add struct drm_edid container Jani Nikula
2022-05-10 6:26 ` Nautiyal, Ankit K
2022-05-16 8:11 ` Jani Nikula
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 04/25] drm/edid: start propagating drm_edid to lower levels Jani Nikula
2022-05-10 6:23 ` Nautiyal, Ankit K
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-11 9:21 ` [Intel-gfx] [PATCH v3] " Jani Nikula
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 06/25] drm/edid: propagate drm_edid to drm_edid_to_eld() Jani Nikula
2022-05-10 6:31 ` Nautiyal, Ankit K
2022-05-11 9:23 ` [Intel-gfx] [PATCH v3] " Jani Nikula
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 07/25] drm/edid: convert drm_edid_connector_update() to drm_edid fully Jani Nikula
2022-05-10 6:45 ` Nautiyal, Ankit K [this message]
2022-05-11 9:26 ` [Intel-gfx] [PATCH v3] " Jani Nikula
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 08/25] drm/edid: convert struct detailed_mode_closure to drm_edid Jani Nikula
2022-05-10 7:14 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 09/25] drm/edid: convert drm_mode_detailed() " Jani Nikula
2022-05-10 8:57 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 10/25] drm/edid: convert drm_dmt_modes_for_range() " Jani Nikula
2022-05-10 9:04 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 11/25] drm/edid: convert drm_gtf_modes_for_range() " Jani Nikula
2022-05-10 9:05 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 12/25] drm/edid: convert drm_cvt_modes_for_range() " Jani Nikula
2022-05-10 9:11 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 13/25] drm/edid: convert drm_mode_std() and children " Jani Nikula
2022-05-10 9:18 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 14/25] drm/edid: convert mode_in_range() and drm_monitor_supports_rb() " Jani Nikula
2022-05-10 9:22 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 15/25] drm/edid: convert get_monitor_name() " Jani Nikula
2022-05-10 9:29 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 16/25] drm/edid: convert drm_for_each_detailed_block() " Jani Nikula
2022-05-10 9:36 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 17/25] drm/edid: add drm_edid helper for drm_edid_to_sad() Jani Nikula
2022-05-10 9:55 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 18/25] drm/edid: add drm_edid helper for drm_edid_to_speaker_allocation() Jani Nikula
2022-05-10 10:08 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 19/25] drm/edid: add drm_edid helper for drm_detect_hdmi_monitor() Jani Nikula
2022-05-10 10:15 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 20/25] drm/edid: add drm_edid helper for drm_detect_monitor_audio() Jani Nikula
2022-05-10 10:17 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 21/25] drm/edid: convert cea_db_iter_edid_begin() to drm_edid Jani Nikula
2022-05-10 10:21 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 22/25] drm/edid: convert drm_edid_iter_begin() " Jani Nikula
2022-05-10 10:25 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 23/25] drm/edid: add drm_edid helper for drm_update_tile_info() Jani Nikula
2022-05-10 10:28 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 24/25] drm/displayid: convert to drm_edid Jani Nikula
2022-05-10 12:04 ` Nautiyal, Ankit K
2022-05-09 12:03 ` [Intel-gfx] [PATCH v2 25/25] drm/edid: convert version_greater() " Jani Nikula
2022-05-10 12:07 ` 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=50b247cc-ff03-bf64-ea56-bf043c9e9b15@intel.com \
--to=ankit.k.nautiyal@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox