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

fix naming of static display mode var; make mode sanity check ensure timing settings are sane instead of less-then-useful positive int check; fix silly bug in tracing output (%d vs %s)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41346 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-05-06 19:22:39 +00:00
parent a11e2f430c
commit 333bd77062
1 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/mode.cpp
+46 -38
View File
@@ -30,7 +30,7 @@ extern "C" void _sPrintf(const char *format, ...);
#endif #endif
static display_mode gDisplayMode; static display_mode sDisplayMode;
status_t status_t
@@ -39,31 +39,31 @@ create_mode_list(void)
// TODO : Read active monitor EDID // TODO : Read active monitor EDID
/* Populate modeline with temporary example */ /* Populate modeline with temporary example */
gDisplayMode.timing.pixel_clock = 71500; sDisplayMode.timing.pixel_clock = 71500;
gDisplayMode.timing.h_display = 1366; // In Pixels sDisplayMode.timing.h_display = 1366; // In Pixels
gDisplayMode.timing.h_sync_start = 1406; sDisplayMode.timing.h_sync_start = 1406;
gDisplayMode.timing.h_sync_end = 1438; sDisplayMode.timing.h_sync_end = 1438;
gDisplayMode.timing.h_total = 1510; sDisplayMode.timing.h_total = 1510;
gDisplayMode.timing.v_display = 768; // In Pixels sDisplayMode.timing.v_display = 768; // In Pixels
gDisplayMode.timing.v_sync_start = 771; sDisplayMode.timing.v_sync_start = 771;
gDisplayMode.timing.v_sync_end = 777; sDisplayMode.timing.v_sync_end = 777;
gDisplayMode.timing.v_total = 789; sDisplayMode.timing.v_total = 789;
gDisplayMode.timing.flags = 0; // Polarity, ex: B_POSITIVE_HSYNC sDisplayMode.timing.flags = 0; // Polarity, ex: B_POSITIVE_HSYNC
gDisplayMode.space = B_RGB32_LITTLE; // Pixel configuration sDisplayMode.space = B_RGB32_LITTLE; // Pixel configuration
gDisplayMode.virtual_width = 1366; // In Pixels sDisplayMode.virtual_width = 1366; // In Pixels
gDisplayMode.virtual_height = 768; // In Pixels sDisplayMode.virtual_height = 768; // In Pixels
gDisplayMode.h_display_start = 0; sDisplayMode.h_display_start = 0;
gDisplayMode.v_display_start = 0; sDisplayMode.v_display_start = 0;
gDisplayMode.flags = 0; // Mode flags (Some drivers use this sDisplayMode.flags = 0; // Mode flags (Some drivers use this
// TODO : loop over found modelines and add them to valid mode list // TODO : loop over found modelines and add them to valid mode list
if (mode_sanity_check(&gDisplayMode) != B_OK) { if (mode_sanity_check(&sDisplayMode) != B_OK) {
TRACE("Invalid modeline was found, aborting\n"); TRACE("Invalid modeline was found, aborting\n");
return B_ERROR; return B_ERROR;
} }
gInfo->mode_list = &gDisplayMode; gInfo->mode_list = &sDisplayMode;
gInfo->shared_info->mode_count = 1; gInfo->shared_info->mode_count = 1;
return B_OK; return B_OK;
} }
@@ -75,7 +75,7 @@ create_mode_list(void)
uint32 uint32
radeon_accelerant_mode_count(void) radeon_accelerant_mode_count(void)
{ {
TRACE("%d\n", __func__); TRACE("%s\n", __func__);
return gInfo->shared_info->mode_count; return gInfo->shared_info->mode_count;
} }
@@ -84,7 +84,7 @@ radeon_accelerant_mode_count(void)
status_t status_t
radeon_get_mode_list(display_mode *modeList) radeon_get_mode_list(display_mode *modeList)
{ {
TRACE("%d\n", __func__); TRACE("%s\n", __func__);
memcpy(modeList, gInfo->mode_list, memcpy(modeList, gInfo->mode_list,
gInfo->shared_info->mode_count * sizeof(display_mode)); gInfo->shared_info->mode_count * sizeof(display_mode));
return B_OK; return B_OK;
@@ -293,7 +293,7 @@ radeon_get_display_mode(display_mode *_currentMode)
{ {
TRACE("%s\n", __func__); TRACE("%s\n", __func__);
*_currentMode = gDisplayMode; _currentMode = &sDisplayMode;
return B_OK; return B_OK;
} }
@@ -346,27 +346,35 @@ radeon_get_pixel_clock_limits(display_mode *mode, uint32 *_low, uint32 *_high)
status_t status_t
mode_sanity_check(display_mode *mode) mode_sanity_check(display_mode *mode)
{ {
if (mode->timing.h_display <= 0 // horizontal timing
|| mode->timing.h_sync_start <= 0 // validate h_sync_start is less then h_sync_end
|| mode->timing.h_sync_end <= 0 if (mode->timing.h_sync_start > mode->timing.h_sync_end) {
|| mode->timing.h_total <= 0) { TRACE("%s: ERROR: "
TRACE("Invalid horizontal mode timing received for %dx%d\n", "(%dx%d) received h_sync_start greater then h_sync_end!\n",
mode->timing.h_display, mode->timing.v_display); __func__, mode->timing.h_display, mode->timing.v_display);
return B_ERROR;
}
// validate h_total is greater then h_display
if (mode->timing.h_total < mode->timing.h_display) {
TRACE("%s: ERROR: "
"(%dx%d) received h_total greater then h_display!\n",
__func__, mode->timing.h_display, mode->timing.v_display);
return B_ERROR; return B_ERROR;
} }
if (mode->timing.v_display <= 0 // vertical timing
|| mode->timing.v_sync_start <= 0 // validate v_start is less then v_end
|| mode->timing.v_sync_end <= 0 if (mode->timing.v_sync_start > mode->timing.v_sync_end) {
|| mode->timing.v_total <= 0) { TRACE("%s: ERROR: "
TRACE("Invalid vertical mode timing received for %dx%d\n", "(%dx%d) received v_sync_start greater then v_sync_end!\n",
mode->timing.h_display, mode->timing.v_display); __func__, mode->timing.h_display, mode->timing.v_display);
return B_ERROR; return B_ERROR;
} }
// validate v_total is greater then v_display
if (mode->flags <= 0) { if (mode->timing.v_total < mode->timing.v_display) {
TRACE("Invalid mode timing flag received for %dx%d\n", TRACE("%s: ERROR: "
mode->timing.h_display, mode->timing.v_display); "(%dx%d) received v_total greater then v_display!\n",
__func__, mode->timing.h_display, mode->timing.v_display);
return B_ERROR; return B_ERROR;
} }