* Implemented intel_propose_display_mode() using the new helper functions.

* In intel_set_display_mode(), we now use the sanitize_display_mode() method
  directly in order to see if the mode is valid (it's valid when it doesn't
  need to be altered anymore).
* This should be the final nail on ticket #7419.
* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42742 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/accelerants/intel_extreme/mode.cpp

@@ -21,6 +21,7 @@
 #include <create_display_modes.h>
 #include <ddc.h>
 #include <edid.h>
+#include <validate_display_mode.h>
 
 
 #define TRACE_MODE
@@ -574,6 +575,27 @@ get_color_space_format(const display_mode &mode, uint32 &colorMode,
 }
 
 
+static bool
+sanitize_display_mode(display_mode& mode)
+{
+	// TODO: verify constraints - these are more or less taken from the
+	// radeon driver!
+	const display_constraints constraints = {
+		// resolution
+		320, 8192, 200, 4096,
+		// pixel clock
+		gInfo->shared_info->pll_info.min_frequency,
+		gInfo->shared_info->pll_info.max_frequency,
+		// horizontal
+		{8, 16, 8160, 24, 504, 15, 8192},
+		{1, 1, 4092, 2, 63, 1, 4096}
+	};
+
+	return sanitize_display_mode(mode, constraints,
+		gInfo->has_edid ? &gInfo->edid_info : NULL);
+}
+
+
 //	#pragma mark -
 
 
@@ -601,22 +623,10 @@ intel_propose_display_mode(display_mode *target, const display_mode *low,
 {
 	TRACE(("intel_propose_display_mode()\n"));
 
-	// just search for the specified mode in the list
+	sanitize_display_mode(*target);
 
-	for (uint32 i = 0; i < gInfo->shared_info->mode_count; i++) {
+	return is_display_mode_within_bounds(*target, *low, *high)
-		display_mode *mode = &gInfo->mode_list[i];
+		? B_OK : B_BAD_VALUE;
-
-		// TODO: improve this, ie. adapt pixel clock to allowed values!!!
-
-		if (target->virtual_width != mode->virtual_width
-			|| target->virtual_height != mode->virtual_height
-			|| target->space != mode->space)
-			continue;
-
-		*target = *mode;
-		return B_OK;
-	}
-	return B_BAD_VALUE;
 }
 
 
@@ -634,8 +644,10 @@ intel_set_display_mode(display_mode *mode)
 	// TODO: it may be acceptable to continue when using panel fitting or
 	// centering, since the data from propose_display_mode will not actually be
 	// used as is in this case.
-	if (intel_propose_display_mode(&target, mode, mode))
+	if (sanitize_display_mode(target)) {
+		TRACE(("intel_extreme: invalid mode set!"));
 		return B_BAD_VALUE;
+	}
 
 	uint32 colorMode, bytesPerRow, bitsPerPixel;
 	get_color_space_format(target, colorMode, bytesPerRow, bitsPerPixel);