Merge drm/drm-next into drm-misc-next

[linux-block.git] / drivers / gpu / drm / drm_edid.c

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 69c68804023ff9a959e482d8c7ac5176f1ab34e1..923c4423151c1eb2c8ce635940898fc01db63825 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3611,7 +3611,8 @@ static bool mode_in_range(const struct drm_display_mode *mode,
        if (!mode_in_vsync_range(mode, edid, t))
                return false;
 
-       if ((max_clock = range_pixel_clock(edid, t)))
+       max_clock = range_pixel_clock(edid, t);
+       if (max_clock)
                if (mode->clock > max_clock)
                        return false;
 
@@ -6990,28 +6991,6 @@ int drm_add_modes_noedid(struct drm_connector *connector,
 }
 EXPORT_SYMBOL(drm_add_modes_noedid);
 
-/**
- * drm_set_preferred_mode - Sets the preferred mode of a connector
- * @connector: connector whose mode list should be processed
- * @hpref: horizontal resolution of preferred mode
- * @vpref: vertical resolution of preferred mode
- *
- * Marks a mode as preferred if it matches the resolution specified by @hpref
- * and @vpref.
- */
-void drm_set_preferred_mode(struct drm_connector *connector,
-                          int hpref, int vpref)
-{
-       struct drm_display_mode *mode;
-
-       list_for_each_entry(mode, &connector->probed_modes, head) {
-               if (mode->hdisplay == hpref &&
-                   mode->vdisplay == vpref)
-                       mode->type |= DRM_MODE_TYPE_PREFERRED;
-       }
-}
-EXPORT_SYMBOL(drm_set_preferred_mode);
-
 static bool is_hdmi2_sink(const struct drm_connector *connector)
 {
        /*