summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2014-12-22 17:28:35 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-01-10 23:57:07 +1000
commit792992507fd9e6c4c52e16f02ecd6a966456a857 (patch)
tree1befe39cc8c21add60231198671e72ab5cb65206
parent1e7fb9bd5ba115ff93e580b2afafddfddfdec813 (diff)
downloadnouveau-792992507fd9e6c4c52e16f02ecd6a966456a857.tar.gz
kms: avoid adding scaler-only modes the same as the panel's native mode
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drm/nouveau_connector.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drm/nouveau_connector.c b/drm/nouveau_connector.c
index d13f50db7..660d0e77e 100644
--- a/drm/nouveau_connector.c
+++ b/drm/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);