[haiku-commits] r36999 - haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme

  • From: ingo_weinhold@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 2 Jun 2010 22:43:59 +0200 (CEST)

Author: bonefish
Date: 2010-06-02 22:43:59 +0200 (Wed, 02 Jun 2010)
New Revision: 36999
Changeset: http://dev.haiku-os.org/changeset/36999/haiku

Modified:
   
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
Log:
Quick and dirty work-around for broken interface.


Modified: 
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
===================================================================
--- 
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp 
    2010-06-02 20:42:53 UTC (rev 36998)
+++ 
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp 
    2010-06-02 20:43:59 UTC (rev 36999)
@@ -166,8 +166,12 @@
 intel_allocate_memory(intel_info &info, size_t size, size_t alignment,
        uint32 flags, addr_t *_base, addr_t *_physicalBase)
 {
-       return gGART->allocate_memory(info.aperture, size, alignment,
-               flags, _base, _physicalBase);
+       // TODO: _physicalBase should be phys_addr_t!
+       phys_addr_t physicalBase;
+       status_t error = gGART->allocate_memory(info.aperture, size, alignment,
+               flags, _base, &physicalBase);
+       *_physicalBase = physicalBase;
+       return error;
 }
 
 
@@ -255,7 +259,7 @@
                        dprintf("G4x mobile clock gating\n");
                    dspclk_gate_val |= 1L << 18;
                }
-               write32(info.registers + 0x6200, dspclk_gate_val)       ;       
+               write32(info.registers + 0x6200, dspclk_gate_val)       ;
 
        } else {
                dprintf("i965 quirk\n");


Other related posts:

  • » [haiku-commits] r36999 - haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme - ingo_weinhold