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 13/25] drm/edid: convert drm_mode_std() and children to drm_edid
Date: Tue, 10 May 2022 14:48:48 +0530 [thread overview]
Message-ID: <1aa8e962-d963-5687-2939-a61c73e67a40@intel.com> (raw)
In-Reply-To: <9fb970d108a8bb666b87a590c74f480e0fd81cc8.1652097712.git.jani.nikula@intel.com>
LGTM.
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Regards,
Ankit
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 | 52 ++++++++++++++++++++------------------
> 1 file changed, 27 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 51d918c66a26..bea8f33c58ad 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -2673,11 +2673,11 @@ find_gtf2(const struct detailed_timing *descriptor, void *data)
>
> /* Secondary GTF curve kicks in above some break frequency */
> static int
> -drm_gtf2_hbreak(const struct edid *edid)
> +drm_gtf2_hbreak(const struct drm_edid *drm_edid)
> {
> const struct detailed_timing *descriptor = NULL;
>
> - drm_for_each_detailed_block(edid, find_gtf2, &descriptor);
> + drm_for_each_detailed_block(drm_edid->edid, find_gtf2, &descriptor);
>
> BUILD_BUG_ON(offsetof(typeof(*descriptor), data.other_data.data.range.formula.gtf2.hfreq_start_khz) != 12);
>
> @@ -2685,11 +2685,11 @@ drm_gtf2_hbreak(const struct edid *edid)
> }
>
> static int
> -drm_gtf2_2c(const struct edid *edid)
> +drm_gtf2_2c(const struct drm_edid *drm_edid)
> {
> const struct detailed_timing *descriptor = NULL;
>
> - drm_for_each_detailed_block(edid, find_gtf2, &descriptor);
> + drm_for_each_detailed_block(drm_edid->edid, find_gtf2, &descriptor);
>
> BUILD_BUG_ON(offsetof(typeof(*descriptor), data.other_data.data.range.formula.gtf2.c) != 13);
>
> @@ -2697,11 +2697,11 @@ drm_gtf2_2c(const struct edid *edid)
> }
>
> static int
> -drm_gtf2_m(const struct edid *edid)
> +drm_gtf2_m(const struct drm_edid *drm_edid)
> {
> const struct detailed_timing *descriptor = NULL;
>
> - drm_for_each_detailed_block(edid, find_gtf2, &descriptor);
> + drm_for_each_detailed_block(drm_edid->edid, find_gtf2, &descriptor);
>
> BUILD_BUG_ON(offsetof(typeof(*descriptor), data.other_data.data.range.formula.gtf2.m) != 14);
>
> @@ -2709,11 +2709,11 @@ drm_gtf2_m(const struct edid *edid)
> }
>
> static int
> -drm_gtf2_k(const struct edid *edid)
> +drm_gtf2_k(const struct drm_edid *drm_edid)
> {
> const struct detailed_timing *descriptor = NULL;
>
> - drm_for_each_detailed_block(edid, find_gtf2, &descriptor);
> + drm_for_each_detailed_block(drm_edid->edid, find_gtf2, &descriptor);
>
> BUILD_BUG_ON(offsetof(typeof(*descriptor), data.other_data.data.range.formula.gtf2.k) != 16);
>
> @@ -2721,11 +2721,11 @@ drm_gtf2_k(const struct edid *edid)
> }
>
> static int
> -drm_gtf2_2j(const struct edid *edid)
> +drm_gtf2_2j(const struct drm_edid *drm_edid)
> {
> const struct detailed_timing *descriptor = NULL;
>
> - drm_for_each_detailed_block(edid, find_gtf2, &descriptor);
> + drm_for_each_detailed_block(drm_edid->edid, find_gtf2, &descriptor);
>
> BUILD_BUG_ON(offsetof(typeof(*descriptor), data.other_data.data.range.formula.gtf2.j) != 17);
>
> @@ -2733,12 +2733,14 @@ drm_gtf2_2j(const struct edid *edid)
> }
>
> /* Get standard timing level (CVT/GTF/DMT). */
> -static int standard_timing_level(const struct edid *edid)
> +static int standard_timing_level(const struct drm_edid *drm_edid)
> {
> + const struct edid *edid = drm_edid->edid;
> +
> if (edid->revision >= 2) {
> if (edid->revision >= 4 && (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF))
> return LEVEL_CVT;
> - if (drm_gtf2_hbreak(edid))
> + if (drm_gtf2_hbreak(drm_edid))
> return LEVEL_GTF2;
> if (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)
> return LEVEL_GTF;
> @@ -2770,9 +2772,9 @@ static int drm_mode_hsync(const struct drm_display_mode *mode)
> * Take the standard timing params (in this case width, aspect, and refresh)
> * and convert them into a real mode using CVT/GTF/DMT.
> */
> -static struct drm_display_mode *
> -drm_mode_std(struct drm_connector *connector, const struct edid *edid,
> - const struct std_timing *t)
> +static struct drm_display_mode *drm_mode_std(struct drm_connector *connector,
> + const struct drm_edid *drm_edid,
> + const struct std_timing *t)
> {
> struct drm_device *dev = connector->dev;
> struct drm_display_mode *m, *mode = NULL;
> @@ -2782,7 +2784,7 @@ drm_mode_std(struct drm_connector *connector, const struct edid *edid,
> >> EDID_TIMING_ASPECT_SHIFT;
> unsigned vfreq = (t->vfreq_aspect & EDID_TIMING_VFREQ_MASK)
> >> EDID_TIMING_VFREQ_SHIFT;
> - int timing_level = standard_timing_level(edid);
> + int timing_level = standard_timing_level(drm_edid);
>
> if (bad_std_timing(t->hsize, t->vfreq_aspect))
> return NULL;
> @@ -2793,7 +2795,7 @@ drm_mode_std(struct drm_connector *connector, const struct edid *edid,
> vrefresh_rate = vfreq + 60;
> /* the vdisplay is calculated based on the aspect ratio */
> if (aspect_ratio == 0) {
> - if (edid->revision < 3)
> + if (drm_edid->edid->revision < 3)
> vsize = hsize;
> else
> vsize = (hsize * 10) / 16;
> @@ -2836,7 +2838,7 @@ drm_mode_std(struct drm_connector *connector, const struct edid *edid,
> }
>
> /* check whether it can be found in default mode table */
> - if (drm_monitor_supports_rb(edid)) {
> + if (drm_monitor_supports_rb(drm_edid->edid)) {
> mode = drm_mode_find_dmt(dev, hsize, vsize, vrefresh_rate,
> true);
> if (mode)
> @@ -2862,14 +2864,14 @@ drm_mode_std(struct drm_connector *connector, const struct edid *edid,
> mode = drm_gtf_mode(dev, hsize, vsize, vrefresh_rate, 0, 0);
> if (!mode)
> return NULL;
> - if (drm_mode_hsync(mode) > drm_gtf2_hbreak(edid)) {
> + if (drm_mode_hsync(mode) > drm_gtf2_hbreak(drm_edid)) {
> drm_mode_destroy(dev, mode);
> mode = drm_gtf_mode_complex(dev, hsize, vsize,
> vrefresh_rate, 0, 0,
> - drm_gtf2_m(edid),
> - drm_gtf2_2c(edid),
> - drm_gtf2_k(edid),
> - drm_gtf2_2j(edid));
> + drm_gtf2_m(drm_edid),
> + drm_gtf2_2c(drm_edid),
> + drm_gtf2_k(drm_edid),
> + drm_gtf2_2j(drm_edid));
> }
> break;
> case LEVEL_CVT:
> @@ -3360,7 +3362,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, closure->drm_edid->edid, std);
> + newmode = drm_mode_std(connector, closure->drm_edid, std);
> if (newmode) {
> drm_mode_probed_add(connector, newmode);
> closure->modes++;
> @@ -3385,7 +3387,7 @@ static int add_standard_modes(struct drm_connector *connector,
> for (i = 0; i < EDID_STD_TIMINGS; i++) {
> struct drm_display_mode *newmode;
>
> - newmode = drm_mode_std(connector, drm_edid->edid,
> + newmode = drm_mode_std(connector, drm_edid,
> &drm_edid->edid->standard_timings[i]);
> if (newmode) {
> drm_mode_probed_add(connector, newmode);
next prev parent reply other threads:[~2022-05-10 9:19 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
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 [this message]
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=1aa8e962-d963-5687-2939-a61c73e67a40@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