Merge tag 'drm-intel-next-2023-11-23' of git://anongit.freedesktop.org/drm/drm-intel...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / display / intel_display_core.h

diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index ccfe27630fb661ae7ffb3ad7827647941cb92ca9..7e82b87e9cde7e42690373670fcd09487867b829 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -19,6 +19,7 @@
 #include "intel_cdclk.h"
 #include "intel_display_device.h"
 #include "intel_display_limits.h"
+#include "intel_display_params.h"
 #include "intel_display_power.h"
 #include "intel_dpll_mgr.h"
 #include "intel_fbc.h"
@@ -347,15 +348,6 @@ struct intel_display {
                struct intel_global_obj obj;
        } dbuf;
 
-       struct {
-               wait_queue_head_t waitqueue;
-
-               /* mutex to protect pmdemand programming sequence */
-               struct mutex lock;
-
-               struct intel_global_obj obj;
-       } pmdemand;
-
        struct {
                /*
                 * dkl.phy_lock protects against concurrent access of the
@@ -443,6 +435,15 @@ struct intel_display {
                bool false_color;
        } ips;
 
+       struct {
+               wait_queue_head_t waitqueue;
+
+               /* mutex to protect pmdemand programming sequence */
+               struct mutex lock;
+
+               struct intel_global_obj obj;
+       } pmdemand;
+
        struct {
                struct i915_power_domains domains;
 
@@ -520,6 +521,7 @@ struct intel_display {
        struct intel_hotplug hotplug;
        struct intel_opregion opregion;
        struct intel_overlay *overlay;
+       struct intel_display_params params;
        struct intel_vbt_data vbt;
        struct intel_wm wm;
 };