Merge tag 'drm-intel-next-2019-04-17' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

UAPI Changes:

- uAPI "Fixes:" patch for the upcoming kernel 5.1, included here too

  We have an Ack from the media folks (only current user) for this
  late tweak

Cross-subsystem Changes:

- ALSA: hda: Fix racy display power access (Takashi, Chris)

Driver Changes:

- DDI and MIPI-DSI clocks fixes for Icelake (Vandita)
- Fix Icelake frequency change/locking (RPS) (Mika)
- Temporarily disable ppGTT read-only bit on Icelake (Mika)
- Add missing Icelake W/As (Mika)
- Enable 12 deep CSB status FIFO on Icelake (Mika)
- Inherit more Icelake code for Elkhartlake (Bob, Jani)

- Handle catastrophic error on engine reset (Mika)
- Shortcut readiness to reset check (Mika)
- Regression fix for GEM_BUSY causing us to report a mixed uabi-class request as not busy (Chris)
- Revert back to max link rate and lane count on eDP (Jani)
- Fix pipe BPP readout for BXT/GLK DSI (Ville)
- Set DP min_bpp to 8*3 for non-RGB output formats (Ville)
- Enable coarse preemption boundaries for Gen8 (Chris)
- Do not enable FEC without DSC (Ville)
- Restore correct BXT DDI latency optim setting calculation (Ville)
- Always reset context's RING registers to avoid running workload twice during reset (Chris)
- Set GPU wedged on driver unload (Janusz)
- Consolidate two similar barries from timeline into one (Chris)
- Only reset the pinned kernel contexts on resume (Chris)
- Wakeref tracking improvements (Chris, Imre)
- Lockdep fixes for shrinker interactions (Chris)
- Bump ready tasks ahead of busywaits in prep of semaphore use (Chris)

- Huge step in splitting display code into fine grained files (Jani)
- Refactor the IRQ init/reset macros for code saving (Paulo)
- Convert IRQ initialization code to uncore MMIO access (Paulo)
- Convert workarounds code to use uncore MMIO access (Chris)
- Nuke drm_crtc_state and use intel_atomic_state instead (Manasi)
- Update SKL clock-gating WA (Radhakrishna, Ville)
- Isolate GuC reset code flow (Chris)
- Expose force_dsc_enable through debugfs (Manasi)
- Header standalone compile testing framework (Jani)
- Code cleanups to reduce driver footprint (Chris)
- PSR code fixes and cleanups (Jose)
- Sparse and kerneldoc updates (Chris)
- Suppress spurious combo PHY B warning (Vile)

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190418080426.GA6409@jlahtine-desk.ger.corp.intel.com

2 files changed, 141 insertions, 53 deletions

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index c7cdbfc4d033..6477da22af28 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -108,8 +108,10 @@
         INTEL_VGA_DEVICE(0x2e42, info), /* B43_G */ \
         INTEL_VGA_DEVICE(0x2e92, info)  /* B43_G.1 */
 
-#define INTEL_PINEVIEW_IDS(info)                        \
-        INTEL_VGA_DEVICE(0xa001, info),                 \
+#define INTEL_PINEVIEW_G_IDS(info) \
+        INTEL_VGA_DEVICE(0xa001, info)
+
+#define INTEL_PINEVIEW_M_IDS(info) \
         INTEL_VGA_DEVICE(0xa011, info)
 
 #define INTEL_IRONLAKE_D_IDS(info) \
@@ -166,7 +168,18 @@
 #define INTEL_IVB_Q_IDS(info) \
         INTEL_QUANTA_VGA_DEVICE(info) /* Quanta transcode */
 
+#define INTEL_HSW_ULT_GT1_IDS(info) \
+        INTEL_VGA_DEVICE(0x0A02, info), /* ULT GT1 desktop */ \
+        INTEL_VGA_DEVICE(0x0A0A, info), /* ULT GT1 server */ \
+        INTEL_VGA_DEVICE(0x0A0B, info), /* ULT GT1 reserved */ \
+        INTEL_VGA_DEVICE(0x0A06, info)  /* ULT GT1 mobile */
+
+#define INTEL_HSW_ULX_GT1_IDS(info) \
+        INTEL_VGA_DEVICE(0x0A0E, info) /* ULX GT1 mobile */
+
 #define INTEL_HSW_GT1_IDS(info) \
+        INTEL_HSW_ULT_GT1_IDS(info), \
+        INTEL_HSW_ULX_GT1_IDS(info), \
         INTEL_VGA_DEVICE(0x0402, info), /* GT1 desktop */ \
         INTEL_VGA_DEVICE(0x040a, info), /* GT1 server */ \
         INTEL_VGA_DEVICE(0x040B, info), /* GT1 reserved */ \
@@ -175,20 +188,26 @@
         INTEL_VGA_DEVICE(0x0C0A, info), /* SDV GT1 server */ \
         INTEL_VGA_DEVICE(0x0C0B, info), /* SDV GT1 reserved */ \
         INTEL_VGA_DEVICE(0x0C0E, info), /* SDV GT1 reserved */ \
-        INTEL_VGA_DEVICE(0x0A02, info), /* ULT GT1 desktop */ \
-        INTEL_VGA_DEVICE(0x0A0A, info), /* ULT GT1 server */ \
-        INTEL_VGA_DEVICE(0x0A0B, info), /* ULT GT1 reserved */ \
         INTEL_VGA_DEVICE(0x0D02, info), /* CRW GT1 desktop */ \
         INTEL_VGA_DEVICE(0x0D0A, info), /* CRW GT1 server */ \
         INTEL_VGA_DEVICE(0x0D0B, info), /* CRW GT1 reserved */ \
         INTEL_VGA_DEVICE(0x0D0E, info), /* CRW GT1 reserved */ \
         INTEL_VGA_DEVICE(0x0406, info), /* GT1 mobile */ \
         INTEL_VGA_DEVICE(0x0C06, info), /* SDV GT1 mobile */ \
-        INTEL_VGA_DEVICE(0x0A06, info), /* ULT GT1 mobile */ \
-        INTEL_VGA_DEVICE(0x0A0E, info), /* ULX GT1 mobile */ \
         INTEL_VGA_DEVICE(0x0D06, info)  /* CRW GT1 mobile */
 
+#define INTEL_HSW_ULT_GT2_IDS(info) \
+        INTEL_VGA_DEVICE(0x0A12, info), /* ULT GT2 desktop */ \
+        INTEL_VGA_DEVICE(0x0A1A, info), /* ULT GT2 server */ \
+        INTEL_VGA_DEVICE(0x0A1B, info), /* ULT GT2 reserved */ \
+        INTEL_VGA_DEVICE(0x0A16, info)  /* ULT GT2 mobile */
+
+#define INTEL_HSW_ULX_GT2_IDS(info) \
+        INTEL_VGA_DEVICE(0x0A1E, info) /* ULX GT2 mobile */ \
+
 #define INTEL_HSW_GT2_IDS(info) \
+        INTEL_HSW_ULT_GT2_IDS(info), \
+        INTEL_HSW_ULX_GT2_IDS(info), \
         INTEL_VGA_DEVICE(0x0412, info), /* GT2 desktop */ \
         INTEL_VGA_DEVICE(0x041a, info), /* GT2 server */ \
         INTEL_VGA_DEVICE(0x041B, info), /* GT2 reserved */ \
@@ -197,9 +216,6 @@
         INTEL_VGA_DEVICE(0x0C1A, info), /* SDV GT2 server */ \
         INTEL_VGA_DEVICE(0x0C1B, info), /* SDV GT2 reserved */ \
         INTEL_VGA_DEVICE(0x0C1E, info), /* SDV GT2 reserved */ \
-        INTEL_VGA_DEVICE(0x0A12, info), /* ULT GT2 desktop */ \
-        INTEL_VGA_DEVICE(0x0A1A, info), /* ULT GT2 server */ \
-        INTEL_VGA_DEVICE(0x0A1B, info), /* ULT GT2 reserved */ \
         INTEL_VGA_DEVICE(0x0D12, info), /* CRW GT2 desktop */ \
         INTEL_VGA_DEVICE(0x0D1A, info), /* CRW GT2 server */ \
         INTEL_VGA_DEVICE(0x0D1B, info), /* CRW GT2 reserved */ \
@@ -207,11 +223,17 @@
         INTEL_VGA_DEVICE(0x0416, info), /* GT2 mobile */ \
         INTEL_VGA_DEVICE(0x0426, info), /* GT2 mobile */ \
         INTEL_VGA_DEVICE(0x0C16, info), /* SDV GT2 mobile */ \
-        INTEL_VGA_DEVICE(0x0A16, info), /* ULT GT2 mobile */ \
-        INTEL_VGA_DEVICE(0x0A1E, info), /* ULX GT2 mobile */ \
         INTEL_VGA_DEVICE(0x0D16, info)  /* CRW GT2 mobile */
 
+#define INTEL_HSW_ULT_GT3_IDS(info) \
+        INTEL_VGA_DEVICE(0x0A22, info), /* ULT GT3 desktop */ \
+        INTEL_VGA_DEVICE(0x0A2A, info), /* ULT GT3 server */ \
+        INTEL_VGA_DEVICE(0x0A2B, info), /* ULT GT3 reserved */ \
+        INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
+        INTEL_VGA_DEVICE(0x0A2E, info)  /* ULT GT3 reserved */
+
 #define INTEL_HSW_GT3_IDS(info) \
+        INTEL_HSW_ULT_GT3_IDS(info), \
         INTEL_VGA_DEVICE(0x0422, info), /* GT3 desktop */ \
         INTEL_VGA_DEVICE(0x042a, info), /* GT3 server */ \
         INTEL_VGA_DEVICE(0x042B, info), /* GT3 reserved */ \
@@ -220,16 +242,11 @@
         INTEL_VGA_DEVICE(0x0C2A, info), /* SDV GT3 server */ \
         INTEL_VGA_DEVICE(0x0C2B, info), /* SDV GT3 reserved */ \
         INTEL_VGA_DEVICE(0x0C2E, info), /* SDV GT3 reserved */ \
-        INTEL_VGA_DEVICE(0x0A22, info), /* ULT GT3 desktop */ \
-        INTEL_VGA_DEVICE(0x0A2A, info), /* ULT GT3 server */ \
-        INTEL_VGA_DEVICE(0x0A2B, info), /* ULT GT3 reserved */ \
         INTEL_VGA_DEVICE(0x0D22, info), /* CRW GT3 desktop */ \
         INTEL_VGA_DEVICE(0x0D2A, info), /* CRW GT3 server */ \
         INTEL_VGA_DEVICE(0x0D2B, info), /* CRW GT3 reserved */ \
         INTEL_VGA_DEVICE(0x0D2E, info), /* CRW GT3 reserved */ \
         INTEL_VGA_DEVICE(0x0C26, info), /* SDV GT3 mobile */ \
-        INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \
-        INTEL_VGA_DEVICE(0x0A2E, info), /* ULT GT3 reserved */ \
         INTEL_VGA_DEVICE(0x0D26, info)  /* CRW GT3 mobile */
 
 #define INTEL_HSW_IDS(info) \
@@ -245,35 +262,59 @@
         INTEL_VGA_DEVICE(0x0157, info), \
         INTEL_VGA_DEVICE(0x0155, info)
 
-#define INTEL_BDW_GT1_IDS(info)  \
-        INTEL_VGA_DEVICE(0x1602, info), /* GT1 ULT */ \
+#define INTEL_BDW_ULT_GT1_IDS(info) \
         INTEL_VGA_DEVICE(0x1606, info), /* GT1 ULT */ \
-        INTEL_VGA_DEVICE(0x160B, info), /* GT1 Iris */ \
-        INTEL_VGA_DEVICE(0x160E, info), /* GT1 ULX */ \
+        INTEL_VGA_DEVICE(0x160B, info)  /* GT1 Iris */
+
+#define INTEL_BDW_ULX_GT1_IDS(info) \
+        INTEL_VGA_DEVICE(0x160E, info) /* GT1 ULX */
+
+#define INTEL_BDW_GT1_IDS(info) \
+        INTEL_BDW_ULT_GT1_IDS(info), \
+        INTEL_BDW_ULX_GT1_IDS(info), \
+        INTEL_VGA_DEVICE(0x1602, info), /* GT1 ULT */ \
         INTEL_VGA_DEVICE(0x160A, info), /* GT1 Server */ \
         INTEL_VGA_DEVICE(0x160D, info)  /* GT1 Workstation */
 
-#define INTEL_BDW_GT2_IDS(info)  \
-        INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */  \
+#define INTEL_BDW_ULT_GT2_IDS(info) \
         INTEL_VGA_DEVICE(0x1616, info), /* GT2 ULT */ \
-        INTEL_VGA_DEVICE(0x161B, info), /* GT2 ULT */ \
-        INTEL_VGA_DEVICE(0x161E, info), /* GT2 ULX */ \
+        INTEL_VGA_DEVICE(0x161B, info)  /* GT2 ULT */
+
+#define INTEL_BDW_ULX_GT2_IDS(info) \
+        INTEL_VGA_DEVICE(0x161E, info) /* GT2 ULX */
+
+#define INTEL_BDW_GT2_IDS(info) \
+        INTEL_BDW_ULT_GT2_IDS(info), \
+        INTEL_BDW_ULX_GT2_IDS(info), \
+        INTEL_VGA_DEVICE(0x1612, info), /* GT2 Halo */  \
         INTEL_VGA_DEVICE(0x161A, info), /* GT2 Server */ \
         INTEL_VGA_DEVICE(0x161D, info)  /* GT2 Workstation */
 
+#define INTEL_BDW_ULT_GT3_IDS(info) \
+        INTEL_VGA_DEVICE(0x1626, info), /* ULT */ \
+        INTEL_VGA_DEVICE(0x162B, info)  /* Iris */ \
+
+#define INTEL_BDW_ULX_GT3_IDS(info) \
+        INTEL_VGA_DEVICE(0x162E, info)  /* ULX */
+
 #define INTEL_BDW_GT3_IDS(info) \
+        INTEL_BDW_ULT_GT3_IDS(info), \
+        INTEL_BDW_ULX_GT3_IDS(info), \
         INTEL_VGA_DEVICE(0x1622, info), /* ULT */ \
-        INTEL_VGA_DEVICE(0x1626, info), /* ULT */ \
-        INTEL_VGA_DEVICE(0x162B, info), /* Iris */ \
-        INTEL_VGA_DEVICE(0x162E, info),  /* ULX */\
         INTEL_VGA_DEVICE(0x162A, info), /* Server */ \
         INTEL_VGA_DEVICE(0x162D, info)  /* Workstation */
 
+#define INTEL_BDW_ULT_RSVD_IDS(info) \
+        INTEL_VGA_DEVICE(0x1636, info), /* ULT */ \
+        INTEL_VGA_DEVICE(0x163B, info)  /* Iris */
+
+#define INTEL_BDW_ULX_RSVD_IDS(info) \
+        INTEL_VGA_DEVICE(0x163E, info) /* ULX */
+
 #define INTEL_BDW_RSVD_IDS(info) \
+        INTEL_BDW_ULT_RSVD_IDS(info), \
+        INTEL_BDW_ULX_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 */ \
         INTEL_VGA_DEVICE(0x163A, info), /* Server */ \
         INTEL_VGA_DEVICE(0x163D, info)  /* Workstation */
 
@@ -289,25 +330,40 @@
         INTEL_VGA_DEVICE(0x22b2, info), \
         INTEL_VGA_DEVICE(0x22b3, info)
 
+#define INTEL_SKL_ULT_GT1_IDS(info) \
+        INTEL_VGA_DEVICE(0x1906, info) /* ULT GT1 */
+
+#define INTEL_SKL_ULX_GT1_IDS(info) \
+        INTEL_VGA_DEVICE(0x190E, info) /* ULX GT1 */
+
 #define INTEL_SKL_GT1_IDS(info) \
-        INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \
-        INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \
+        INTEL_SKL_ULT_GT1_IDS(info), \
+        INTEL_SKL_ULX_GT1_IDS(info), \
         INTEL_VGA_DEVICE(0x1902, info), /* DT  GT1 */ \
         INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \
         INTEL_VGA_DEVICE(0x190A, info) /* SRV GT1 */
 
-#define INTEL_SKL_GT2_IDS(info) \
+#define INTEL_SKL_ULT_GT2_IDS(info) \
         INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \
-        INTEL_VGA_DEVICE(0x1921, info), /* ULT GT2F */ \
-        INTEL_VGA_DEVICE(0x191E, info), /* ULX GT2 */ \
+        INTEL_VGA_DEVICE(0x1921, info)  /* ULT GT2F */
+
+#define INTEL_SKL_ULX_GT2_IDS(info) \
+        INTEL_VGA_DEVICE(0x191E, info) /* ULX GT2 */
+
+#define INTEL_SKL_GT2_IDS(info) \
+        INTEL_SKL_ULT_GT2_IDS(info), \
+        INTEL_SKL_ULX_GT2_IDS(info), \
         INTEL_VGA_DEVICE(0x1912, info), /* DT  GT2 */ \
         INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \
         INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \
         INTEL_VGA_DEVICE(0x191D, info)  /* WKS GT2 */
 
+#define INTEL_SKL_ULT_GT3_IDS(info) \
+        INTEL_VGA_DEVICE(0x1926, info) /* ULT GT3 */
+
 #define INTEL_SKL_GT3_IDS(info) \
+        INTEL_SKL_ULT_GT3_IDS(info), \
         INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \
-        INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \
         INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \
         INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \
         INTEL_VGA_DEVICE(0x192D, info)  /* SRV GT3 */
@@ -336,29 +392,44 @@
         INTEL_VGA_DEVICE(0x3184, info), \
         INTEL_VGA_DEVICE(0x3185, info)
 
-#define INTEL_KBL_GT1_IDS(info) \
-        INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
-        INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
+#define INTEL_KBL_ULT_GT1_IDS(info) \
         INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \
+        INTEL_VGA_DEVICE(0x5913, info)  /* ULT GT1.5 */
+
+#define INTEL_KBL_ULX_GT1_IDS(info) \
         INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \
+        INTEL_VGA_DEVICE(0x5915, info)  /* ULX GT1.5 */
+
+#define INTEL_KBL_GT1_IDS(info) \
+        INTEL_KBL_ULT_GT1_IDS(info), \
+        INTEL_KBL_ULX_GT1_IDS(info), \
         INTEL_VGA_DEVICE(0x5902, info), /* DT  GT1 */ \
         INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \
         INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \
         INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */
 
-#define INTEL_KBL_GT2_IDS(info) \
+#define INTEL_KBL_ULT_GT2_IDS(info) \
         INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
+        INTEL_VGA_DEVICE(0x5921, info)  /* ULT GT2F */
+
+#define INTEL_KBL_ULX_GT2_IDS(info) \
+        INTEL_VGA_DEVICE(0x591E, info)  /* ULX GT2 */
+
+#define INTEL_KBL_GT2_IDS(info) \
+        INTEL_KBL_ULT_GT2_IDS(info), \
+        INTEL_KBL_ULX_GT2_IDS(info), \
         INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
-        INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
-        INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
         INTEL_VGA_DEVICE(0x5912, info), /* DT  GT2 */ \
         INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
         INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
         INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */
 
+#define INTEL_KBL_ULT_GT3_IDS(info) \
+        INTEL_VGA_DEVICE(0x5926, info) /* ULT GT3 */
+
 #define INTEL_KBL_GT3_IDS(info) \
+        INTEL_KBL_ULT_GT3_IDS(info), \
         INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \
-        INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \
         INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */
 
 #define INTEL_KBL_GT4_IDS(info) \
@@ -465,7 +536,14 @@
         INTEL_CML_GT2_IDS(info)
 
 /* CNL */
+#define INTEL_CNL_PORT_F_IDS(info) \
+        INTEL_VGA_DEVICE(0x5A54, info), \
+        INTEL_VGA_DEVICE(0x5A5C, info), \
+        INTEL_VGA_DEVICE(0x5A44, info), \
+        INTEL_VGA_DEVICE(0x5A4C, info)
+
 #define INTEL_CNL_IDS(info) \
+        INTEL_CNL_PORT_F_IDS(info), \
         INTEL_VGA_DEVICE(0x5A51, info), \
         INTEL_VGA_DEVICE(0x5A59, info), \
         INTEL_VGA_DEVICE(0x5A41, info), \
@@ -475,16 +553,11 @@
         INTEL_VGA_DEVICE(0x5A42, info), \
         INTEL_VGA_DEVICE(0x5A4A, info), \
         INTEL_VGA_DEVICE(0x5A50, info), \
-        INTEL_VGA_DEVICE(0x5A40, info), \
-        INTEL_VGA_DEVICE(0x5A54, info), \
-        INTEL_VGA_DEVICE(0x5A5C, info), \
-        INTEL_VGA_DEVICE(0x5A44, info), \
-        INTEL_VGA_DEVICE(0x5A4C, info)
+        INTEL_VGA_DEVICE(0x5A40, info)
 
 /* ICL */
-#define INTEL_ICL_11_IDS(info) \
+#define INTEL_ICL_PORT_F_IDS(info) \
         INTEL_VGA_DEVICE(0x8A50, info), \
-        INTEL_VGA_DEVICE(0x8A51, info), \
         INTEL_VGA_DEVICE(0x8A5C, info), \
         INTEL_VGA_DEVICE(0x8A5D, info), \
         INTEL_VGA_DEVICE(0x8A59, info), \
@@ -498,6 +571,10 @@
         INTEL_VGA_DEVICE(0x8A70, info), \
         INTEL_VGA_DEVICE(0x8A53, info)
 
+#define INTEL_ICL_11_IDS(info) \
+        INTEL_ICL_PORT_F_IDS(info), \
+        INTEL_VGA_DEVICE(0x8A51, info)
+
 /* EHL */
 #define INTEL_EHL_IDS(info) \
         INTEL_VGA_DEVICE(0x4500, info), \
diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
index 52051d24d89d..3a73f5316766 100644
--- a/include/uapi/drm/i915_drm.h
+++ b/include/uapi/drm/i915_drm.h
@@ -126,6 +126,18 @@ enum drm_i915_gem_engine_class {
         I915_ENGINE_CLASS_INVALID       = -1
 };
 
+/*
+ * There may be more than one engine fulfilling any role within the system.
+ * Each engine of a class is given a unique instance number and therefore
+ * any engine can be specified by its class:instance tuplet. APIs that allow
+ * access to any engine in the system will use struct i915_engine_class_instance
+ * for this identification.
+ */
+struct i915_engine_class_instance {
+        __u16 engine_class; /* see enum drm_i915_gem_engine_class */
+        __u16 engine_instance;
+};
+
 /**
  * DOC: perf_events exposed by i915 through /sys/bus/event_sources/drivers/i915
  *
@@ -1525,8 +1537,7 @@ struct drm_i915_gem_context_param_sseu {
         /*
          * Engine class & instance to be configured or queried.
          */
-        __u16 engine_class;
-        __u16 engine_instance;
+        struct i915_engine_class_instance engine;
 
         /*
          * Unused for now. Must be cleared to zero.