xf86-video-intel: 3 commits - man/intel.man README src/i915_pciids.h src/intel_module.c src/sna/sna_display.c
Chris Wilson
ickle at kemper.freedesktop.org
Tue Jun 24 12:55:54 PDT 2014
README | 3 +++
man/intel.man | 7 +++++--
src/i915_pciids.h | 12 ++++++++++--
src/intel_module.c | 32 +++++++++++++++++++++++++++++---
src/sna/sna_display.c | 3 +++
5 files changed, 50 insertions(+), 7 deletions(-)
New commits:
commit 43ad5dbc60e1f50a9cdcfc035bc271f1f28438c2
Author: Rodrigo Vivi <rodrigo.vivi at intel.com>
Date: Tue Jun 24 03:14:54 2014 -0700
Add marketing names for Broadwell
Even the unknown/reserved ones will stay with HD Graphics.
v2: Add missing names to intel.man and README files as well. (Chris)
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
diff --git a/README b/README
index dc64ff7..386e07d 100644
--- a/README
+++ b/README
@@ -15,6 +15,9 @@ Intel graphics chipsets including:
G/Q33,G/Q35,G41,G/Q43,G/GM/Q45
PineView-M (Atom N400 series)
PineView-D (Atom D400/D500 series)
+ Intel(R) HD Graphics: 2000-6000,
+ Intel(R) Iris(TM) Graphics: 5100/6100, and
+ Intel(R) Iris(TM) Pro Graphics: 5200/6200/P6300.
Where to get more information about the driver
----------------------------------------------
diff --git a/man/intel.man b/man/intel.man
index 9deac41..917f7f8 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -25,8 +25,11 @@ the 830M and later.
.B intel
supports the i810, i810-DC100, i810e, i815, i830M, 845G, 852GM, 855GM,
865G, 915G, 915GM, 945G, 945GM, 965G, 965Q, 946GZ, 965GM, 945GME,
-G33, Q33, Q35, G35, GM45, G45, Q45, G43, G41 chipsets, and Pineview-M in
-Atom N400 series, Pineview-D in Atom D400/D500 series.
+G33, Q33, Q35, G35, GM45, G45, Q45, G43, G41 chipsets, Pineview-M in
+Atom N400 series, Pineview-D in Atom D400/D500 series,
+Intel(R) HD Graphics: 2000-6000,
+Intel(R) Iris(TM) Graphics: 5100/6100, and
+Intel(R) Iris(TM) Pro Graphics: 5200/6200/P6300.
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
diff --git a/src/intel_module.c b/src/intel_module.c
index a47427a..35c24a2 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -224,6 +224,32 @@ static const SymTabRec intel_chipsets[] = {
{0x0155, "HD Graphics"},
{0x0157, "HD Graphics"},
+ /* Broadwell Marketing names */
+ {0x1602, "HD graphics"},
+ {0x1606, "HD graphics"},
+ {0x160B, "HD graphics"},
+ {0x160A, "HD graphics"},
+ {0x160D, "HD graphics"},
+ {0x160E, "HD graphics"},
+ {0x1612, "HD graphics 5600"},
+ {0x1616, "HD graphics 5500"},
+ {0x161B, "HD graphics"},
+ {0x161A, "HD graphics"},
+ {0x161D, "HD graphics"},
+ {0x161E, "HD graphics 5300"},
+ {0x1622, "Iris Pro graphics 6200"},
+ {0x1626, "HD graphics 6000"},
+ {0x162B, "Iris graphics 6100"},
+ {0x162A, "Iris Pro graphics P6300"},
+ {0x162D, "HD graphics"},
+ {0x162E, "HD graphics"},
+ {0x1632, "HD graphics"},
+ {0x1636, "HD graphics"},
+ {0x163B, "HD graphics"},
+ {0x163A, "HD graphics"},
+ {0x163D, "HD graphics"},
+ {0x163E, "HD graphics"},
+
/* When adding new identifiers, also update:
* 1. intel_identify()
* 2. man/intel.man
@@ -407,9 +433,9 @@ static void intel_identify(int flags)
if (unique != stack)
free(unique);
- xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) HD Graphics: 2000-5000\n");
- xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) Iris(TM) Graphics: 5100\n");
- xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) Iris(TM) Pro Graphics: 5200\n");
+ xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) HD Graphics: 2000-6000\n");
+ xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) Iris(TM) Graphics: 5100, 6100\n");
+ xf86Msg(X_INFO, INTEL_NAME ": Driver for Intel(R) Iris(TM) Pro Graphics: 5200, 6200, P6300\n");
}
static Bool intel_driver_func(ScrnInfoPtr pScrn,
commit 78053bb84217e842615669dfa2f1e7e971ce9860
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Jun 24 20:51:54 2014 +0100
Add reserved PCD IDs for Broadwell
Updating using kernel commit fb7023e0e248a33cb00d0a9cdce0bcedaa1ad284
Author: Rodrigo Vivi <rodrigo.vivi at intel.com>
Date: Tue Jun 10 10:09:52 2014 -0700
drm/i915: BDW: Adding Reserved PCI IDs.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/i915_pciids.h b/src/i915_pciids.h
index 0572035..a70d456 100644
--- a/src/i915_pciids.h
+++ b/src/i915_pciids.h
@@ -237,13 +237,21 @@
#define INTEL_BDW_GT3D_IDS(info) \
_INTEL_BDW_D_IDS(3, info)
+#define INTEL_BDW_RSVDM_IDS(info) \
+ _INTEL_BDW_M_IDS(4, info)
+
+#define INTEL_BDW_RSVDD_IDS(info) \
+ _INTEL_BDW_D_IDS(4, info)
+
#define INTEL_BDW_M_IDS(info) \
INTEL_BDW_GT12M_IDS(info), \
- INTEL_BDW_GT3M_IDS(info)
+ INTEL_BDW_GT3M_IDS(info), \
+ INTEL_BDW_RSVDM_IDS(info)
#define INTEL_BDW_D_IDS(info) \
INTEL_BDW_GT12D_IDS(info), \
- INTEL_BDW_GT3D_IDS(info)
+ INTEL_BDW_GT3D_IDS(info), \
+ INTEL_BDW_RSVDD_IDS(info)
#define INTEL_CHV_IDS(info) \
INTEL_VGA_DEVICE(0x22b0, info), \
commit 74c1cf60a7ce7e79bc727780151f4f233798e5f4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Jun 24 20:49:18 2014 +0100
sna: Add yet more DBG messages to MST discovery
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 0956619..d3983ec 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3601,6 +3601,8 @@ void sna_mode_discover(struct sna *sna)
if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
return;
+ DBG(("%s: now %d (was %d) connectors\n", __FUNCTION__,
+ res.count_connectors, sna->mode.num_real_output));
if (res.count_connectors > 32)
return;
@@ -3614,6 +3616,7 @@ void sna_mode_discover(struct sna *sna)
serial = ++sna->mode.serial;
for (i = 0; i < res.count_connectors; i++) {
+ DBG(("%s: connector[%d] = %d\n", __FUNCTION__, i, connectors[i]));
for (j = 0; j < sna->mode.num_real_output; j++) {
xf86OutputPtr output = config->output[j];
if (to_sna_output(output)->id == connectors[i]) {
More information about the xorg-commit
mailing list