Skip to contentSkip to conversation

drm-tip: 2017y-09m-07d-21h-01m-55s UTC integration manifest

PATCH New Joonas Lahtinen 1 participant 2 messages Sep 11, 2017

Subsystems (2)
lore
Share & tools
lore

Joonas Lahtinen

author maintainer
#0 lore raw

PATCH 1/3 drm-tip: 2017y-09m-07d-21h-01m-55s UTC integration manifest

From: Chris Wilson <[email protected]>

---
 integration-manifest | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 integration-manifest
integration-manifest new file +22 -0
new file mode 100644
index 000000000000..1f3c6bf6d582
@@ -0,0 +1,22 @@
+drm-intel drm-intel-fixes cc4a41fe5541a73019a864883297bd5043aa6d98
+	Linux 4.13-rc7
+drm-upstream drm-fixes 58aec872658b7beab6919073d3f629e18f0df7bd
+	Merge branch 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux into drm-fixes
+drm-intel drm-intel-next-fixes 426ca2cb69cda59f32c251d1f3e111aee8c42814
+	Merge tag 'gvt-fixes-2017-09-06' of https://github.com/01org/gvt-linux into drm-intel-next-fixes
+drm-intel drm-intel-next-queued 212154ba4d1c31ad828b8e1e2d4ecd4adcb02796
+	drm/i915: Transform WaDisablePooledEuLoadBalancingFix into a simple register write
+drm-upstream drm-next 7846b12fe0b5feab5446d892f41b5140c1419109
+	Merge branch 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_linux into drm-next
+sound-upstream for-next 2a0d85d9add77bb7a4ddd61557ffb21ca5370d15
+	ALSA: asihpi: Kill BUG_ON() usages
+sound-upstream for-linus 2a0d85d9add77bb7a4ddd61557ffb21ca5370d15
+	ALSA: asihpi: Kill BUG_ON() usages
+drm-intel topic/core-for-CI 5743745cfc7068b873b5d02e493119cbfaa3b5b6
+	ALSA: hda: parse bus capablities after reset
+drm-misc drm-misc-next 67a3b63a54cbe18944191f43d644686731cf30c7
+	drm: gma500: fix logic error
+drm-misc drm-misc-next-fixes f44d85389e17b2e960620c1c6d89bda978a11f2b
+	drm: rename u32 in __u32 in uapi
+drm-misc drm-misc-fixes 79964dbaf662229253b281c42e82e2675a9d3b80
+	drm/bridge/sii8620: Fix memory corruption
Signature · 6 lines
2.13.5

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author maintainer
#1 lore raw

PATCH 2/3 drm/i915: Introduce INTEL_GEN_MASK

Split INTEL_GEN_MASK out of IS_GEN macro, and make it usable within static declarations (unlike combound statements).

---
 drivers/gpu/drm/i915/i915_drv.h | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +10 -12
index 63ca2ffcafef..c3f9d7d7b146 100644
@@ -2873,23 +2873,21 @@ intel_info(const struct drm_i915_private *dev_priv)
 #define INTEL_REVID(dev_priv)	((dev_priv)->drm.pdev->revision)
 
 #define GEN_FOREVER (0)
+
+#define INTEL_GEN_MASK(s, e) ( \
+        BUILD_BUG_ON_ZERO(!__builtin_constant_p(s)) + \
+        BUILD_BUG_ON_ZERO(!__builtin_constant_p(e)) + \
+        GENMASK((e) != GEN_FOREVER ? (e) - 1 : BITS_PER_LONG - 1, \
+	        (s) != GEN_FOREVER ? (s) - 1 : 0) \
+)
+
 /*
  * Returns true if Gen is in inclusive range [Start, End].
  *
  * Use GEN_FOREVER for unbound start and or end.
  */
-#define IS_GEN(dev_priv, s, e) ({ \
-	unsigned int __s = (s), __e = (e); \
-	BUILD_BUG_ON(!__builtin_constant_p(s)); \
-	BUILD_BUG_ON(!__builtin_constant_p(e)); \
-	if ((__s) != GEN_FOREVER) \
-		__s = (s) - 1; \
-	if ((__e) == GEN_FOREVER) \
-		__e = BITS_PER_LONG - 1; \
-	else \
-		__e = (e) - 1; \
-	!!((dev_priv)->info.gen_mask & GENMASK((__e), (__s))); \
-})
+#define IS_GEN(dev_priv, s, e) \
+	(!!((dev_priv)->info.gen_mask & INTEL_GEN_MASK((s), (e))))
 
 /*
  * Return true if revision is in range [since,until] inclusive.
Signature · 6 lines
2.13.5

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