i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Bring back the fallback video mode selection in case both tries to read EDID info failed.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39081 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues
2010-10-23 20:05:24 +00:00
parent 6046b973b6
commit 6389df937b
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/intel_extreme/mode.cpp
+11 -9
View File
@@ -173,10 +173,9 @@ create_mode_list(void)
} else { } else {
TRACE(("intel_extreme: getting EDID on port C failed : %s\n", TRACE(("intel_extreme: getting EDID on port C failed : %s\n",
strerror(error))); strerror(error)));
}
}
#if 0 // 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 // TODO: support lower modes via scaling and windowing
if (gInfo->head_mode & HEAD_MODE_LVDS_PANEL if (gInfo->head_mode & HEAD_MODE_LVDS_PANEL
&& ((gInfo->head_mode & HEAD_MODE_A_ANALOG) == 0)) { && ((gInfo->head_mode & HEAD_MODE_A_ANALOG) == 0)) {
@@ -184,8 +183,9 @@ create_mode_list(void)
& ~(B_PAGE_SIZE - 1); & ~(B_PAGE_SIZE - 1);
display_mode *list; display_mode *list;
area_id area = create_area("intel extreme modes", (void **)&list, area_id area = create_area("intel extreme modes",
B_ANY_ADDRESS, size, B_NO_LOCK, B_READ_AREA | B_WRITE_AREA); (void **)&list, B_ANY_ADDRESS, size, B_NO_LOCK,
B_READ_AREA | B_WRITE_AREA);
if (area < B_OK) if (area < B_OK)
return area; return area;
@@ -197,7 +197,8 @@ create_mode_list(void)
gInfo->shared_info->mode_count = 1; gInfo->shared_info->mode_count = 1;
return B_OK; return B_OK;
} }
#endif }
}
// Otherwise return the 'real' list of modes // Otherwise return the 'real' list of modes
display_mode *list; display_mode *list;
@@ -219,9 +220,10 @@ create_mode_list(void)
void void
wait_for_vblank(void) wait_for_vblank(void)
{ {
acquire_sem_etc(gInfo->shared_info->vblank_sem, 1, B_RELATIVE_TIMEOUT, 25000); acquire_sem_etc(gInfo->shared_info->vblank_sem, 1, B_RELATIVE_TIMEOUT,
// With the output turned off via DPMS, we might not get any interrupts anymore 25000);
// that's why we don't wait forever for it. // With the output turned off via DPMS, we might not get any interrupts
// anymore that's why we don't wait forever for it.
} }