[haiku-commits] r39081 - haiku/trunk/src/add-ons/accelerants/intel_extreme
- From: pulkomandy@xxxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 23 Oct 2010 22:05:24 +0200 (CEST)
Author: pulkomandy
Date: 2010-10-23 22:05:24 +0200 (Sat, 23 Oct 2010)
New Revision: 39081
Changeset: http://dev.haiku-os.org/changeset/39081
Modified:
haiku/trunk/src/add-ons/accelerants/intel_extreme/mode.cpp
Log:
* Bring back the fallback video mode selection in case both tries to read EDID
info failed.
Modified: haiku/trunk/src/add-ons/accelerants/intel_extreme/mode.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/intel_extreme/mode.cpp 2010-10-23
20:03:37 UTC (rev 39080)
+++ haiku/trunk/src/add-ons/accelerants/intel_extreme/mode.cpp 2010-10-23
20:05:24 UTC (rev 39081)
@@ -173,31 +173,32 @@
} else {
TRACE(("intel_extreme: getting EDID on port C failed :
%s\n",
strerror(error)));
- }
- }
-#if 0
- // TODO: support lower modes via scaling and windowing
- if (gInfo->head_mode & HEAD_MODE_LVDS_PANEL
- && ((gInfo->head_mode & HEAD_MODE_A_ANALOG) == 0)) {
- size_t size = (sizeof(display_mode) + B_PAGE_SIZE - 1)
- & ~(B_PAGE_SIZE - 1);
+ // We could not read any EDID info. Fallback to
creating a list with
+ // only the mode set up by the BIOS.
+ // TODO: support lower modes via scaling and windowing
+ if (gInfo->head_mode & HEAD_MODE_LVDS_PANEL
+ && ((gInfo->head_mode &
HEAD_MODE_A_ANALOG) == 0)) {
+ size_t size = (sizeof(display_mode) +
B_PAGE_SIZE - 1)
+ & ~(B_PAGE_SIZE - 1);
- display_mode *list;
- area_id area = create_area("intel extreme modes", (void
**)&list,
- B_ANY_ADDRESS, size, B_NO_LOCK, B_READ_AREA |
B_WRITE_AREA);
- if (area < B_OK)
- return area;
+ display_mode *list;
+ area_id area = create_area("intel extreme
modes",
+ (void **)&list, B_ANY_ADDRESS, size,
B_NO_LOCK,
+ B_READ_AREA | B_WRITE_AREA);
+ if (area < B_OK)
+ return area;
- memcpy(list, &gInfo->lvds_panel_mode, sizeof(display_mode));
+ memcpy(list, &gInfo->lvds_panel_mode,
sizeof(display_mode));
- gInfo->mode_list_area = area;
- gInfo->mode_list = list;
- gInfo->shared_info->mode_list_area = gInfo->mode_list_area;
- gInfo->shared_info->mode_count = 1;
- return B_OK;
+ gInfo->mode_list_area = area;
+ gInfo->mode_list = list;
+ gInfo->shared_info->mode_list_area =
gInfo->mode_list_area;
+ gInfo->shared_info->mode_count = 1;
+ return B_OK;
+ }
+ }
}
-#endif
// Otherwise return the 'real' list of modes
display_mode *list;
@@ -219,9 +220,10 @@
void
wait_for_vblank(void)
{
- acquire_sem_etc(gInfo->shared_info->vblank_sem, 1, B_RELATIVE_TIMEOUT,
25000);
- // With the output turned off via DPMS, we might not get any
interrupts anymore
- // that's why we don't wait forever for it.
+ acquire_sem_etc(gInfo->shared_info->vblank_sem, 1, B_RELATIVE_TIMEOUT,
+ 25000);
+ // With the output turned off via DPMS, we might not get any
interrupts
+ // anymore that's why we don't wait forever for it.
}
Other related posts:
- » [haiku-commits] r39081 - haiku/trunk/src/add-ons/accelerants/intel_extreme - pulkomandy
