Merge tag 'drm-misc-next-2020-06-19' of git://anongit.freedesktop.org/drm/drm-misc...

[thirdparty/linux.git] / drivers / gpu / drm / nouveau / nouveau_connector.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 1b383ae0248f30ad3af6b2e0372cb3e1b6e413cf..ab2c2b2cab10f55c8706da4ae49441b431374528 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -60,7 +60,6 @@ nouveau_conn_native_mode(struct drm_connector *connector)
        int high_w = 0, high_h = 0, high_v = 0;
 
        list_for_each_entry(mode, &connector->probed_modes, head) {
-               mode->vrefresh = drm_mode_vrefresh(mode);
                if (helper->mode_valid(connector, mode) != MODE_OK ||
                    (mode->flags & DRM_MODE_FLAG_INTERLACE))
                        continue;
@@ -81,12 +80,12 @@ nouveau_conn_native_mode(struct drm_connector *connector)
                        continue;
 
                if (mode->hdisplay == high_w && mode->vdisplay == high_h &&
-                   mode->vrefresh < high_v)
+                   drm_mode_vrefresh(mode) < high_v)
                        continue;
 
                high_w = mode->hdisplay;
                high_h = mode->vdisplay;
-               high_v = mode->vrefresh;
+               high_v = drm_mode_vrefresh(mode);
                largest = mode;
        }