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 08/25] drm/edid: convert struct detailed_mode_closure to drm_edid Date: Fri, 6 May 2022 13:10:15 +0300 [thread overview] Message-ID: <19a9fa8eb9ec6eb84b9d46a164fb490891038f22.1651830938.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1651830938.git.jani.nikula@intel.com> We'll need to propagate drm_edid everywhere. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/drm_edid.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index fdc6ad651d3f..1abdd88ff64b 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -96,7 +96,7 @@ static int oui(u8 first, u8 second, u8 third) struct detailed_mode_closure { struct drm_connector *connector; - const struct edid *edid; + const struct drm_edid *drm_edid; bool preferred; u32 quirks; int modes; @@ -3208,25 +3208,25 @@ do_inferred_modes(const struct detailed_timing *timing, void *c) return; closure->modes += drm_dmt_modes_for_range(closure->connector, - closure->edid, + closure->drm_edid->edid, timing); - if (!version_greater(closure->edid, 1, 1)) + if (!version_greater(closure->drm_edid->edid, 1, 1)) return; /* GTF not defined yet */ switch (range->flags) { case 0x02: /* secondary gtf, XXX could do more */ case 0x00: /* default gtf */ closure->modes += drm_gtf_modes_for_range(closure->connector, - closure->edid, + closure->drm_edid->edid, timing); break; case 0x04: /* cvt, only in 1.4+ */ - if (!version_greater(closure->edid, 1, 3)) + if (!version_greater(closure->drm_edid->edid, 1, 3)) break; closure->modes += drm_cvt_modes_for_range(closure->connector, - closure->edid, + closure->drm_edid->edid, timing); break; case 0x01: /* just the ranges, no formula */ @@ -3240,7 +3240,7 @@ static int add_inferred_modes(struct drm_connector *connector, { struct detailed_mode_closure closure = { .connector = connector, - .edid = drm_edid->edid, + .drm_edid = drm_edid, }; if (version_greater(drm_edid->edid, 1, 0)) @@ -3305,7 +3305,7 @@ static int add_established_modes(struct drm_connector *connector, int i, modes = 0; struct detailed_mode_closure closure = { .connector = connector, - .edid = edid, + .drm_edid = drm_edid, }; for (i = 0; i <= EDID_EST_TIMINGS; i++) { @@ -3333,7 +3333,6 @@ do_standard_modes(const struct detailed_timing *timing, void *c) struct detailed_mode_closure *closure = c; const struct detailed_non_pixel *data = &timing->data.other_data; struct drm_connector *connector = closure->connector; - const struct edid *edid = closure->edid; int i; if (!is_display_descriptor(timing, EDID_DETAIL_STD_MODES)) @@ -3343,7 +3342,7 @@ do_standard_modes(const struct detailed_timing *timing, void *c) const struct std_timing *std = &data->data.timings[i]; struct drm_display_mode *newmode; - newmode = drm_mode_std(connector, edid, std); + newmode = drm_mode_std(connector, closure->drm_edid->edid, std); if (newmode) { drm_mode_probed_add(connector, newmode); closure->modes++; @@ -3362,7 +3361,7 @@ static int add_standard_modes(struct drm_connector *connector, int i, modes = 0; struct detailed_mode_closure closure = { .connector = connector, - .edid = drm_edid->edid, + .drm_edid = drm_edid, }; for (i = 0; i < EDID_STD_TIMINGS; i++) { @@ -3453,7 +3452,7 @@ add_cvt_modes(struct drm_connector *connector, const struct drm_edid *drm_edid) { struct detailed_mode_closure closure = { .connector = connector, - .edid = drm_edid->edid, + .drm_edid = drm_edid, }; if (version_greater(drm_edid->edid, 1, 2)) @@ -3476,7 +3475,7 @@ do_detailed_mode(const struct detailed_timing *timing, void *c) return; newmode = drm_mode_detailed(closure->connector->dev, - closure->edid, timing, + closure->drm_edid->edid, timing, closure->quirks); if (!newmode) return; @@ -3507,7 +3506,7 @@ static int add_detailed_modes(struct drm_connector *connector, { struct detailed_mode_closure closure = { .connector = connector, - .edid = drm_edid->edid, + .drm_edid = drm_edid, .preferred = true, .quirks = quirks, }; -- 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 08/25] drm/edid: convert struct detailed_mode_closure to drm_edid Date: Fri, 6 May 2022 13:10:15 +0300 [thread overview] Message-ID: <19a9fa8eb9ec6eb84b9d46a164fb490891038f22.1651830938.git.jani.nikula@intel.com> (raw) In-Reply-To: <cover.1651830938.git.jani.nikula@intel.com> We'll need to propagate drm_edid everywhere. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/drm_edid.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index fdc6ad651d3f..1abdd88ff64b 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -96,7 +96,7 @@ static int oui(u8 first, u8 second, u8 third) struct detailed_mode_closure { struct drm_connector *connector; - const struct edid *edid; + const struct drm_edid *drm_edid; bool preferred; u32 quirks; int modes; @@ -3208,25 +3208,25 @@ do_inferred_modes(const struct detailed_timing *timing, void *c) return; closure->modes += drm_dmt_modes_for_range(closure->connector, - closure->edid, + closure->drm_edid->edid, timing); - if (!version_greater(closure->edid, 1, 1)) + if (!version_greater(closure->drm_edid->edid, 1, 1)) return; /* GTF not defined yet */ switch (range->flags) { case 0x02: /* secondary gtf, XXX could do more */ case 0x00: /* default gtf */ closure->modes += drm_gtf_modes_for_range(closure->connector, - closure->edid, + closure->drm_edid->edid, timing); break; case 0x04: /* cvt, only in 1.4+ */ - if (!version_greater(closure->edid, 1, 3)) + if (!version_greater(closure->drm_edid->edid, 1, 3)) break; closure->modes += drm_cvt_modes_for_range(closure->connector, - closure->edid, + closure->drm_edid->edid, timing); break; case 0x01: /* just the ranges, no formula */ @@ -3240,7 +3240,7 @@ static int add_inferred_modes(struct drm_connector *connector, { struct detailed_mode_closure closure = { .connector = connector, - .edid = drm_edid->edid, + .drm_edid = drm_edid, }; if (version_greater(drm_edid->edid, 1, 0)) @@ -3305,7 +3305,7 @@ static int add_established_modes(struct drm_connector *connector, int i, modes = 0; struct detailed_mode_closure closure = { .connector = connector, - .edid = edid, + .drm_edid = drm_edid, }; for (i = 0; i <= EDID_EST_TIMINGS; i++) { @@ -3333,7 +3333,6 @@ do_standard_modes(const struct detailed_timing *timing, void *c) struct detailed_mode_closure *closure = c; const struct detailed_non_pixel *data = &timing->data.other_data; struct drm_connector *connector = closure->connector; - const struct edid *edid = closure->edid; int i; if (!is_display_descriptor(timing, EDID_DETAIL_STD_MODES)) @@ -3343,7 +3342,7 @@ do_standard_modes(const struct detailed_timing *timing, void *c) const struct std_timing *std = &data->data.timings[i]; struct drm_display_mode *newmode; - newmode = drm_mode_std(connector, edid, std); + newmode = drm_mode_std(connector, closure->drm_edid->edid, std); if (newmode) { drm_mode_probed_add(connector, newmode); closure->modes++; @@ -3362,7 +3361,7 @@ static int add_standard_modes(struct drm_connector *connector, int i, modes = 0; struct detailed_mode_closure closure = { .connector = connector, - .edid = drm_edid->edid, + .drm_edid = drm_edid, }; for (i = 0; i < EDID_STD_TIMINGS; i++) { @@ -3453,7 +3452,7 @@ add_cvt_modes(struct drm_connector *connector, const struct drm_edid *drm_edid) { struct detailed_mode_closure closure = { .connector = connector, - .edid = drm_edid->edid, + .drm_edid = drm_edid, }; if (version_greater(drm_edid->edid, 1, 2)) @@ -3476,7 +3475,7 @@ do_detailed_mode(const struct detailed_timing *timing, void *c) return; newmode = drm_mode_detailed(closure->connector->dev, - closure->edid, timing, + closure->drm_edid->edid, timing, closure->quirks); if (!newmode) return; @@ -3507,7 +3506,7 @@ static int add_detailed_modes(struct drm_connector *connector, { struct detailed_mode_closure closure = { .connector = connector, - .edid = drm_edid->edid, + .drm_edid = drm_edid, .preferred = true, .quirks = quirks, }; -- 2.30.2
next prev parent reply other threads:[~2022-05-06 10:11 UTC|newest] Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-06 10:10 [PATCH 00/25] drm/edid: introduce struct drm_edid Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 01/25] drm/edid: use else-if in CTA extension parsing Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 17:47 ` Ville Syrjälä 2022-05-06 17:47 ` [Intel-gfx] " Ville Syrjälä 2022-05-06 10:10 ` [PATCH 02/25] drm/edid: convert drm_for_each_detailed_block() to edid iter Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 17:50 ` Ville Syrjälä 2022-05-06 17:50 ` [Intel-gfx] " Ville Syrjälä 2022-05-06 10:10 ` [PATCH 03/25] drm/edid: add struct drm_edid container Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-10 6:10 ` Nautiyal, Ankit K 2022-05-10 6:10 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-06 10:10 ` [PATCH 04/25] drm/edid: start propagating drm_edid to lower levels Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 05/25] drm/edid: keep propagating drm_edid to display info Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:16 ` Jani Nikula 2022-05-06 10:16 ` [Intel-gfx] " Jani Nikula 2022-05-10 6:08 ` Nautiyal, Ankit K 2022-05-10 6:08 ` [Intel-gfx] " Nautiyal, Ankit K 2022-05-06 10:10 ` [PATCH 06/25] drm/edid: propagate drm_edid to drm_edid_to_eld() Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 07/25] drm/edid: convert drm_edid_connector_update() to drm_edid fully Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` Jani Nikula [this message] 2022-05-06 10:10 ` [Intel-gfx] [PATCH 08/25] drm/edid: convert struct detailed_mode_closure to drm_edid Jani Nikula 2022-05-06 10:10 ` [PATCH 09/25] drm/edid: convert drm_mode_detailed() " Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 10/25] drm/edid: convert drm_dmt_modes_for_range() " Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 11/25] drm/edid: convert drm_gtf_modes_for_range() " Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 12/25] drm/edid: convert drm_cvt_modes_for_range() " Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 13/25] drm/edid: convert drm_mode_std() and children " Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 14/25] drm/edid: convert mode_in_range() and drm_monitor_supports_rb() " Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 15/25] drm/edid: convert get_monitor_name() " Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 16/25] drm/edid: convert drm_for_each_detailed_block() " Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 17/25] drm/edid: add drm_edid helper for drm_edid_to_sad() Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 18:05 ` Ville Syrjälä 2022-05-06 18:05 ` [Intel-gfx] " Ville Syrjälä 2022-05-07 10:21 ` Jani Nikula 2022-05-07 10:21 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 18/25] drm/edid: add drm_edid helper for drm_edid_to_speaker_allocation() Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 19/25] drm/edid: add drm_edid helper for drm_detect_hdmi_monitor() Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 20/25] drm/edid: add drm_edid helper for drm_detect_monitor_audio() Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 21/25] drm/edid: convert cea_db_iter_edid_begin() to drm_edid Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 22/25] drm/edid: convert drm_edid_iter_begin() " Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 23/25] drm/edid: add drm_edid helper for drm_update_tile_info() Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 24/25] drm/displayid: convert to drm_edid Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 10:10 ` [PATCH 25/25] drm/edid: convert version_greater() " Jani Nikula 2022-05-06 10:10 ` [Intel-gfx] " Jani Nikula 2022-05-06 11:12 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/edid: introduce struct drm_edid Patchwork 2022-05-06 11:12 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-05-06 11:42 ` amdgpu sparse warnings (was: Re: ✗ Fi.CI.SPARSE: warning for drm/edid: introduce struct drm_edid) Jani Nikula 2022-05-06 11:42 ` Jani Nikula 2022-05-06 11:42 ` [Intel-gfx] " Jani Nikula 2022-05-06 14:15 ` Deucher, Alexander 2022-05-06 14:15 ` Deucher, Alexander 2022-05-06 14:15 ` [Intel-gfx] " Deucher, Alexander 2022-05-06 11:38 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/edid: introduce struct drm_edid Patchwork 2022-05-06 12:23 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/edid: introduce struct drm_edid (rev2) Patchwork 2022-05-06 12:23 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-05-06 12:47 ` [Intel-gfx] ✗ Fi.CI.BAT: 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=19a9fa8eb9ec6eb84b9d46a164fb490891038f22.1651830938.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.