Changeset 24609

Timestamp:

03/27/08 08:48:39 (2 months ago)

Author:

axeld

Message:

* Rearranged EDID mode find process: in a first pass, we only accept hi- or
  true color resolutions, the second pass that also takes those into account
  will only be run if no mode could be found before.
* I hope this will improve Urias boot screen experience.

Files:

• haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp (modified) (5 diffs)

haiku/trunk/src/system/boot/platform/bios_ia32/video.cpp

@@ -1 +1 @@
-/*
-7
+8
- * Distributed under the terms of the MIT License.
- */
@@ -74 +74 @@
-{
-        video_mode *mode = NULL;
-
+
+
-                int compare = compare_video_modes(videoMode, mode);
-                if (compare == 0) {
@@ -89 +90 @@
-
-
-, prefers 16 bit modes
+
-static video_mode *
-
+, bool allowPalette
-{
-        video_mode *found = NULL;
-        video_mode *mode = NULL;
-
-
+
+
+
+
-                        if (found == NULL || found->bits_per_pixel < mode->bits_per_pixel)
-                                found = mode;
@@ -110 +113 @@
-{
-        video_mode *mode = NULL;
-
+
+
-                if (mode->width == width
-                        && mode->height == height
-                        && mode->bits_per_pixel == depth) {
-                        return mode;
+                }
+        }
+
+        return NULL;
+}
+
+
+static video_mode *
+find_edid_mode(edid1_info &info, bool allowPalette)
+{
+        video_mode *mode = NULL;
+
+        // try detailed timing first
+        for (int32 i = 0; i < EDID1_NUM_DETAILED_MONITOR_DESC; i++) {
+                edid1_detailed_monitor &monitor = info.detailed_monitor[i];
+
+                if (monitor.monitor_desc_type == EDID1_IS_DETAILED_TIMING) {
+                        mode = find_video_mode(monitor.data.detailed_timing.h_active,
+                                monitor.data.detailed_timing.v_active, allowPalette);
+                        if (mode != NULL)
+                                return mode;
+                }
+        }
+
+        // try standard timings next
+        for (int32 i = 0; i < EDID1_NUM_STD_TIMING; i++) {
+                if (info.std_timing[i].h_size <= 256)
+                        continue;
+
+                video_mode *found = find_video_mode(info.std_timing[i].h_size,
+                        info.std_timing[i].v_size, allowPalette);
+                if (found != NULL) {
+                        if (mode != NULL) {
+                                // prefer higher resolutions
+                                if (found->width > mode->width)
+                                        mode = found;
+                        } else
+                                mode = found;
-                }
-        }
@@ -861 +903 @@
-                // we got EDID information from the monitor, try to find a new default
-                // mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-                if (defaultMode != NULL) {