Merge drm-next into drm-intel-next-queued

[sfrench/cifs-2.6.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 49cb27bd04c167eebb41b44fb38f88e8464b393b..8904ad87bf378798f59ea050b848703484a3724a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -69,6 +69,8 @@ enum intel_platform {
        INTEL_COFFEELAKE,
        /* gen10 */
        INTEL_CANNONLAKE,
+       /* gen11 */
+       INTEL_ICELAKE,
        INTEL_MAX_PLATFORMS
 };
 
@@ -135,14 +137,14 @@ struct intel_device_info {
        enum intel_platform platform;
        u32 platform_mask;
 
+       unsigned int page_sizes; /* page sizes supported by the HW */
+
        u32 display_mmio_offset;
 
        u8 num_pipes;
        u8 num_sprites[I915_MAX_PIPES];
        u8 num_scalers[I915_MAX_PIPES];
 
-       unsigned int page_sizes; /* page sizes supported by the HW */
-
 #define DEFINE_FLAG(name) u8 name:1
        DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG);
 #undef DEFINE_FLAG
@@ -165,6 +167,10 @@ struct intel_device_info {
        } color;
 };
 
+struct intel_driver_caps {
+       unsigned int scheduler;
+};
+
 static inline unsigned int sseu_subslice_total(const struct sseu_dev_info *sseu)
 {
        return hweight8(sseu->slice_mask) * hweight8(sseu->subslice_mask);
@@ -180,4 +186,7 @@ void intel_device_info_dump_flags(const struct intel_device_info *info,
 void intel_device_info_dump_runtime(const struct intel_device_info *info,
                                    struct drm_printer *p);
 
+void intel_driver_caps_print(const struct intel_driver_caps *caps,
+                            struct drm_printer *p);
+
 #endif