[PATCH] drm/edid: Add CEA modes before inferred modes

[PATCH] drm/edid: Add CEA modes before inferred modes

[ville.syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Currently we're adding CEA modes after the inferred modes, which means
we might get multiple modes that are very close to each other, but
slightly different, which seems a bit silly. That's because duplicate
mode check that occurs when adding inferred modes would not consider
CEA modes as potential duplicates. Reverse the order so that CEA
modes get added before inferred modes, and are thus considered potential
duplicates.

Or as ajax put it on irc:
"< ajax> the point of the "pick a timing formula" heuristic was to
generate something the sink could _likely_ sink.  if it tells us
timings it can sink explicitly then second-guessing seems dumb."

Cc: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/drm_edid.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index e7a1400..314a364 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3744,10 +3744,10 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
 	num_modes += add_cvt_modes(connector, edid);
 	num_modes += add_standard_modes(connector, edid);
 	num_modes += add_established_modes(connector, edid);
-	if (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)
-		num_modes += add_inferred_modes(connector, edid);
 	num_modes += add_cea_modes(connector, edid);
 	num_modes += add_alternate_cea_modes(connector, edid);
+	if (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)
+		num_modes += add_inferred_modes(connector, edid);
 
 	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
 		edid_fixup_preferred(connector, quirks);
-- 
2.0.5

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/edid: Add CEA modes before inferred modes

[Daniel Vetter]

On Fri, May 08, 2015 at 05:45:07PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Currently we're adding CEA modes after the inferred modes, which means
> we might get multiple modes that are very close to each other, but
> slightly different, which seems a bit silly. That's because duplicate
> mode check that occurs when adding inferred modes would not consider
> CEA modes as potential duplicates. Reverse the order so that CEA
> modes get added before inferred modes, and are thus considered potential
> duplicates.
> 
> Or as ajax put it on irc:
> "< ajax> the point of the "pick a timing formula" heuristic was to
> generate something the sink could _likely_ sink.  if it tells us
> timings it can sink explicitly then second-guessing seems dumb."
> 
> Cc: Adam Jackson <ajax@redhat.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Applied to topic/drm-misc, thanks.
-Daniel

> ---
>  drivers/gpu/drm/drm_edid.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index e7a1400..314a364 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -3744,10 +3744,10 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
>  	num_modes += add_cvt_modes(connector, edid);
>  	num_modes += add_standard_modes(connector, edid);
>  	num_modes += add_established_modes(connector, edid);
> -	if (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)
> -		num_modes += add_inferred_modes(connector, edid);
>  	num_modes += add_cea_modes(connector, edid);
>  	num_modes += add_alternate_cea_modes(connector, edid);
> +	if (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF)
> +		num_modes += add_inferred_modes(connector, edid);
>  
>  	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
>  		edid_fixup_preferred(connector, quirks);
> -- 
> 2.0.5
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/edid: Add CEA modes before inferred modes

[Adam Jackson]

On Fri, 2015-05-08 at 17:45 +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Currently we're adding CEA modes after the inferred modes, which 
> means
> we might get multiple modes that are very close to each other, but
> slightly different, which seems a bit silly. That's because duplicate
> mode check that occurs when adding inferred modes would not consider
> CEA modes as potential duplicates. Reverse the order so that CEA
> modes get added before inferred modes, and are thus considered 
> potential
> duplicates.
> 
> Or as ajax put it on irc:
> "< ajax> the point of the "pick a timing formula" heuristic was to
> generate something the sink could _likely_ sink.  if it tells us
> timings it can sink explicitly then second-guessing seems dumb."
> 
> Cc: Adam Jackson <ajax@redhat.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Adam Jackson <ajax@redhat.com>

- ajax
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel