1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 42c57581c53f..778cbb88bddc 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3602,6 +3602,13 @@ static bool intel_crtc_mode_fixup(struct drm_crtc *crtc,
         if (!(adjusted_mode->private_flags & INTEL_MODE_CRTC_TIMINGS_SET))
                 drm_mode_set_crtcinfo(adjusted_mode, 0);
 
+        /* WaPruneModeWithIncorrectHsyncOffset: Cantiga+ cannot handle modes
+         * with a hsync front porch of 0.
+         */
+        if ((INTEL_INFO(dev)->gen > 4 || IS_G4X(dev)) &&
+                adjusted_mode->hsync_start == adjusted_mode->hdisplay)
+                return false;
+
         return true;
 }