1 files changed, 16 insertions, 10 deletions

diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 11cc4deca55b..5125aa91e66f 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -739,6 +739,8 @@ EXPORT_SYMBOL(drm_mode_vrefresh);
  * - The CRTC_STEREO_DOUBLE flag can be used to compute the timings for
  *   buffers containing two eyes (only adjust the timings when needed, eg. for
  *   "frame packing" or "side by side full").
+ * - The CRTC_NO_DBLSCAN and CRTC_NO_VSCAN flags request that adjustment *not*
+ *   be performed for doublescan and vscan > 1 modes respectively.
  */
 void drm_mode_set_crtcinfo(struct drm_display_mode *p, int adjust_flags)
 {
@@ -765,18 +767,22 @@ void drm_mode_set_crtcinfo(struct drm_display_mode *p, int adjust_flags)
                 }
         }
 
-        if (p->flags & DRM_MODE_FLAG_DBLSCAN) {
-                p->crtc_vdisplay *= 2;
-                p->crtc_vsync_start *= 2;
-                p->crtc_vsync_end *= 2;
-                p->crtc_vtotal *= 2;
+        if (!(adjust_flags & CRTC_NO_DBLSCAN)) {
+                if (p->flags & DRM_MODE_FLAG_DBLSCAN) {
+                        p->crtc_vdisplay *= 2;
+                        p->crtc_vsync_start *= 2;
+                        p->crtc_vsync_end *= 2;
+                        p->crtc_vtotal *= 2;
+                }
         }
 
-        if (p->vscan > 1) {
-                p->crtc_vdisplay *= p->vscan;
-                p->crtc_vsync_start *= p->vscan;
-                p->crtc_vsync_end *= p->vscan;
-                p->crtc_vtotal *= p->vscan;
+        if (!(adjust_flags & CRTC_NO_VSCAN)) {
+                if (p->vscan > 1) {
+                        p->crtc_vdisplay *= p->vscan;
+                        p->crtc_vsync_start *= p->vscan;
+                        p->crtc_vsync_end *= p->vscan;
+                        p->crtc_vtotal *= p->vscan;
+                }
         }
 
         if (adjust_flags & CRTC_STEREO_DOUBLE) {