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

* make atombios lockup checking adjustments more robust

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42849 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-10-14 18:34:45 +00:00
parent e09045d41f
commit 2cc1b10386
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/atombios/atom.cpp
+12 -4
View File
@@ -35,8 +35,14 @@
#include "atom-bits.h" #include "atom-bits.h"
#undef TRACE /* AtomBIOS loop detection
* Number of repeat AtomBIOS jmp operations
* before bailing due to stuck in a loop
*/
#define ATOM_OP_JMP_TIMEOUT 128
// *** Tracing
#undef TRACE
//#define TRACE_ATOM //#define TRACE_ATOM
#ifdef TRACE_ATOM #ifdef TRACE_ATOM
# define TRACE(x...) _sPrintf("radeon_hd: " x) # define TRACE(x...) _sPrintf("radeon_hd: " x)
@@ -64,6 +70,7 @@
#define PLL_INDEX 2 #define PLL_INDEX 2
#define PLL_DATA 3 #define PLL_DATA 3
typedef struct { typedef struct {
atom_context *ctx; atom_context *ctx;
@@ -641,9 +648,10 @@ atom_op_jump(atom_exec_context *ctx, int *ptr, int arg)
if (execute) { if (execute) {
if (ctx->last_jump == (ctx->start + target)) { if (ctx->last_jump == (ctx->start + target)) {
if (ctx->last_jump_count > 128) { if (ctx->last_jump_count > ATOM_OP_JMP_TIMEOUT) {
ERROR("%s: DANGER! AtomBIOS stuck in infinite loop" ERROR("%s: DANGER! AtomBIOS stuck in loop"
" for more then 128 jumps... abort!\n", __func__); " for more then %d jumps... abort!\n",
__func__, ATOM_OP_JMP_TIMEOUT);
ctx->abort = true; ctx->abort = true;
} else { } else {
ctx->last_jump_count++; ctx->last_jump_count++;