drm/nouveau/kms: avoid adding scaler-only modes the same as the panel's native mode

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index d13f50db765d8f4a2c05c841828175c10e1c7ebb..660d0e77ef34f8c3c07de783dd4783a6086d3f1f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -672,7 +672,9 @@ nouveau_connector_scaler_modes_add(struct drm_connector *connector)
 
        while (mode->hdisplay) {
                if (mode->hdisplay <= native->hdisplay &&
-                   mode->vdisplay <= native->vdisplay) {
+                   mode->vdisplay <= native->vdisplay &&
+                   (mode->hdisplay != native->hdisplay ||
+                    mode->vdisplay != native->vdisplay)) {
                        m = drm_cvt_mode(dev, mode->hdisplay, mode->vdisplay,
                                         drm_mode_vrefresh(native), false,
                                         false, false);