hrev51989 adds 1 changeset to branch 'master'
old head: bdd7dae89c36aa55ab8eeaff6b442d0c4406664b
new head: 4f059c1fc51d17a2a592c5675a2f188b4bea2f69
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=4f059c1fc51d+%5Ebdd7dae89c36
----------------------------------------------------------------------------
4f059c1fc51d: intel_extreme: Broadwell is really Gen7(.5), not 8.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51989
Commit: 4f059c1fc51d17a2a592c5675a2f188b4bea2f69
URL: https://git.haiku-os.org/haiku/commit/?id=4f059c1fc51d
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue Jun 5 17:27:45 2018 UTC
----------------------------------------------------------------------------
3 files changed, 8 insertions(+), 8 deletions(-)
headers/private/graphics/intel_extreme/intel_extreme.h | 8 ++++----
src/add-ons/kernel/busses/agp_gart/intel_gart.cpp | 4 ++--
src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/headers/private/graphics/intel_extreme/intel_extreme.h
b/headers/private/graphics/intel_extreme/intel_extreme.h
index 1c79b57527..97c07a873d 100644
--- a/headers/private/graphics/intel_extreme/intel_extreme.h
+++ b/headers/private/graphics/intel_extreme/intel_extreme.h
@@ -46,11 +46,11 @@
#define INTEL_GROUP_SNB (INTEL_FAMILY_SER5 | 0x0020) //
SandyBridge
#define INTEL_GROUP_IVB (INTEL_FAMILY_SER5 | 0x0040) //
IvyBridge
#define INTEL_GROUP_HAS (INTEL_FAMILY_SER5 | 0x0080) // Haswell
+#define INTEL_GROUP_BDW (INTEL_FAMILY_SER5 | 0x0100) //
Broadwell
#define INTEL_GROUP_SLT (INTEL_FAMILY_POVR | 0x0010) //
Saltwell
#define INTEL_GROUP_FSM (INTEL_FAMILY_POVR | 0x0020) //
Fu.Silvermont
#define INTEL_GROUP_VLV (INTEL_FAMILY_SOC0 | 0x0010) //
ValleyView
#define INTEL_GROUP_CHV (INTEL_FAMILY_SOC0 | 0x0020) //
CherryView
-#define INTEL_GROUP_BDW (INTEL_FAMILY_SOC0 | 0x0040) //
Broadwell
#define INTEL_GROUP_SKY (INTEL_FAMILY_LAKE | 0x0010) // SkyLake
#define INTEL_GROUP_KBY (INTEL_FAMILY_LAKE | 0x0020) //
KabyLake
// models
@@ -77,10 +77,10 @@
#define INTEL_MODEL_IVBGS (INTEL_GROUP_IVB | INTEL_TYPE_SERVER)
#define INTEL_MODEL_HAS (INTEL_GROUP_HAS)
#define INTEL_MODEL_HASM (INTEL_GROUP_HAS | INTEL_TYPE_MOBILE)
-#define INTEL_MODEL_VLV (INTEL_GROUP_VLV)
-#define INTEL_MODEL_VLVM (INTEL_GROUP_VLV | INTEL_TYPE_MOBILE)
#define INTEL_MODEL_BDW (INTEL_GROUP_BDW)
#define INTEL_MODEL_BDWM (INTEL_GROUP_BDW | INTEL_TYPE_MOBILE)
+#define INTEL_MODEL_VLV (INTEL_GROUP_VLV)
+#define INTEL_MODEL_VLVM (INTEL_GROUP_VLV | INTEL_TYPE_MOBILE)
#define INTEL_MODEL_SKY (INTEL_GROUP_SKY)
#define INTEL_MODEL_SKYM (INTEL_GROUP_SKY | INTEL_TYPE_MOBILE)
#define INTEL_MODEL_SKYS (INTEL_GROUP_SKY | INTEL_TYPE_SERVER)
@@ -200,7 +200,7 @@ struct DeviceType {
return 6;
if (InFamily(INTEL_FAMILY_SER5) || InGroup(INTEL_GROUP_VLV))
return 7;
- if (InGroup(INTEL_GROUP_CHV) || InGroup(INTEL_GROUP_BDW))
+ if (InGroup(INTEL_GROUP_CHV))
return 8;
if (InFamily(INTEL_FAMILY_LAKE))
return 9;
diff --git a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
index 4e0557dd2e..fe41f4f288 100644
--- a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
+++ b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
@@ -120,6 +120,8 @@ const struct supported_device {
{0x0d04, 0x0d26, INTEL_MODEL_HASM, "Haswell Mobile"},
{0x0a04, 0x0a16, INTEL_MODEL_HASM, "Haswell Mobile"},
+ {0x1604, 0x1616, INTEL_MODEL_BDWM, "HD Graphics 5500 (Broadwell GT2)"},
+
// XXX: 0x0f00 only confirmed on 0x0f30, 0x0f31
{0x0f00, 0x0155, INTEL_MODEL_VLV, "ValleyView Desktop"},
{0x0f00, 0x0f30, INTEL_MODEL_VLVM, "ValleyView Mobile"},
@@ -128,8 +130,6 @@ const struct supported_device {
{0x0f00, 0x0f33, INTEL_MODEL_VLVM, "ValleyView Mobile"},
{0x0f00, 0x0157, INTEL_MODEL_VLVM, "ValleyView Mobile"},
- {0x1604, 0x1616, INTEL_MODEL_BDWM, "HD Graphics 5500 (Broadwell GT2)"},
-
// XXX: 0x1904 only confirmed on 0x1916
{0x1904, 0x1902, INTEL_MODEL_SKY, "Skylake GT1"},
{0x1904, 0x1906, INTEL_MODEL_SKYM, "Skylake GT1"},
diff --git a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
index 766fb520f6..0b923690d9 100644
--- a/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
+++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/driver.cpp
@@ -104,6 +104,8 @@ const struct supported_device {
{0x0d26, INTEL_MODEL_HASM, "Haswell Mobile"},
{0x0a16, INTEL_MODEL_HASM, "Haswell Mobile"},
+// {0x1616, INTEL_MODEL_BDWM, "HD Graphics 5500 (Broadwell GT2)"},
+
{0x0155, INTEL_MODEL_VLV, "ValleyView Desktop"},
{0x0f30, INTEL_MODEL_VLVM, "ValleyView Mobile"},
{0x0f31, INTEL_MODEL_VLVM, "ValleyView Mobile"},
@@ -111,8 +113,6 @@ const struct supported_device {
{0x0f33, INTEL_MODEL_VLVM, "ValleyView Mobile"},
{0x0157, INTEL_MODEL_VLVM, "ValleyView Mobile"},
-// {0x1616, INTEL_MODEL_BDWM, "HD Graphics 5500 (Broadwell GT2)"},
-
{0x1902, INTEL_MODEL_SKY, "Skylake GT1"},
{0x1906, INTEL_MODEL_SKYM, "Skylake GT1"},
{0x190a, INTEL_MODEL_SKYS, "Skylake GT1"},
