Skip to contentSkip to conversation

drm/i915: BDW: Adding Reserved PCI IDs.

PATCH In review Rodrigo Vivi 5 participants 7 messages Jun 11, 2014 – Jun 24, 2014 DRM drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: BDW: Adding Reserved PCI IDs.

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.

---
 include/drm/i915_pciids.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
include/drm/i915_pciids.h +10 -2
index 0572035..a70d456 100644
@@ -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), \
Signature · 1 line
1.9.3
#1 lore raw
Quoted 15 lines · 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.

---
 include/drm/i915_pciids.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
include/drm/i915_pciids.h +0 -0
index 0572035..a70d456 100644

include/drm/i915_pciids.h line 245

Quoted 9 lines
include/drm/i915_pciids.h +6 -0
@@ -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)
+

Assuming the IDs are ever used, the gt count should be right. 4 is invalid. Can you please use the correct GT value for the reserved IDs? I wouldn't bother creating a separate reserved structure since we already have the list.

Quoted 21 lines
include/drm/i915_pciids.h +4 -2
 #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), \
Signature · 6 lines
1.9.3

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center
#2 lore raw

PATCH 1/1 drm/i915: BDW: Adding Reserved PCI IDs.

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.

v2: Reserved IDs doesn't have GT defined. So, creating a separated list. (Ben)

---
 include/drm/i915_pciids.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
include/drm/i915_pciids.h +14 -2
index 0572035..0968478 100644
@@ -237,13 +237,25 @@
 #define INTEL_BDW_GT3D_IDS(info) \
 	_INTEL_BDW_D_IDS(3, info)
 
+#define INTEL_BDW_RSVDM_IDS(info) \
+	INTEL_VGA_DEVICE(0x1632, info), \
+	INTEL_VGA_DEVICE(0x1636, info), \
+	INTEL_VGA_DEVICE(0x163B, info), \
+	INTEL_VGA_DEVICE(0x163A, info)
+
+#define INTEL_BDW_RSVDD_IDS(info) \
+	INTEL_VGA_DEVICE(0x163D, info), \
+	INTEL_VGA_DEVICE(0x163E, 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), \
Signature · 1 line
1.9.3
Reviewed-by on v1 1/1
#3 lore raw
Quoted 35 lines · 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.

v2: Reserved IDs doesn't have GT defined. So, creating a separated list. (Ben)

---
 include/drm/i915_pciids.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
include/drm/i915_pciids.h +11 -1
index 0572035..0968478 100644
@@ -237,13 +237,25 @@
 #define INTEL_BDW_GT3D_IDS(info) \
 	_INTEL_BDW_D_IDS(3, info)
 
+#define INTEL_BDW_RSVDM_IDS(info) \
+	INTEL_VGA_DEVICE(0x1632, info), \
+	INTEL_VGA_DEVICE(0x1636, info), \
+	INTEL_VGA_DEVICE(0x163B, info), \
+	INTEL_VGA_DEVICE(0x163A, info)
+
+#define INTEL_BDW_RSVDD_IDS(info) \
+	INTEL_VGA_DEVICE(0x163D, info), \
+	INTEL_VGA_DEVICE(0x163E, info)
+
 #define INTEL_BDW_M_IDS(info) \
 	INTEL_BDW_GT12M_IDS(info), \
-	INTEL_BDW_GT3M_IDS(info)
+	INTEL_BDW_GT3M_IDS(info), \

include/drm/i915_pciids.h line 261

Quoted 10 lines
include/drm/i915_pciids.h +3 -1
+	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), \

I thought we saved off the GT info, but now that I actually look at the code, we do not. Therefore, I actually think v1 is a better patch.

In either case, both v1 and v2 are:

I apologize for the extra work.

Signature · 1 line
Ben Widawsky, Intel Open Source Technology Center
#4 lore raw

Hi Daniel,

please consider to merge the first version. So we can move fwd with ddx patche followed by proper marketing names.

Thanks,
Rodrigo.

Quoted 66 lines · Ben Widawsky
Quoted 1 line · Rodrigo Vivi

These PCI IDs are reserved on BSpec and can be used at any time in the

future.

Quoted 1 line

So let's add this now in order to avoid issues that we already faced on

previous

Quoted 1 line

platforms, like finding out about new ids when user reported

accelaration weren't

Quoted 3 lines

enabled.

v2: Reserved IDs doesn't have GT defined. So, creating a separated list.

(Ben)

Quoted 29 lines
---
 include/drm/i915_pciids.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
include/drm/i915_pciids.h +11 -1
index 0572035..0968478 100644
@@ -237,13 +237,25 @@
 #define INTEL_BDW_GT3D_IDS(info) \
      _INTEL_BDW_D_IDS(3, info)
 
+#define INTEL_BDW_RSVDM_IDS(info) \
+     INTEL_VGA_DEVICE(0x1632, info), \
+     INTEL_VGA_DEVICE(0x1636, info), \
+     INTEL_VGA_DEVICE(0x163B, info), \
+     INTEL_VGA_DEVICE(0x163A, info)
+
+#define INTEL_BDW_RSVDD_IDS(info) \
+     INTEL_VGA_DEVICE(0x163D, info), \
+     INTEL_VGA_DEVICE(0x163E, info)
+
 #define INTEL_BDW_M_IDS(info) \
      INTEL_BDW_GT12M_IDS(info), \
-     INTEL_BDW_GT3M_IDS(info)
+     INTEL_BDW_GT3M_IDS(info), \

include/drm/i915_pciids.h line 261

Quoted 10 lines
include/drm/i915_pciids.h +3 -1
+     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), \

I thought we saved off the GT info, but now that I actually look at the code, we do not. Therefore, I actually think v1 is a better patch.

In either case, both v1 and v2 are:

I apologize for the extra work.

--
Ben Widawsky, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 2 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
Quoted 4 lines · Rodrigo Vivi

Hi Daniel,

please consider to merge the first version. So we can move fwd with ddx patche followed by proper marketing names.

Pushed v1 to -fixes, thanks for the patch and review.

BR,
Jani.

Quoted 83 lines

Thanks,
Rodrigo.

Quoted 66 lines · Ben Widawsky
Quoted 1 line · Rodrigo Vivi

These PCI IDs are reserved on BSpec and can be used at any time in the

future.

Quoted 1 line

So let's add this now in order to avoid issues that we already faced on

previous

Quoted 1 line

platforms, like finding out about new ids when user reported

accelaration weren't

Quoted 3 lines

enabled.

v2: Reserved IDs doesn't have GT defined. So, creating a separated list.

(Ben)

Quoted 29 lines
---
 include/drm/i915_pciids.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
include/drm/i915_pciids.h +11 -1
index 0572035..0968478 100644
@@ -237,13 +237,25 @@
 #define INTEL_BDW_GT3D_IDS(info) \
      _INTEL_BDW_D_IDS(3, info)
 
+#define INTEL_BDW_RSVDM_IDS(info) \
+     INTEL_VGA_DEVICE(0x1632, info), \
+     INTEL_VGA_DEVICE(0x1636, info), \
+     INTEL_VGA_DEVICE(0x163B, info), \
+     INTEL_VGA_DEVICE(0x163A, info)
+
+#define INTEL_BDW_RSVDD_IDS(info) \
+     INTEL_VGA_DEVICE(0x163D, info), \
+     INTEL_VGA_DEVICE(0x163E, info)
+
 #define INTEL_BDW_M_IDS(info) \
      INTEL_BDW_GT12M_IDS(info), \
-     INTEL_BDW_GT3M_IDS(info)
+     INTEL_BDW_GT3M_IDS(info), \

include/drm/i915_pciids.h line 261

Quoted 10 lines
include/drm/i915_pciids.h +3 -1
+     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), \

I thought we saved off the GT info, but now that I actually look at the code, we do not. Therefore, I actually think v1 is a better patch.

In either case, both v1 and v2 are:

I apologize for the extra work.

--
Ben Widawsky, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 6 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
#6 lore raw
Quoted 7 lines · Jani Nikula
Quoted 4 lines · Rodrigo Vivi

Hi Daniel,

please consider to merge the first version. So we can move fwd with ddx patche followed by proper marketing names.

Pushed v1 to -fixes, thanks for the patch and review.

Hey Rodrigo, I spotted another place we have identifier strings... In xf86-video-intel/README. :|
-Chris

Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre