[SRU][Trusty][PATCH 2/2] UBUNTU: SAUCE: drm/i915: BDW Fix Halo PCI IDs marked as ULT.

[Joseph Salisbury]

From: Rodrigo Vivi <rodrigo.vivi at intel.com>

BugLink: http://bugs.launchpad.net/bugs/1423292

BDW with PCI-IDs ended in "2" aren't ULT, but HALO.
Let's fix it and at least allow VGA to work on this units.

v2: forgot ammend and v1 doesn't compile

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87220
Cc: Xion Zhang <xiong.y.zhang at intel.com>
Cc: Guo Jinxian <jinxianx.guo at intel.com>
Cc: Jani Nikula <jani.nikula at intel.com>
Cc: Stable <stable at vger.kernel.org>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
(backport from commit 6b96d705f3cf435b0b8835b12c9742513c77fed6)
Signed-off-by: Joseph Salisbury <joseph.salisbury at canonical.com>
---
 ubuntu/i915/i915_drv.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ubuntu/i915/i915_drv.h b/ubuntu/i915/i915_drv.h
index f66e738..bd8cae8 100644
--- a/ubuntu/i915/i915_drv.h
+++ b/ubuntu/i915/i915_drv.h
@@ -1935,8 +1935,7 @@ struct drm_i915_cmd_table {
 #define IS_HSW_EARLY_SDV(dev)	(IS_HASWELL(dev) && \
 				 ((dev)->pdev->device & 0xFF00) == 0x0C00)
 #define IS_BDW_ULT(dev)		(IS_BROADWELL(dev) && \
-				 (((dev)->pdev->device & 0xf) == 0x2  || \
-				 ((dev)->pdev->device & 0xf) == 0x6 || \
+				 (((dev)->pdev->device & 0xf) == 0x6  || \
 				 ((dev)->pdev->device & 0xf) == 0xe))
 #define IS_HSW_ULT(dev)		(IS_HASWELL(dev) && \
 				 ((dev)->pdev->device & 0xFF00) == 0x0A00)
-- 
2.1.0