* [PATCH 1/2] BDW: Adding Reserved PCI IDs.
@ 2014-06-10 17:15 Rodrigo Vivi
2014-06-10 17:15 ` [PATCH 2/2] BDW: Adding Marketing names Rodrigo Vivi
2014-06-11 6:08 ` [PATCH 1/2] BDW: Adding Reserved PCI IDs Chris Wilson
0 siblings, 2 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2014-06-10 17:15 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
These PCI IDs are reserved on BSpec and can be used at any time in the future.
So let's add this now in order to avoid issues that we already faced on previous
platforms, like finding out about new ids when user reported accelaration weren't
enabled.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
src/i915_pciids.h | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
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), \
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] BDW: Adding Marketing names.
2014-06-10 17:15 [PATCH 1/2] BDW: Adding Reserved PCI IDs Rodrigo Vivi
@ 2014-06-10 17:15 ` Rodrigo Vivi
2014-06-24 10:14 ` [PATCH] " Rodrigo Vivi
2014-06-11 6:08 ` [PATCH 1/2] BDW: Adding Reserved PCI IDs Chris Wilson
1 sibling, 1 reply; 6+ messages in thread
From: Rodrigo Vivi @ 2014-06-10 17:15 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Even the unknown/reserved ones might stay with HD Graphics.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
man/intel.man | 7 +++++--
src/intel_module.c | 32 +++++++++++++++++++++++++++++---
2 files changed, 34 insertions(+), 5 deletions(-)
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 223ea81..730b279 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"},
+
{-1, NULL} /* Sentinel */
};
@@ -401,9 +427,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,
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] BDW: Adding Reserved PCI IDs.
2014-06-10 17:15 [PATCH 1/2] BDW: Adding Reserved PCI IDs Rodrigo Vivi
2014-06-10 17:15 ` [PATCH 2/2] BDW: Adding Marketing names Rodrigo Vivi
@ 2014-06-11 6:08 ` Chris Wilson
2014-06-11 14:49 ` Rodrigo Vivi
1 sibling, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2014-06-11 6:08 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Tue, Jun 10, 2014 at 10:15:38AM -0700, Rodrigo Vivi wrote:
> These PCI IDs are reserved on BSpec and can be used at any time in the future.
> So let's add this now in order to avoid issues that we already faced on previous
> platforms, like finding out about new ids when user reported accelaration weren't
> enabled.
I'm going to hold off applying this until the kernel patch lands (and we
can cite its commit). It is much easier if this file remains a
duplicate.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] BDW: Adding Reserved PCI IDs.
2014-06-11 6:08 ` [PATCH 1/2] BDW: Adding Reserved PCI IDs Chris Wilson
@ 2014-06-11 14:49 ` Rodrigo Vivi
0 siblings, 0 replies; 6+ messages in thread
From: Rodrigo Vivi @ 2014-06-11 14:49 UTC (permalink / raw)
To: Chris Wilson, Rodrigo Vivi, intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 941 bytes --]
On Tue, Jun 10, 2014 at 11:08 PM, Chris Wilson <chris@chris-wilson.co.uk>
wrote:
> On Tue, Jun 10, 2014 at 10:15:38AM -0700, Rodrigo Vivi wrote:
> > These PCI IDs are reserved on BSpec and can be used at any time in the
> future.
> > So let's add this now in order to avoid issues that we already faced on
> previous
> > platforms, like finding out about new ids when user reported
> accelaration weren't
> > enabled.
>
> I'm going to hold off applying this until the kernel patch lands (and we
> can cite its commit). It is much easier if this file remains a
> duplicate.
>
Sure. Makes sense.
I'm going to wait a rv-b there to update this one here.
> -Chris
>
> --
> Chris Wilson, Intel Open Source Technology Centre
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
[-- Attachment #1.2: Type: text/html, Size: 1869 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] BDW: Adding Marketing names.
2014-06-10 17:15 ` [PATCH 2/2] BDW: Adding Marketing names Rodrigo Vivi
@ 2014-06-24 10:14 ` Rodrigo Vivi
2014-06-24 19:56 ` Chris Wilson
0 siblings, 1 reply; 6+ messages in thread
From: Rodrigo Vivi @ 2014-06-24 10:14 UTC (permalink / raw)
To: intel-gfx; +Cc: Rodrigo Vivi
Even the unknown/reserved ones might stay with HD Graphics.
v2: Add missing names to intel.man and README files as well. (Chris)
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
README | 3 +++
man/intel.man | 7 +++++--
src/intel_module.c | 32 +++++++++++++++++++++++++++++---
3 files changed, 37 insertions(+), 5 deletions(-)
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,
--
1.9.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] BDW: Adding Marketing names.
2014-06-24 10:14 ` [PATCH] " Rodrigo Vivi
@ 2014-06-24 19:56 ` Chris Wilson
0 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2014-06-24 19:56 UTC (permalink / raw)
To: Rodrigo Vivi; +Cc: intel-gfx
On Tue, Jun 24, 2014 at 03:14:54AM -0700, Rodrigo Vivi wrote:
> Even the unknown/reserved ones might stay with HD Graphics.
>
> v2: Add missing names to intel.man and README files as well. (Chris)
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Thanks, pushed with a refreshed i915_pciids.h
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-06-24 19:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-10 17:15 [PATCH 1/2] BDW: Adding Reserved PCI IDs Rodrigo Vivi
2014-06-10 17:15 ` [PATCH 2/2] BDW: Adding Marketing names Rodrigo Vivi
2014-06-24 10:14 ` [PATCH] " Rodrigo Vivi
2014-06-24 19:56 ` Chris Wilson
2014-06-11 6:08 ` [PATCH 1/2] BDW: Adding Reserved PCI IDs Chris Wilson
2014-06-11 14:49 ` Rodrigo Vivi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.