Merge tag 'drm-intel-next-2022-10-28' of git://anongit.freedesktop.org/drm/drm-intel...

[linux-block.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 d638235e1d26de8ed4658e4c3fb6e1ba4b530721..7b5dd8e21d7af010dab3ee6a2d323417cd5f2737 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -153,6 +153,7 @@ enum intel_ppgtt_type {
        func(has_4tile); \
        func(has_flat_ccs); \
        func(has_global_mocs); \
+       func(has_gmd_id); \
        func(has_gt_uc); \
        func(has_heci_pxp); \
        func(has_heci_gscfi); \
@@ -180,6 +181,7 @@ enum intel_ppgtt_type {
        /* Keep in alphabetical order */ \
        func(cursor_needs_physical); \
        func(has_cdclk_crawl); \
+       func(has_cdclk_squash); \
        func(has_ddi); \
        func(has_dp_mst); \
        func(has_dsb); \
@@ -195,20 +197,25 @@ enum intel_ppgtt_type {
        func(overlay_needs_physical); \
        func(supports_tv);
 
-struct ip_version {
+struct intel_ip_version {
        u8 ver;
        u8 rel;
+       u8 step;
 };
 
 struct intel_runtime_info {
+       /*
+        * Single "graphics" IP version that represents
+        * render, compute and copy behavior.
+        */
        struct {
-               struct ip_version ip;
+               struct intel_ip_version ip;
        } graphics;
        struct {
-               struct ip_version ip;
+               struct intel_ip_version ip;
        } media;
        struct {
-               struct ip_version ip;
+               struct intel_ip_version ip;
        } display;
 
        /*
@@ -308,7 +315,7 @@ struct intel_driver_caps {
 
 const char *intel_platform_name(enum intel_platform platform);
 
-void intel_device_info_subplatform_init(struct drm_i915_private *dev_priv);
+void intel_device_info_runtime_init_early(struct drm_i915_private *dev_priv);
 void intel_device_info_runtime_init(struct drm_i915_private *dev_priv);
 
 void intel_device_info_print(const struct intel_device_info *info,