Skip to contentSkip to conversation

drm/i915: make Pineview a platform of its own

PATCH In review Jani Nikula 4 participants 4 messages Dec 7, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: make Pineview a platform of its own

Pineview deserves to use its own platform enum (which was already added, unused, previously).

Cc Ville Syrjälä <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Joonas Lahtinen <[email protected]>

---

The wrinkle here is that IS_G33() still has to match both G33 and Pineview. I'd prefer it if G33 *only* matched G33 and *not* Pineview. To fix this, the alternatives are to a) add an additional IS_FOO() that matches both, or b) replaces all references to IS_G33() with IS_G33() || IS_PINEVIEW(). I don't like either, but I also don't like .is_pineview. We should reserve those for feature-ish things. Or just apply this and leave it at that. Opinions?

---
 drivers/gpu/drm/i915/i915_drv.h | 6 +++---
 drivers/gpu/drm/i915/i915_pci.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -3
index 8daa4fb13b52..4236cdd25b32 100644
@@ -688,7 +688,6 @@ struct intel_csr {
 
 #define DEV_INFO_FOR_EACH_FLAG(func) \
 	func(is_mobile); \
-	func(is_pineview); \
 	func(is_lp); \
 	func(is_alpha_support); \
 	/* Keep has_* in alphabetical order */ \
@@ -2530,8 +2529,9 @@ intel_info(const struct drm_i915_private *dev_priv)
 #define IS_G4X(dev_priv)	(IS_G45(dev_priv) || IS_GM45(dev_priv))
 #define IS_PINEVIEW_G(dev_priv)	(INTEL_DEVID(dev_priv) == 0xa001)
 #define IS_PINEVIEW_M(dev_priv)	(INTEL_DEVID(dev_priv) == 0xa011)
-#define IS_PINEVIEW(dev_priv)	((dev_priv)->info.is_pineview)
-#define IS_G33(dev_priv)	((dev_priv)->info.platform == INTEL_G33)
+#define IS_PINEVIEW(dev_priv)	((dev_priv)->info.platform == INTEL_PINEVIEW)
+#define IS_G33(dev_priv)	((dev_priv)->info.platform == INTEL_G33 || \
+				 IS_PINEVIEW(dev_priv))
 #define IS_IRONLAKE_M(dev_priv)	(INTEL_DEVID(dev_priv) == 0x0046)
 #define IS_IVYBRIDGE(dev_priv)	((dev_priv)->info.platform == INTEL_IVYBRIDGE)
 #define IS_IVB_GT1(dev_priv)	(INTEL_DEVID(dev_priv) == 0x0156 || \
drivers/gpu/drm/i915/i915_pci.c +1 -1
index f7ec6e944e09..93f50ef2a309 100644
@@ -141,7 +141,7 @@ static const struct intel_device_info intel_g33_info = {
 
 static const struct intel_device_info intel_pineview_info = {
 	GEN3_FEATURES,
-	.platform = INTEL_G33, .is_pineview = 1, .is_mobile = 1,
+	.platform = INTEL_PINEVIEW, .is_mobile = 1,
 	.has_hotplug = 1,
 	.has_overlay = 1,
 };
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 8 lines · Jani Nikula

Pineview deserves to use its own platform enum (which was already added, unused, previously).

Cc Ville Syrjälä <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Joonas Lahtinen <[email protected]>
Quoted 7 lines

---

The wrinkle here is that IS_G33() still has to match both G33 and Pineview. I'd prefer it if G33 *only* matched G33 and *not* Pineview. To fix this, the alternatives are to a) add an additional IS_FOO() that matches both, or b) replaces all references to IS_G33() with IS_G33() || IS_PINEVIEW().

This would be in line with what we did for VLV vs. CHV. So I think it would be OK.

Quoted 47 lines

I don't like either, but I also don't like
.is_pineview. We should reserve those for feature-ish things. Or just apply this and leave it at that. Opinions?

---
 drivers/gpu/drm/i915/i915_drv.h | 6 +++---
 drivers/gpu/drm/i915/i915_pci.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -3
index 8daa4fb13b52..4236cdd25b32 100644
@@ -688,7 +688,6 @@ struct intel_csr {
 
 #define DEV_INFO_FOR_EACH_FLAG(func) \
 	func(is_mobile); \
-	func(is_pineview); \
 	func(is_lp); \
 	func(is_alpha_support); \
 	/* Keep has_* in alphabetical order */ \
@@ -2530,8 +2529,9 @@ intel_info(const struct drm_i915_private *dev_priv)
 #define IS_G4X(dev_priv)	(IS_G45(dev_priv) || IS_GM45(dev_priv))
 #define IS_PINEVIEW_G(dev_priv)	(INTEL_DEVID(dev_priv) == 0xa001)
 #define IS_PINEVIEW_M(dev_priv)	(INTEL_DEVID(dev_priv) == 0xa011)
-#define IS_PINEVIEW(dev_priv)	((dev_priv)->info.is_pineview)
-#define IS_G33(dev_priv)	((dev_priv)->info.platform == INTEL_G33)
+#define IS_PINEVIEW(dev_priv)	((dev_priv)->info.platform == INTEL_PINEVIEW)
+#define IS_G33(dev_priv)	((dev_priv)->info.platform == INTEL_G33 || \
+				 IS_PINEVIEW(dev_priv))
 #define IS_IRONLAKE_M(dev_priv)	(INTEL_DEVID(dev_priv) == 0x0046)
 #define IS_IVYBRIDGE(dev_priv)	((dev_priv)->info.platform == INTEL_IVYBRIDGE)
 #define IS_IVB_GT1(dev_priv)	(INTEL_DEVID(dev_priv) == 0x0156 || \
drivers/gpu/drm/i915/i915_pci.c +1 -1
index f7ec6e944e09..93f50ef2a309 100644
@@ -141,7 +141,7 @@ static const struct intel_device_info intel_g33_info = {
 
 static const struct intel_device_info intel_pineview_info = {
 	GEN3_FEATURES,
-	.platform = INTEL_G33, .is_pineview = 1, .is_mobile = 1,
+	.platform = INTEL_PINEVIEW, .is_mobile = 1,
 	.has_hotplug = 1,
 	.has_overlay = 1,
 };
Signature · 1 line
2.1.4
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

✗ Fi.CI.BAT: warning for drm/i915: make Pineview a platform of its own

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: make Pineview a platform of its own
URL : https://patchwork.freedesktop.org/series/16490/
State : warning

== Summary ==

Series 16490v1 drm/i915: make Pineview a platform of its own
https://patchwork.freedesktop.org/api/1.0/series/16490/revisions/1/mbox/

Test kms_force_connector_basic:

        Subgroup force-connector-state:
                pass       -> DMESG-WARN (fi-snb-2520m)
fi-bdw-5557u     total:247  pass:219  dwarn:0   dfail:0   fail:0   skip:28 
fi-bsw-n3050     total:247  pass:195  dwarn:0   dfail:0   fail:0   skip:52 
fi-byt-j1900     total:247  pass:206  dwarn:0   dfail:0   fail:0   skip:41 
fi-byt-n2820     total:247  pass:202  dwarn:0   dfail:0   fail:0   skip:45 
fi-hsw-4770      total:247  pass:214  dwarn:0   dfail:0   fail:0   skip:33 
fi-hsw-4770r     total:247  pass:214  dwarn:0   dfail:0   fail:0   skip:33 
fi-ilk-650       total:247  pass:181  dwarn:0   dfail:0   fail:0   skip:66 
fi-ivb-3520m     total:247  pass:213  dwarn:0   dfail:0   fail:0   skip:34 
fi-ivb-3770      total:247  pass:212  dwarn:0   dfail:0   fail:0   skip:35 
fi-kbl-7500u     total:247  pass:212  dwarn:0   dfail:0   fail:0   skip:35 
fi-skl-6260u     total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-skl-6700hq    total:247  pass:214  dwarn:0   dfail:0   fail:0   skip:33 
fi-skl-6700k     total:247  pass:210  dwarn:3   dfail:0   fail:0   skip:34 
fi-skl-6770hq    total:247  pass:220  dwarn:0   dfail:0   fail:0   skip:27 
fi-snb-2520m     total:247  pass:201  dwarn:1   dfail:0   fail:0   skip:45 
fi-snb-2600      total:247  pass:201  dwarn:0   dfail:0   fail:0   skip:46 

a20a4a6107256124d136c8320fc3f7adef93bb8a drm-tip: 2016y-12m-07d-15h-56m-01s UTC integration manifest 8b8c20d drm/i915: make Pineview a platform of its own

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3218/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

Re: ✗ Fi.CI.BAT: warning for drm/i915: make Pineview a platform of its own

Quoted 6 lines

== Series Details ==

Series: drm/i915: make Pineview a platform of its own
URL : https://patchwork.freedesktop.org/series/16490/
State : warning

Quoted 8 lines

== Summary ==

Series 16490v1 drm/i915: make Pineview a platform of its own
https://patchwork.freedesktop.org/api/1.0/series/16490/revisions/1/mbox/

Test kms_force_connector_basic:

        Subgroup force-connector-state:
                pass       -> DMESG-WARN (fi-snb-2520m)

*ERROR* EDID checksum is invalid
=> https://bugs.freedesktop.org/show_bug.cgi?id=98625

Quoted 9 lines

fi-snb-2520m total:247 pass:201 dwarn:1 dfail:0 fail:0 skip:45

a20a4a6107256124d136c8320fc3f7adef93bb8a drm-tip: 2016y-12m-07d-15h- 56m-01s UTC integration manifest 8b8c20d drm/i915: make Pineview a platform of its own

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3218/

Jani Saarinen
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo

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