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

* correction to AtomBIOS register loopback calls

Browse Source 
* cail calls have their registers multiplied by 4
* solves infinite loops


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42647 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-08-20 14:29:06 +00:00
parent 480a26bc39
commit 11390ce010
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/radeon_hd/accelerant.h
+15
View File
@@ -181,6 +181,21 @@ _write32(uint32 offset, uint32 value)
} }
// AtomBIOS cail register calls (are *4... no clue why)
inline uint32
Read32Cail(uint32 offset)
{
return _read32(offset * 4);
}
inline void
Write32Cail(uint32 offset, uint32 value)
{
_write32(offset * 4, value);
}
inline uint32 inline uint32
Read32(uint32 subsystem, uint32 offset) Read32(uint32 subsystem, uint32 offset)
{ {
src/add-ons/accelerants/radeon_hd/bios.cpp
+10 -4
View File
@@ -124,8 +124,8 @@ radeon_init_bios(uint8* bios)
if (!atom_card_info) if (!atom_card_info)
return B_NO_MEMORY; return B_NO_MEMORY;
atom_card_info->reg_read = _read32; atom_card_info->reg_read = Read32Cail;
atom_card_info->reg_write = _write32; atom_card_info->reg_write = Write32Cail;
if (false) { if (false) {
// TODO : if rio_mem, use ioreg // TODO : if rio_mem, use ioreg
@@ -133,8 +133,8 @@ radeon_init_bios(uint8* bios)
//atom_card_info->ioreg_write = cail_ioreg_write; //atom_card_info->ioreg_write = cail_ioreg_write;
} else { } else {
TRACE("%s: Cannot find PCI I/O BAR; using MMIO\n", __func__); TRACE("%s: Cannot find PCI I/O BAR; using MMIO\n", __func__);
atom_card_info->ioreg_read = _read32; atom_card_info->ioreg_read = Read32Cail;
atom_card_info->ioreg_write = _write32; atom_card_info->ioreg_write = Write32Cail;
} }
atom_card_info->mc_read = _read32; atom_card_info->mc_read = _read32;
atom_card_info->mc_write = _write32; atom_card_info->mc_write = _write32;
@@ -159,6 +159,11 @@ radeon_init_bios(uint8* bios)
radeon_bios_init_scratch(); radeon_bios_init_scratch();
atom_allocate_fb_scratch(gAtomContext); atom_allocate_fb_scratch(gAtomContext);
// TODO : Always post bios for now... not doing this
// at a later date may save boot time
atom_asic_init(gAtomContext);
#if 0
// post card atombios if needed // post card atombios if needed
if (!radeon_bios_isposted()) { if (!radeon_bios_isposted()) {
TRACE("%s: init AtomBIOS for this card as it is not not posted\n", TRACE("%s: init AtomBIOS for this card as it is not not posted\n",
@@ -169,6 +174,7 @@ radeon_init_bios(uint8* bios)
TRACE("%s: AtomBIOS is already posted\n", TRACE("%s: AtomBIOS is already posted\n",
__func__); __func__);
} }
#endif
return B_OK; return B_OK;
} }