[haiku-commits] r42647 - haiku/trunk/src/add-ons/accelerants/radeon_hd
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 20 Aug 2011 16:29:07 +0200 (CEST)
Author: kallisti5
Date: 2011-08-20 16:29:06 +0200 (Sat, 20 Aug 2011)
New Revision: 42647
Changeset: https://dev.haiku-os.org/changeset/42647
Modified:
haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h
haiku/trunk/src/add-ons/accelerants/radeon_hd/bios.cpp
Log:
* correction to AtomBIOS register loopback calls
* cail calls have their registers multiplied by 4
* solves infinite loops
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h 2011-08-20
13:56:43 UTC (rev 42646)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/accelerant.h 2011-08-20
14:29:06 UTC (rev 42647)
@@ -181,7 +181,22 @@
}
+// 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
Read32(uint32 subsystem, uint32 offset)
{
switch (subsystem) {
Modified: haiku/trunk/src/add-ons/accelerants/radeon_hd/bios.cpp
===================================================================
--- haiku/trunk/src/add-ons/accelerants/radeon_hd/bios.cpp 2011-08-20
13:56:43 UTC (rev 42646)
+++ haiku/trunk/src/add-ons/accelerants/radeon_hd/bios.cpp 2011-08-20
14:29:06 UTC (rev 42647)
@@ -124,8 +124,8 @@
if (!atom_card_info)
return B_NO_MEMORY;
- atom_card_info->reg_read = _read32;
- atom_card_info->reg_write = _write32;
+ atom_card_info->reg_read = Read32Cail;
+ atom_card_info->reg_write = Write32Cail;
if (false) {
// TODO : if rio_mem, use ioreg
@@ -133,8 +133,8 @@
//atom_card_info->ioreg_write = cail_ioreg_write;
} else {
TRACE("%s: Cannot find PCI I/O BAR; using MMIO\n", __func__);
- atom_card_info->ioreg_read = _read32;
- atom_card_info->ioreg_write = _write32;
+ atom_card_info->ioreg_read = Read32Cail;
+ atom_card_info->ioreg_write = Write32Cail;
}
atom_card_info->mc_read = _read32;
atom_card_info->mc_write = _write32;
@@ -159,6 +159,11 @@
radeon_bios_init_scratch();
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
if (!radeon_bios_isposted()) {
TRACE("%s: init AtomBIOS for this card as it is not not
posted\n",
@@ -169,6 +174,7 @@
TRACE("%s: AtomBIOS is already posted\n",
__func__);
}
+ #endif
return B_OK;
}
Other related posts:
- » [haiku-commits] r42647 - haiku/trunk/src/add-ons/accelerants/radeon_hd - kallisti5
