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

* backport linux AtomBIOS parser bugfix...

Browse Source 
Fixes memory corruption on some boards.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42885 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-10-19 18:40:46 +00:00
parent 6e4eb955c7
commit 9b4aacc210
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/atombios/atom.cpp
+15 -1
View File
@@ -246,6 +246,13 @@ atom_get_src_int(atom_exec_context *ctx, uint8 attr, int *ptr,
idx = U8(*ptr); idx = U8(*ptr);
(*ptr)++; (*ptr)++;
val = gctx->scratch[((gctx->fb_base + idx) / 4)]; val = gctx->scratch[((gctx->fb_base + idx) / 4)];
if ((gctx->fb_base + (idx * 4)) > gctx->scratch_size_bytes) {
ERROR("%s: fb tried to read beyond scratch region!"
" %" B_PRIu32 " vs. %d\n", __func__,
gctx->fb_base + (idx * 4), gctx->scratch_size_bytes);
val = 0;
} else
val = gctx->scratch[(gctx->fb_base / 4) + idx];
break; break;
case ATOM_ARG_IMM: case ATOM_ARG_IMM:
switch(align) { switch(align) {
@@ -463,7 +470,12 @@ atom_put_dst(atom_exec_context *ctx, int arg, uint8 attr,
case ATOM_ARG_FB: case ATOM_ARG_FB:
idx = U8(*ptr); idx = U8(*ptr);
(*ptr)++; (*ptr)++;
gctx->scratch[((gctx->fb_base + idx) / 4)] = val; if ((gctx->fb_base + (idx * 4)) > gctx->scratch_size_bytes) {
ERROR("%s: fb tried to write beyond scratch region! "
"%" B_PRIu32 " vs. %d\n", __func__,
gctx->fb_base + (idx * 4), gctx->scratch_size_bytes);
} else
gctx->scratch[(gctx->fb_base / 4) + idx] = val;
break; break;
case ATOM_ARG_PLL: case ATOM_ARG_PLL:
idx = U8(*ptr); idx = U8(*ptr);
@@ -1364,6 +1376,7 @@ atom_allocate_fb_scratch(atom_context *ctx)
usage_bytes usage_bytes
= firmware->asFirmwareVramReserveInfo[0].usFirmwareUseInKb * 1024; = firmware->asFirmwareVramReserveInfo[0].usFirmwareUseInKb * 1024;
} }
ctx->scratch_size_bytes = 0;
if (usage_bytes == 0) if (usage_bytes == 0)
usage_bytes = 20 * 1024; usage_bytes = 20 * 1024;
/* allocate some scratch memory */ /* allocate some scratch memory */
@@ -1371,5 +1384,6 @@ atom_allocate_fb_scratch(atom_context *ctx)
if (!ctx->scratch) if (!ctx->scratch)
return B_NO_MEMORY; return B_NO_MEMORY;
ctx->scratch_size_bytes = usage_bytes;
return B_OK; return B_OK;
} }
src/add-ons/accelerants/radeon_hd/atombios/atom.h
+1
View File
@@ -143,6 +143,7 @@ typedef struct atom_context_s {
int cs_equal, cs_above; int cs_equal, cs_above;
int io_mode; int io_mode;
uint32 *scratch; uint32 *scratch;
int scratch_size_bytes;
} atom_context; } atom_context;
extern int atom_debug; extern int atom_debug;