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

[thirdparty/kernel/linux.git] / drivers / gpu / drm / i915 / i915_drv.h

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 00d7eeae33bd31fe6dcc110dd4cabd190b2e5805..4d57609d619a516b82f6d3eb19da9e6b5800fd20 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -37,7 +37,6 @@
 #include <drm/drm_connector.h>
 #include <drm/ttm/ttm_device.h>
 
-#include "display/intel_bios.h"
 #include "display/intel_cdclk.h"
 #include "display/intel_display.h"
 #include "display/intel_display_power.h"
@@ -194,12 +193,6 @@ struct drm_i915_display_funcs {
 
 #define I915_COLOR_UNEVICTABLE (-1) /* a non-vma sharing the address space */
 
-enum drrs_type {
-       DRRS_TYPE_NONE,
-       DRRS_TYPE_STATIC,
-       DRRS_TYPE_SEAMLESS,
-};
-
 #define QUIRK_LVDS_SSC_DISABLE (1<<1)
 #define QUIRK_INVERT_BRIGHTNESS (1<<2)
 #define QUIRK_BACKLIGHT_PRESENT (1<<3)
@@ -308,76 +301,19 @@ struct intel_vbt_data {
        /* bdb version */
        u16 version;
 
-       struct drm_display_mode *lfp_lvds_vbt_mode; /* if any */
-       struct drm_display_mode *sdvo_lvds_vbt_mode; /* if any */
-
        /* Feature bits */
        unsigned int int_tv_support:1;
-       unsigned int lvds_dither:1;
        unsigned int int_crt_support:1;
        unsigned int lvds_use_ssc:1;
        unsigned int int_lvds_support:1;
        unsigned int display_clock_mode:1;
        unsigned int fdi_rx_polarity_inverted:1;
-       unsigned int panel_type:4;
        int lvds_ssc_freq;
-       unsigned int bios_lvds_val; /* initial [PCH_]LVDS reg val in VBIOS */
        enum drm_panel_orientation orientation;
 
        bool override_afc_startup;
        u8 override_afc_startup_val;
 
-       u8 seamless_drrs_min_refresh_rate;
-       enum drrs_type drrs_type;
-
-       struct {
-               int rate;
-               int lanes;
-               int preemphasis;
-               int vswing;
-               int bpp;
-               struct edp_power_seq pps;
-               u8 drrs_msa_timing_delay;
-               bool low_vswing;
-               bool initialized;
-               bool hobl;
-       } edp;
-
-       struct {
-               bool enable;
-               bool full_link;
-               bool require_aux_wakeup;
-               int idle_frames;
-               int tp1_wakeup_time_us;
-               int tp2_tp3_wakeup_time_us;
-               int psr2_tp2_tp3_wakeup_time_us;
-       } psr;
-
-       struct {
-               u16 pwm_freq_hz;
-               u16 brightness_precision_bits;
-               bool present;
-               bool active_low_pwm;
-               u8 min_brightness;      /* min_brightness/255 of max */
-               u8 controller;          /* brightness controller number */
-               enum intel_backlight_type type;
-       } backlight;
-
-       /* MIPI DSI */
-       struct {
-               u16 panel_id;
-               struct mipi_config *config;
-               struct mipi_pps_data *pps;
-               u16 bl_ports;
-               u16 cabc_ports;
-               u8 seq_version;
-               u32 size;
-               u8 *data;
-               const u8 *sequence[MIPI_SEQ_MAX];
-               u8 *deassert_seq; /* Used by fixup_mipi_sequences() */
-               enum drm_panel_orientation orientation;
-       } dsi;
-
        int crt_ddc_pin;
 
        struct list_head display_devices;
@@ -1230,6 +1166,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 #define CCS_MASK(gt) \
        ENGINE_INSTANCES_MASK(gt, CCS0, I915_MAX_CCS)
 
+#define HAS_MEDIA_RATIO_MODE(dev_priv) (INTEL_INFO(dev_priv)->has_media_ratio_mode)
+
 /*
  * The Gen7 cmdparser copies the scanned buffer to the ggtt for execution
  * All later gens can run the final buffer from the ppgtt
@@ -1388,7 +1326,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 
 /* Only valid when HAS_DISPLAY() is true */
 #define INTEL_DISPLAY_ENABLED(dev_priv) \
-       (drm_WARN_ON(&(dev_priv)->drm, !HAS_DISPLAY(dev_priv)), !(dev_priv)->params.disable_display)
+       (drm_WARN_ON(&(dev_priv)->drm, !HAS_DISPLAY(dev_priv)),         \
+        !(dev_priv)->params.disable_display &&                         \
+        !intel_opregion_headless_sku(dev_priv))
 
 #define HAS_GUC_DEPRIVILEGE(dev_priv) \
        (INTEL_INFO(dev_priv)->has_guc_deprivilege)