| From 1a7b315d5a3edd7f6933786ebdc0826e2f30684a Mon Sep 17 00:00:00 2001 |
| From: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Date: Tue, 3 Jan 2017 18:04:19 -0200 |
| Subject: [PATCH] drm/i915: more .is_mobile cleanups for BDW |
| |
| commit 0784bc624ae9be4269f8129572ee164ca680ca7c upstream. |
| |
| Commit 8d9c20e1d1e3 ("drm/i915: Remove .is_mobile field from platform |
| struct") removed mobile vs desktop differences for HSW+, but forgot |
| the Broadwell reserved IDs, so do it now. |
| |
| It's interesting to notice that these IDs are used by early-quirks.c |
| but are *not* used by i915_pci.c. |
| |
| Cc: Carlos Santa <carlos.santa@intel.com> |
| Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Link: http://patchwork.freedesktop.org/patch/msgid/1483473860-17644-2-git-send-email-paulo.r.zanoni@intel.com |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h |
| index 77b6bcb60f2b..61766a420f6b 100644 |
| --- a/include/drm/i915_pciids.h |
| +++ b/include/drm/i915_pciids.h |
| @@ -226,21 +226,18 @@ |
| INTEL_VGA_DEVICE(0x162A, info), /* Server */ \ |
| INTEL_VGA_DEVICE(0x162D, info) /* Workstation */ |
| |
| -#define INTEL_BDW_RSVDM_IDS(info) \ |
| +#define INTEL_BDW_RSVD_IDS(info) \ |
| INTEL_VGA_DEVICE(0x1632, info), /* ULT */ \ |
| INTEL_VGA_DEVICE(0x1636, info), /* ULT */ \ |
| INTEL_VGA_DEVICE(0x163B, info), /* Iris */ \ |
| - INTEL_VGA_DEVICE(0x163E, info) /* ULX */ |
| - |
| -#define INTEL_BDW_RSVDD_IDS(info) \ |
| + INTEL_VGA_DEVICE(0x163E, info), /* ULX */ \ |
| INTEL_VGA_DEVICE(0x163A, info), /* Server */ \ |
| INTEL_VGA_DEVICE(0x163D, info) /* Workstation */ |
| |
| #define INTEL_BDW_IDS(info) \ |
| INTEL_BDW_GT12_IDS(info), \ |
| INTEL_BDW_GT3_IDS(info), \ |
| - INTEL_BDW_RSVDM_IDS(info), \ |
| - INTEL_BDW_RSVDD_IDS(info) |
| + INTEL_BDW_RSVD_IDS(info) |
| |
| #define INTEL_CHV_IDS(info) \ |
| INTEL_VGA_DEVICE(0x22b0, info), \ |
| -- |
| 2.12.0 |
| |
