]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/mgag200: Reject non-character-cell-aligned mode widths
authorAdam Jackson <ajax@redhat.com>
Mon, 15 Jun 2015 20:16:15 +0000 (16:16 -0400)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 30 Jun 2015 16:15:27 +0000 (17:15 +0100)
commit 25161084b1c1b0c29948f6f77266a35f302196b7 upstream.

Turns out 1366x768 does not in fact work on this hardware.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/gpu/drm/mgag200/mgag200_mode.c

index a034ed408252eb08e57e166ba6afed4a50931e31..222b0ff2e3fdf36811a29392c572055138e27805 100644 (file)
@@ -1529,6 +1529,11 @@ static int mga_vga_mode_valid(struct drm_connector *connector,
                return MODE_BANDWIDTH;
        }
 
+       if ((mode->hdisplay % 8) != 0 || (mode->hsync_start % 8) != 0 ||
+           (mode->hsync_end % 8) != 0 || (mode->htotal % 8) != 0) {
+               return MODE_H_ILLEGAL;
+       }
+
        if (mode->crtc_hdisplay > 2048 || mode->crtc_hsync_start > 4096 ||
            mode->crtc_hsync_end > 4096 || mode->crtc_htotal > 4096 ||
            mode->crtc_vdisplay > 2048 || mode->crtc_vsync_start > 4096 ||