| Message ID | c2c251a504933debacf78e1382ae665ae490ed40.1652097712.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/edid: introduce struct drm_edid | expand |
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 | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index 037102a4d0b5..51d918c66a26 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -3185,14 +3185,14 @@ static int drm_gtf_modes_for_range(struct drm_connector *connector, > return modes; > } > > -static int > -drm_cvt_modes_for_range(struct drm_connector *connector, const struct edid *edid, > - const struct detailed_timing *timing) > +static int drm_cvt_modes_for_range(struct drm_connector *connector, > + const struct drm_edid *drm_edid, > + const struct detailed_timing *timing) > { > int i, modes = 0; > struct drm_display_mode *newmode; > struct drm_device *dev = connector->dev; > - bool rb = drm_monitor_supports_rb(edid); > + bool rb = drm_monitor_supports_rb(drm_edid->edid); > > for (i = 0; i < ARRAY_SIZE(extra_modes); i++) { > const struct minimode *m = &extra_modes[i]; > @@ -3202,7 +3202,7 @@ drm_cvt_modes_for_range(struct drm_connector *connector, const struct edid *edid > return modes; > > drm_mode_fixup_1366x768(newmode); > - if (!mode_in_range(newmode, edid, timing) || > + if (!mode_in_range(newmode, drm_edid->edid, timing) || > !valid_inferred_mode(connector, newmode)) { > drm_mode_destroy(dev, newmode); > continue; > @@ -3244,7 +3244,7 @@ do_inferred_modes(const struct detailed_timing *timing, void *c) > break; > > closure->modes += drm_cvt_modes_for_range(closure->connector, > - closure->drm_edid->edid, > + closure->drm_edid, > timing); > break; > case 0x01: /* just the ranges, no formula */
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 037102a4d0b5..51d918c66a26 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3185,14 +3185,14 @@ static int drm_gtf_modes_for_range(struct drm_connector *connector, return modes; } -static int -drm_cvt_modes_for_range(struct drm_connector *connector, const struct edid *edid, - const struct detailed_timing *timing) +static int drm_cvt_modes_for_range(struct drm_connector *connector, + const struct drm_edid *drm_edid, + const struct detailed_timing *timing) { int i, modes = 0; struct drm_display_mode *newmode; struct drm_device *dev = connector->dev; - bool rb = drm_monitor_supports_rb(edid); + bool rb = drm_monitor_supports_rb(drm_edid->edid); for (i = 0; i < ARRAY_SIZE(extra_modes); i++) { const struct minimode *m = &extra_modes[i]; @@ -3202,7 +3202,7 @@ drm_cvt_modes_for_range(struct drm_connector *connector, const struct edid *edid return modes; drm_mode_fixup_1366x768(newmode); - if (!mode_in_range(newmode, edid, timing) || + if (!mode_in_range(newmode, drm_edid->edid, timing) || !valid_inferred_mode(connector, newmode)) { drm_mode_destroy(dev, newmode); continue; @@ -3244,7 +3244,7 @@ do_inferred_modes(const struct detailed_timing *timing, void *c) break; closure->modes += drm_cvt_modes_for_range(closure->connector, - closure->drm_edid->edid, + closure->drm_edid, timing); break; case 0x01: /* just the ranges, no formula */
We'll need to propagate drm_edid everywhere. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/drm_edid.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)