[haiku-commits] r37028 - in haiku/trunk: headers/private/graphics/intel_extreme src/add-ons/kernel/drivers/graphics/intel_extreme

  • From: axeld@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 6 Jun 2010 11:39:38 +0200 (CEST)

Author: axeld
Date: 2010-06-06 11:39:38 +0200 (Sun, 06 Jun 2010)
New Revision: 37028
Changeset: http://dev.haiku-os.org/changeset/37028/haiku

Modified:
   haiku/trunk/headers/private/graphics/intel_extreme/intel_extreme.h
   
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_private.h
Log:
* Now phys_addr_t should be used where needed.


Modified: haiku/trunk/headers/private/graphics/intel_extreme/intel_extreme.h
===================================================================
--- haiku/trunk/headers/private/graphics/intel_extreme/intel_extreme.h  
2010-06-06 09:37:46 UTC (rev 37027)
+++ haiku/trunk/headers/private/graphics/intel_extreme/intel_extreme.h  
2010-06-06 09:39:38 UTC (rev 37028)
@@ -108,9 +108,9 @@
 
        area_id                 registers_area;                 // area of 
memory mapped registers
        uint8*                  status_page;
-       addr_t                  physical_status_page;
+       phys_addr_t             physical_status_page;
        uint8*                  graphics_memory;
-       addr_t                  physical_graphics_memory;
+       phys_addr_t             physical_graphics_memory;
        uint32                  graphics_memory_size;
 
        addr_t                  frame_buffer;
@@ -124,14 +124,14 @@
        int32                   overlay_channel_used;
        bool                    overlay_active;
        uint32                  overlay_token;
-       addr_t                  physical_overlay_registers;
+       phys_addr_t             physical_overlay_registers;
        uint32                  overlay_offset;
 
        bool                    hardware_cursor_enabled;
        sem_id                  vblank_sem;
 
        uint8*                  cursor_memory;
-       addr_t                  physical_cursor_memory;
+       phys_addr_t             physical_cursor_memory;
        uint32                  cursor_buffer_offset;
        uint32                  cursor_format;
        bool                    cursor_visible;

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-06 09:37:46 UTC (rev 37027)
+++ 
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp 
    2010-06-06 09:39:38 UTC (rev 37028)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2010, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -164,15 +164,10 @@
 
 status_t
 intel_allocate_memory(intel_info &info, size_t size, size_t alignment,
-       uint32 flags, addr_t *_base, addr_t *_physicalBase)
+       uint32 flags, addr_t *_base, phys_addr_t *_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);
-       if (_physicalBase != NULL)
-               *_physicalBase = physicalBase;
-       return error;
+       return gGART->allocate_memory(info.aperture, size, alignment,
+               flags, _base, _physicalBase);
 }
 
 
@@ -255,13 +250,12 @@
                write32(info.registers + 0x6208, (1L << 9) | (1L << 7) | (1L << 
6));
                write32(info.registers + 0x6210, 0);
 
-               uint32 dspclk_gate_val = (1L << 28) | (1L << 3) | (1L << 2);
+               uint32 gateValue = (1L << 28) | (1L << 3) | (1L << 2);
                if ((info.device_type.type & INTEL_TYPE_MOBILE) == 
INTEL_TYPE_MOBILE) {
                        dprintf("G4x mobile clock gating\n");
-                   dspclk_gate_val |= 1L << 18;
+                   gateValue |= 1L << 18;
                }
-               write32(info.registers + 0x6200, dspclk_gate_val)       ;
-
+               write32(info.registers + 0x6200, gateValue);
        } else {
                dprintf("i965 quirk\n");
                write32(info.registers + 0x6204, (1L << 29) | (1L << 23));

Modified: 
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme_private.h
===================================================================
--- 
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme_private.h
       2010-06-06 09:37:46 UTC (rev 37027)
+++ 
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme_private.h
       2010-06-06 09:39:38 UTC (rev 37028)
@@ -40,7 +40,7 @@
 extern status_t intel_free_memory(intel_info& info, addr_t offset);
 extern status_t intel_allocate_memory(intel_info& info, size_t size,
        size_t alignment, uint32 flags, addr_t* _offset,
-       addr_t* _physicalBase = NULL);
+       phys_addr_t* _physicalBase = NULL);
 extern status_t intel_extreme_init(intel_info& info);
 extern void intel_extreme_uninit(intel_info& info);
 


Other related posts:

  • » [haiku-commits] r37028 - in haiku/trunk: headers/private/graphics/intel_extreme src/add-ons/kernel/drivers/graphics/intel_extreme - axeld