| From 6b96d705f3cf435b0b8835b12c9742513c77fed6 Mon Sep 17 00:00:00 2001 |
| From: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Date: Mon, 19 Jan 2015 16:16:15 -0800 |
| Subject: drm/i915: BDW Fix Halo PCI IDs marked as ULT. |
| |
| From: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| |
| commit 6b96d705f3cf435b0b8835b12c9742513c77fed6 upstream. |
| |
| 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@intel.com> |
| Cc: Guo Jinxian <jinxianx.guo@intel.com> |
| Cc: Jani Nikula <jani.nikula@intel.com> |
| Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Signed-off-by: Jani Nikula <jani.nikula@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/i915/i915_drv.h | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/i915/i915_drv.h |
| +++ b/drivers/gpu/drm/i915/i915_drv.h |
| @@ -2076,8 +2076,7 @@ struct drm_i915_cmd_table { |
| #define IS_HSW_EARLY_SDV(dev) (IS_HASWELL(dev) && \ |
| (INTEL_DEVID(dev) & 0xFF00) == 0x0C00) |
| #define IS_BDW_ULT(dev) (IS_BROADWELL(dev) && \ |
| - ((INTEL_DEVID(dev) & 0xf) == 0x2 || \ |
| - (INTEL_DEVID(dev) & 0xf) == 0x6 || \ |
| + ((INTEL_DEVID(dev) & 0xf) == 0x6 || \ |
| (INTEL_DEVID(dev) & 0xf) == 0xe)) |
| #define IS_HSW_ULT(dev) (IS_HASWELL(dev) && \ |
| (INTEL_DEVID(dev) & 0xFF00) == 0x0A00) |
