Merge tag 'drm-intel-next-2021-08-10-1' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / intel_device_info.h

diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index ef1eecd..d328bb9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -131,6 +131,7 @@ enum intel_ppgtt_type {
        func(has_llc); \
        func(has_logical_ring_contexts); \
        func(has_logical_ring_elsq); \
+       func(has_mslices); \
        func(has_pooled_eu); \
        func(has_rc6); \
        func(has_rc6p); \
@@ -170,7 +171,6 @@ struct intel_device_info {
        u8 media_ver;
        u8 media_rel;
 
-       u8 gt; /* GT number, 0 if undefined */
        intel_engine_mask_t platform_engine_mask; /* Engines supported by the HW */
 
        enum intel_platform platform;
@@ -186,6 +186,8 @@ struct intel_device_info {
 
        u32 display_mmio_offset;
 
+       u8 gt; /* GT number, 0 if undefined */
+
        u8 pipe_mask;
        u8 cpu_transcoder_mask;