From fd98882b43a8b1826e378a0004ce1ab952776bd8 Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Sat, 20 Jan 2018 21:32:42 +0200
Subject: [PATCH] drm/i915: Backport fix for a bad bitmask.

No-op, we explictly disable stolen memory in i915_gem_init_stolen().
---
 sys/dev/drm/i915/i915_reg.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys/dev/drm/i915/i915_reg.h b/sys/dev/drm/i915/i915_reg.h
index b09d975d7d..bd2e9a1713 100644
--- a/sys/dev/drm/i915/i915_reg.h
+++ b/sys/dev/drm/i915/i915_reg.h
@@ -87,7 +87,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
 #define   DEVEN_MCHBAR_EN (1 << 28)
 
 #define BSM 0x5c
+#if 0 /* fix from upstream */
 #define   BSM_MASK (0xFFFF << 20)
+#else
+#define   BSM_MASK	(-(1u << 20))
+#endif
 
 #define HPLLCC	0xc0 /* 85x only */
 #define   GC_CLOCK_CONTROL_MASK		(0x7 << 0)
-- 
2.41.0