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

  • From: korli@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 6 Mar 2011 12:57:21 +0100 (CET)

Author: korli
Date: 2011-03-06 12:57:20 +0100 (Sun, 06 Mar 2011)
New Revision: 40838
Changeset: http://dev.haiku-os.org/changeset/40838

Modified:
   haiku/trunk/headers/private/graphics/intel_extreme/intel_extreme.h
   haiku/trunk/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
   haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
Log:
Comparing with i915 DRM:
* add a INTEL_TYPE_915M type to be used by 0x2592 (mobile version)
* 0x2e32 is actually non mobile, added its brothers 0x2e02, 0x2e12, 0x2e22, 
0x2e42, 0x2e92
* 0x27a2 is actually mobile.
* added 0x2972, 0x2982, 0x2992 for INTEL_TYPE_965 type, and 0x2a12 for 
INTEL_TYPE_965M.
* added corresponding entries in intel_gart.


Modified: haiku/trunk/headers/private/graphics/intel_extreme/intel_extreme.h
===================================================================
--- haiku/trunk/headers/private/graphics/intel_extreme/intel_extreme.h  
2011-03-06 10:34:16 UTC (rev 40837)
+++ haiku/trunk/headers/private/graphics/intel_extreme/intel_extreme.h  
2011-03-06 11:57:20 UTC (rev 40838)
@@ -37,6 +37,7 @@
 // models
 #define INTEL_TYPE_MOBILE              0x0008
 #define INTEL_TYPE_915                 (INTEL_TYPE_91x)
+#define INTEL_TYPE_915M                        (INTEL_TYPE_91x | 
INTEL_TYPE_MOBILE)
 #define INTEL_TYPE_945                 (INTEL_TYPE_94x)
 #define INTEL_TYPE_945M                        (INTEL_TYPE_94x | 
INTEL_TYPE_MOBILE)
 #define INTEL_TYPE_965                 (INTEL_TYPE_96x)

Modified: haiku/trunk/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp       
2011-03-06 10:34:16 UTC (rev 40837)
+++ haiku/trunk/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp       
2011-03-06 11:57:20 UTC (rev 40838)
@@ -48,18 +48,19 @@
        {0x3575, 0x3577, INTEL_TYPE_83x, "i830GM"},
        {0x2560, 0x2562, INTEL_TYPE_83x, "i845G"},
        {0x3580, 0x3582, INTEL_TYPE_85x, "i855G"},
+       {0x358c, 0x358e, INTEL_TYPE_85x, "i855G"},
        {0x2570, 0x2572, INTEL_TYPE_85x, "i865G"},
 
 //     {0x2792, INTEL_TYPE_91x, "i910"},
 //     {0x258a, INTEL_TYPE_91x, "i915"},
-       {0x2580, 0x2582, INTEL_TYPE_91x, "i915G"},
-       {0x2590, 0x2592, INTEL_TYPE_91x, "i915GM"},
+       {0x2580, 0x2582, INTEL_TYPE_915, "i915G"},
+       {0x2590, 0x2592, INTEL_TYPE_915M, "i915GM"},
        {0x2770, 0x2772, INTEL_TYPE_945, "i945G"},
-       {0x27a0, 0x27a2, INTEL_TYPE_945, "i945GM"},
-       {0x27ac, 0x27ae, INTEL_TYPE_945, "i945GME"},
+       {0x27a0, 0x27a2, INTEL_TYPE_945M, "i945GM"},
+       {0x27ac, 0x27ae, INTEL_TYPE_945M, "i945GME"},
 
        {0x2970, 0x2972, INTEL_TYPE_965, "i946GZ"},
-       {0x2980, 0x2982, INTEL_TYPE_965, "i965G"},
+       {0x2980, 0x2982, INTEL_TYPE_965, "G35"},
        {0x2990, 0x2992, INTEL_TYPE_965, "i965Q"},
        {0x29a0, 0x29a2, INTEL_TYPE_965, "i965G"},
        {0x2a00, 0x2a02, INTEL_TYPE_965, "i965GM"},
@@ -69,8 +70,13 @@
        {0x29c0, 0x29c2, INTEL_TYPE_G33, "Q35"},
        {0x29d0, 0x29d2, INTEL_TYPE_G33, "Q33"},
 
-       {0x2e30, 0x2e32, INTEL_TYPE_GM45, "GMA_X4500_VGA"},
        {0x2a40, 0x2a42, INTEL_TYPE_GM45, "GM45"},
+       {0x2e00, 0x2e02, INTEL_TYPE_G45, "IGD"},
+       {0x2e10, 0x2e12, INTEL_TYPE_G45, "Q45"},
+       {0x2e20, 0x2e22, INTEL_TYPE_G45, "G45"},
+       {0x2e30, 0x2e32, INTEL_TYPE_G45, "G41"},
+       {0x2e40, 0x2e42, INTEL_TYPE_G45, "B43"},
+       {0x2e90, 0x2e92, INTEL_TYPE_G45, "B43"},
        
        {0xa000, 0xa001, INTEL_TYPE_IGDG, "Atom_Dx10"},
        {0xa010, 0xa011, INTEL_TYPE_IGDGM, "Atom_N4x0"},

Modified: 
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp    
2011-03-06 10:34:16 UTC (rev 40837)
+++ haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp    
2011-03-06 11:57:20 UTC (rev 40838)
@@ -43,23 +43,33 @@
 
        {0x2572, INTEL_TYPE_85x, "i865G"},
        {0x3582, INTEL_TYPE_85x, "i855G"},
+       {0x358e, INTEL_TYPE_85x, "i855G"},
 
-       {0x2792, INTEL_TYPE_91x, "i910"},
-       {0x258a, INTEL_TYPE_91x, "i915"},
-       {0x2582, INTEL_TYPE_91x, "i915G"},
-       {0x2592, INTEL_TYPE_91x, "i915GM"},
+       {0x2582, INTEL_TYPE_915, "i915G"},
+       {0x258a, INTEL_TYPE_915, "i915"},
+       {0x2592, INTEL_TYPE_915M, "i915GM"},
+       {0x2792, INTEL_TYPE_915, "i910"},
        {0x2772, INTEL_TYPE_945, "i945G"},
-       {0x27a2, INTEL_TYPE_945, "i945GM"},
+       {0x27a2, INTEL_TYPE_945M, "i945GM"},
        {0x27ae, INTEL_TYPE_945M, "i945GME"},
+       {0x2972, INTEL_TYPE_965, "i946G"},
+       {0x2982, INTEL_TYPE_965, "G35"},
+       {0x2992, INTEL_TYPE_965, "i965Q"},
        {0x29a2, INTEL_TYPE_965, "i965G"},
        {0x2a02, INTEL_TYPE_965M, "i965GM"},
+       {0x2a12, INTEL_TYPE_965M, "i965GME"},
        {0x29b2, INTEL_TYPE_G33, "G33G"},
        {0x29c2, INTEL_TYPE_G33, "Q35G"},
        {0x29d2, INTEL_TYPE_G33, "Q33G"},
 
-       {0x2e32, INTEL_TYPE_GM45, "GMA_X4500_VGA"},
        {0x2a42, INTEL_TYPE_GM45, "GM45"},
-
+       {0x2e02, INTEL_TYPE_G45, "IGD"},
+       {0x2e12, INTEL_TYPE_G45, "Q45"},
+       {0x2e22, INTEL_TYPE_G45, "G45"},
+       {0x2e32, INTEL_TYPE_G45, "G41"},
+       {0x2e42, INTEL_TYPE_G45, "B43"},
+       {0x2e92, INTEL_TYPE_G45, "B43"},
+       
        {0xa001, INTEL_TYPE_IGDG, "Atom_Dx10"},
        {0xa011, INTEL_TYPE_IGDGM, "Atom_N4x0"},
 };


Other related posts:

  • » [haiku-commits] r40838 - in haiku/trunk: headers/private/graphics/intel_extreme src/add-ons/kernel/busses/agp_gart src/add-ons/kernel/drivers/graphics/intel_extreme - korli