diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-12 23:12:50 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-12 23:12:50 -0400 |
| commit | 8282c7fa53ca2c46d8e2d682175d8966a2a7862d (patch) | |
| tree | c9102ff43ca30a36266c924565087d6f791b76b4 | |
| parent | c44e6bce26b2e0b41679b2d243950fcacf585b66 (diff) | |
| download | longterm-queue-4.8-8282c7fa53ca2c46d8e2d682175d8966a2a7862d.tar.gz | |
drm: add i915 dependency patch for next patch #2
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-i915-fix-INTEL_BDW_IDS-definition.patch | 34 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/queue/drm-i915-fix-INTEL_BDW_IDS-definition.patch b/queue/drm-i915-fix-INTEL_BDW_IDS-definition.patch new file mode 100644 index 0000000..621688f --- /dev/null +++ b/queue/drm-i915-fix-INTEL_BDW_IDS-definition.patch @@ -0,0 +1,34 @@ +From 7fbd995ce4241e98d30859405504c3fb279c4ccb Mon Sep 17 00:00:00 2001 +From: Paulo Zanoni <paulo.r.zanoni@intel.com> +Date: Tue, 3 Jan 2017 18:04:18 -0200 +Subject: [PATCH] drm/i915: fix INTEL_BDW_IDS definition + +commit 7fbd995ce4241e98d30859405504c3fb279c4ccb upstream. + +Remove duplicated IDs from the list. Currently, this definition is +only used by early-quirks.c. From my understanding of the code, having +duplicated IDs shouldn't be causing any bugs. + +Fixes: 8d9c20e1d1e3 ("drm/i915: Remove .is_mobile field from platform struct") +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-1-git-send-email-paulo.r.zanoni@intel.com + +diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h +index aeb36cb0854f..6588dd1d88c5 100644 +--- a/include/drm/i915_pciids.h ++++ b/include/drm/i915_pciids.h +@@ -240,8 +240,6 @@ + INTEL_BDW_GT12_IDS(info), \ + INTEL_BDW_GT3_IDS(info), \ + INTEL_BDW_RSVDM_IDS(info), \ +- INTEL_BDW_GT12_IDS(info), \ +- INTEL_BDW_GT3_IDS(info), \ + INTEL_BDW_RSVDD_IDS(info) + + #define INTEL_CHV_IDS(info) \ +-- +2.12.0 + diff --git a/queue/series b/queue/series index dcf875e..eb2f679 100644 --- a/queue/series +++ b/queue/series @@ -79,6 +79,7 @@ HID-usbhid-Add-quirk-for-the-Futaba-TOSD-5711BB-VFD.patch HID-usbhid-Add-quirk-for-Mayflash-Dragonrise-Dolphin.patch drm-edid-constify-edid-quirk-list.patch drm-i915-Remove-.is_mobile-field-from-platform-struc.patch +drm-i915-fix-INTEL_BDW_IDS-definition.patch drm-i915-more-.is_mobile-cleanups-for-BDW.patch drm-i915-actually-drive-the-BDW-reserved-IDs.patch ASoC-Intel-bytcr_rt5640-quirks-for-Insyde-devices.patch |