Ticket #7655: patch_nvidia_accel.diff

ProposeDisplayMode.c

@@ -193 +193 @@
        note:
        allowing 2 pixels more for horizontal display for the 1366 mode, since multiples of 8
        are required for the CRTCs horizontal timing programming) */
-    if (si->ps.crtc1_screen.have_native_edid) {
-        if ((target->timing.h_display - 2) > si->ps.crtc1_screen.timing.h_display
-            || target->timing.v_display > si->ps.crtc1_screen.timing.v_display) {
-            LOG(4, ("PROPOSEMODE: screen at crtc1 can't display requested resolution, aborted.\n"));
-            return B_ERROR;
-        }
-    }
-    if (si->ps.crtc2_screen.have_native_edid) {
-        if ((target->timing.h_display - 2) > si->ps.crtc2_screen.timing.h_display
-            || target->timing.v_display > si->ps.crtc2_screen.timing.v_display) {
-            LOG(4, ("PROPOSEMODE: screen at crtc2 can't display requested resolution, aborted.\n"));
-            return B_ERROR;
-        }
-    }
+// Do NOT second-guess the proposed target->timing.{h,v}_display values
+// based on our crtc1_screen.timing value, since the latter is based on our
+// one-section interpretation of the EDID data and thus is not as complete
+// as the value calculated by the caller, which takes all 3 EDID sections
+// into account.
+// Indeed, in some cases (certain display monitors) we end up breaking the hard work
+// done by Axel in create_propose_mode.cpp ;-) by cancelling out the extra digging
+// for modes that he has implemented there...
+//  if (si->ps.crtc1_screen.have_native_edid) {
+//      if ((target->timing.h_display - 2) > si->ps.crtc1_screen.timing.h_display
+//          || target->timing.v_display > si->ps.crtc1_screen.timing.v_display) {
+//          LOG(4, ("PROPOSEMODE: screen at crtc1 can't display requested resolution, aborted.\n"));
+//          return B_ERROR;
+//      }
+//  }
+//  if (si->ps.crtc2_screen.have_native_edid) {
+//      if ((target->timing.h_display - 2) > si->ps.crtc2_screen.timing.h_display
+//          || target->timing.v_display > si->ps.crtc2_screen.timing.v_display) {
+//          LOG(4, ("PROPOSEMODE: screen at crtc2 can't display requested resolution, aborted.\n"));
+//          return B_ERROR;
+//      }
+//  }
 
     /* validate display vs. virtual */
     if (target->timing.h_display > target->virtual_width || want_same_width)
         target->virtual_width = target->timing.h_display;
     if (target->timing.v_display > target->virtual_height || want_same_height)