From: Ben Skeggs Date: Mon, 22 Dec 2014 07:28:35 +0000 (+1000) Subject: drm/nouveau/kms: avoid adding scaler-only modes the same as the panel's native mode X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f0d15402a38654a987e5ebb844d06db4a8f98435;p=deliverable%2Flinux.git drm/nouveau/kms: avoid adding scaler-only modes the same as the panel's native mode Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index d13f50db765d..660d0e77ef34 100644 --- 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);