From 0cd93754a4038ed73c61ce34dd398c14b3ec6dee Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 7 Aug 2011 05:24:23 +0000 Subject: [PATCH] * init scratch before card post * B_OK != 1!, so don't if (status_t) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42592 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/radeon_hd/atombios/atom.cpp | 3 ++- src/add-ons/accelerants/radeon_hd/bios.cpp | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp b/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp index 52d0549383..811daf46fa 100644 --- a/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp +++ b/src/add-ons/accelerants/radeon_hd/atombios/atom.cpp @@ -1329,7 +1329,8 @@ atom_allocate_fb_scratch(atom_context *ctx) int usage_bytes = 0; _ATOM_VRAM_USAGE_BY_FIRMWARE *firmware; - if (atom_parse_data_header(ctx, index, NULL, NULL, NULL, &data_offset)) { + if (atom_parse_data_header(ctx, index, NULL, NULL, NULL, &data_offset) + == B_OK) { firmware = (_ATOM_VRAM_USAGE_BY_FIRMWARE *) ((uint16*)ctx->bios + data_offset); diff --git a/src/add-ons/accelerants/radeon_hd/bios.cpp b/src/add-ons/accelerants/radeon_hd/bios.cpp index d128288fc0..97e2a3981d 100644 --- a/src/add-ons/accelerants/radeon_hd/bios.cpp +++ b/src/add-ons/accelerants/radeon_hd/bios.cpp @@ -107,11 +107,11 @@ radeon_init_bios(uint8* bios) return B_ERROR; } - atom_asic_init(gAtomContext); - // Post card - radeon_bios_init_scratch(); atom_allocate_fb_scratch(gAtomContext); + atom_asic_init(gAtomContext); + // Post card + return B_OK; }