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

For EDID 1.4 the first detailed timing is always preferred,
for older EDIDs there was a feature flag to indicate the same.
While correct, the code setting that up is rather confusing.
Restate it in a slightly more straightforward manner.

Reviewed-by: Jani Nikula <jani.nik...@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/drm_edid.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 60e68d27371d..1856560463a3 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3952,13 +3952,14 @@ static int add_detailed_modes(struct drm_connector 
*connector,
        struct detailed_mode_closure closure = {
                .connector = connector,
                .drm_edid = drm_edid,
-               .preferred = true,
                .quirks = quirks,
        };
 
-       if (closure.preferred && !version_greater(drm_edid, 1, 3))
+       if (version_greater(drm_edid, 1, 3))
+               closure.preferred = true; /* first detailed timing is always 
preferred */
+       else
                closure.preferred =
-                   (drm_edid->edid->features & 
DRM_EDID_FEATURE_PREFERRED_TIMING);
+                       drm_edid->edid->features & 
DRM_EDID_FEATURE_PREFERRED_TIMING;
 
        drm_for_each_detailed_block(drm_edid, do_detailed_mode, &closure);
 
-- 
2.35.1

Reply via email to