Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-19 16:51:14 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-19 16:52:29 +0200
commitd9cacaaf23fec4a0160f63b1ef076c87a1c70870 (patch)
treef42c6e16b49bbb85182555468736214693ccebed
parent3a0bafca7d2c7704948dffb481e1bbe6dc595fed (diff)
drm/i915: Remove redundant device id from IS_IRONLAKE_M macro
(jsc#SLE-4986).
-rw-r--r--patches.drm/drm-i915-Remove-redundant-device-id-from-IS_IRONLAKE.patch61
-rw-r--r--series.conf1
2 files changed, 62 insertions, 0 deletions
diff --git a/patches.drm/drm-i915-Remove-redundant-device-id-from-IS_IRONLAKE.patch b/patches.drm/drm-i915-Remove-redundant-device-id-from-IS_IRONLAKE.patch
new file mode 100644
index 0000000000..977c646223
--- /dev/null
+++ b/patches.drm/drm-i915-Remove-redundant-device-id-from-IS_IRONLAKE.patch
@@ -0,0 +1,61 @@
+From e08891a5b7e6d8b66c09bd6b0a1d3544083461c4 Mon Sep 17 00:00:00 2001
+From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Date: Tue, 26 Mar 2019 07:40:55 +0000
+Subject: [PATCH] drm/i915: Remove redundant device id from IS_IRONLAKE_M macro
+Mime-version: 1.0
+Content-type: text/plain; charset=UTF-8
+Content-transfer-encoding: 8bit
+Git-commit: e08891a5b7e6d8b66c09bd6b0a1d3544083461c4
+Patch-mainline: v5.2-rc1
+References: jsc#SLE-4986
+
+IS_IRONLAKE_M can use the already defined intel_device_info.is_mobile for
+this platform, so remove the instance of Ironlake's mobile device id from
+the header file and replace it with an IS_MOBILE check.
+
+V2: * Improved commit text. (Chris)
+
+V3: * Rebased for EHL.
+
+Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
+Cc: Chris Wilson <chris@chris-wilson.co.uk>
+Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+Link: https://patchwork.freedesktop.org/patch/msgid/20190326074057.27833-3-tvrtko.ursulin@linux.intel.com
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/gpu/drm/i915/i915_drv.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -2370,6 +2370,8 @@ intel_info(const struct drm_i915_private
+
+ #define IS_PLATFORM(dev_priv, p) ((dev_priv)->info.platform_mask & BIT(p))
+
++#define IS_MOBILE(dev_priv) (INTEL_INFO(dev_priv)->is_mobile)
++
+ #define IS_I830(dev_priv) IS_PLATFORM(dev_priv, INTEL_I830)
+ #define IS_I845G(dev_priv) IS_PLATFORM(dev_priv, INTEL_I845G)
+ #define IS_I85X(dev_priv) IS_PLATFORM(dev_priv, INTEL_I85X)
+@@ -2385,7 +2387,9 @@ intel_info(const struct drm_i915_private
+ #define IS_G4X(dev_priv) (IS_G45(dev_priv) || IS_GM45(dev_priv))
+ #define IS_PINEVIEW(dev_priv) IS_PLATFORM(dev_priv, INTEL_PINEVIEW)
+ #define IS_G33(dev_priv) IS_PLATFORM(dev_priv, INTEL_G33)
+-#define IS_IRONLAKE_M(dev_priv) (INTEL_DEVID(dev_priv) == 0x0046)
++#define IS_IRONLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_IRONLAKE)
++#define IS_IRONLAKE_M(dev_priv) \
++ (IS_PLATFORM(dev_priv, INTEL_IRONLAKE) && IS_MOBILE(dev_priv))
+ #define IS_IVYBRIDGE(dev_priv) IS_PLATFORM(dev_priv, INTEL_IVYBRIDGE)
+ #define IS_IVB_GT1(dev_priv) (IS_IVYBRIDGE(dev_priv) && \
+ (dev_priv)->info.gt == 1)
+@@ -2400,7 +2404,6 @@ intel_info(const struct drm_i915_private
+ #define IS_COFFEELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_COFFEELAKE)
+ #define IS_CANNONLAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_CANNONLAKE)
+ #define IS_ICELAKE(dev_priv) IS_PLATFORM(dev_priv, INTEL_ICELAKE)
+-#define IS_MOBILE(dev_priv) ((dev_priv)->info.is_mobile)
+ #define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \
+ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)
+ #define IS_BDW_ULT(dev_priv) (IS_BROADWELL(dev_priv) && \
diff --git a/series.conf b/series.conf
index aac53b6562..50e8aff541 100644
--- a/series.conf
+++ b/series.conf
@@ -46803,6 +46803,7 @@
patches.drm/drm-amd-display-Use-plane-color_space-for-dpp-if-spe.patch
patches.drm/drm-vmwgfx-Remove-set-but-not-used-variable-restart.patch
patches.drm/drm-i915-Split-Pineview-device-info-into-desktop-and.patch
+ patches.drm/drm-i915-Remove-redundant-device-id-from-IS_IRONLAKE.patch
patches.drm/drm-i915-Force-2-96-MHz-cdclk-on-glk-cnl-when-audio-.patch
patches.drm/0004-drm-i915-gvt-Fix-incorrect-mask-of-mmio-0x22028-in-g.patch
patches.drm/0005-drm-meson-add-size-and-alignment-requirements-for-du.patch