Merge tag 'drm-intel-next-2017-11-17-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next

More change sets for 4.16:

- Many improvements for selftests and other igt tests (Chris)
- Forcewake with PUNIT->PMIC bus fixes and robustness (Hans)
- Define an engine class for uABI (Tvrtko)
- Context switch fixes and improvements (Chris)
- GT powersavings and power gating simplification and fixes (Chris)
- Other general driver clean-ups (Chris, Lucas, Ville)
- Removing old, useless and/or bad workarounds (Chris, Oscar, Radhakrishna)
- IPS, pipe config, etc in preparation for another Fast Boot attempt (Maarten)
- OA perf fixes and support to Coffee Lake and Cannonlake (Lionel)
- Fixes around GPU fault registers (Michel)
- GEM Proxy (Tina)
- Refactor of Geminilake and Cannonlake plane color handling (James)
- Generalize transcoder loop (Mika Kahola)
- New HW Workaround for Cannonlake and Geminilake (Rodrigo)
- Resume GuC before using GEM (Chris)
- Stolen Memory handling improvements (Ville)
- Initialize entry in PPAT for older compilers (Chris)
- Other fixes and robustness improvements on execbuf (Chris)
- Improve logs of GEM_BUG_ON (Mika Kuoppala)
- Rework with massive rename of GuC functions and files (Sagar)
- Don't sanitize frame start delay if pipe is off (Ville)
- Cannonlake clock fixes (Rodrigo)
- Cannonlake HDMI 2.0 support (Rodrigo)
- Add a GuC doorbells selftest (Michel)
- Add might_sleep() check to our wait_for() (Chris)

Many GVT changes for 4.16:

- CSB HWSP update support (Weinan)
- GVT debug helpers, dyndbg and debugfs (Chuanxiao, Shuo)
- full virtualized opregion (Xiaolin)
- VM health check for sane fallback (Fred)
- workload submission code refactor for future enabling (Zhi)
- Updated repo URL in MAINTAINERS (Zhenyu)
- other many misc fixes

* tag 'drm-intel-next-2017-11-17-1' of git://anongit.freedesktop.org/drm/drm-intel: (260 commits)
  drm/i915: Update DRIVER_DATE to 20171117
  drm/i915: Add a policy note for removing workarounds
  drm/i915/selftests: Report ENOMEM clearly for an allocation failure
  Revert "drm/i915: Display WA #1133 WaFbcSkipSegments:cnl, glk"
  drm/i915: Calculate g4x intermediate watermarks correctly
  drm/i915: Calculate vlv/chv intermediate watermarks correctly, v3.
  drm/i915: Pass crtc_state to ips toggle functions, v2
  drm/i915: Pass idle crtc_state to intel_dp_sink_crc
  drm/i915: Enable FIFO underrun reporting after initial fastset, v4.
  drm/i915: Mark the userptr invalidate workqueue as WQ_MEM_RECLAIM
  drm/i915: Add might_sleep() check to wait_for()
  drm/i915/selftests: Add a GuC doorbells selftest
  drm/i915/cnl: Extend HDMI 2.0 support to CNL.
  drm/i915/cnl: Simplify dco_fraction calculation.
  drm/i915/cnl: Don't blindly replace qdiv.
  drm/i915/cnl: Fix wrpll math for higher freqs.
  drm/i915/cnl: Fix, simplify and unify wrpll variable sizes.
  drm/i915/cnl: Remove useless conversion.
  drm/i915/cnl: Remove spurious central_freq.
  drm/i915/selftests: exercise_ggtt may have nothing to do
  ...

1 files changed, 55 insertions, 43 deletions

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index e039702c1907..a40f35af225c 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -186,7 +186,7 @@ static bool g4x_infoframe_enabled(struct drm_encoder *encoder,
         if ((val & VIDEO_DIP_ENABLE) == 0)
                 return false;
 
-        if ((val & VIDEO_DIP_PORT_MASK) != VIDEO_DIP_PORT(intel_dig_port->port))
+        if ((val & VIDEO_DIP_PORT_MASK) != VIDEO_DIP_PORT(intel_dig_port->base.port))
                 return false;
 
         return val & (VIDEO_DIP_ENABLE_AVI |
@@ -245,7 +245,7 @@ static bool ibx_infoframe_enabled(struct drm_encoder *encoder,
         if ((val & VIDEO_DIP_ENABLE) == 0)
                 return false;
 
-        if ((val & VIDEO_DIP_PORT_MASK) != VIDEO_DIP_PORT(intel_dig_port->port))
+        if ((val & VIDEO_DIP_PORT_MASK) != VIDEO_DIP_PORT(intel_dig_port->base.port))
                 return false;
 
         return val & (VIDEO_DIP_ENABLE_AVI |
@@ -362,7 +362,7 @@ static bool vlv_infoframe_enabled(struct drm_encoder *encoder,
         if ((val & VIDEO_DIP_ENABLE) == 0)
                 return false;
 
-        if ((val & VIDEO_DIP_PORT_MASK) != VIDEO_DIP_PORT(intel_dig_port->port))
+        if ((val & VIDEO_DIP_PORT_MASK) != VIDEO_DIP_PORT(intel_dig_port->base.port))
                 return false;
 
         return val & (VIDEO_DIP_ENABLE_AVI |
@@ -538,7 +538,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,
         struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
         i915_reg_t reg = VIDEO_DIP_CTL;
         u32 val = I915_READ(reg);
-        u32 port = VIDEO_DIP_PORT(intel_dig_port->port);
+        u32 port = VIDEO_DIP_PORT(intel_dig_port->base.port);
 
         assert_hdmi_port_disabled(intel_hdmi);
 
@@ -689,7 +689,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,
         struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
         i915_reg_t reg = TVIDEO_DIP_CTL(intel_crtc->pipe);
         u32 val = I915_READ(reg);
-        u32 port = VIDEO_DIP_PORT(intel_dig_port->port);
+        u32 port = VIDEO_DIP_PORT(intel_dig_port->base.port);
 
         assert_hdmi_port_disabled(intel_hdmi);
 
@@ -785,7 +785,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,
         struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
         i915_reg_t reg = VLV_TVIDEO_DIP_CTL(intel_crtc->pipe);
         u32 val = I915_READ(reg);
-        u32 port = VIDEO_DIP_PORT(intel_dig_port->port);
+        u32 port = VIDEO_DIP_PORT(intel_dig_port->base.port);
 
         assert_hdmi_port_disabled(intel_hdmi);
 
@@ -960,6 +960,8 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder,
         u32 tmp, flags = 0;
         int dotclock;
 
+        pipe_config->output_types |= BIT(INTEL_OUTPUT_HDMI);
+
         tmp = I915_READ(intel_hdmi->hdmi_reg);
 
         if (tmp & SDVO_HSYNC_ACTIVE_HIGH)
@@ -1207,7 +1209,8 @@ static void g4x_disable_hdmi(struct intel_encoder *encoder,
                              const struct drm_connector_state *old_conn_state)
 {
         if (old_crtc_state->has_audio)
-                intel_audio_codec_disable(encoder);
+                intel_audio_codec_disable(encoder,
+                                          old_crtc_state, old_conn_state);
 
         intel_disable_hdmi(encoder, old_crtc_state, old_conn_state);
 }
@@ -1217,7 +1220,8 @@ static void pch_disable_hdmi(struct intel_encoder *encoder,
                              const struct drm_connector_state *old_conn_state)
 {
         if (old_crtc_state->has_audio)
-                intel_audio_codec_disable(encoder);
+                intel_audio_codec_disable(encoder,
+                                          old_crtc_state, old_conn_state);
 }
 
 static void pch_post_disable_hdmi(struct intel_encoder *encoder,
@@ -1227,24 +1231,34 @@ static void pch_post_disable_hdmi(struct intel_encoder *encoder,
         intel_disable_hdmi(encoder, old_crtc_state, old_conn_state);
 }
 
-static int intel_hdmi_source_max_tmds_clock(struct drm_i915_private *dev_priv)
+static int intel_hdmi_source_max_tmds_clock(struct intel_encoder *encoder)
 {
-        if (IS_G4X(dev_priv))
-                return 165000;
-        else if (IS_GEMINILAKE(dev_priv))
-                return 594000;
-        else if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8)
-                return 300000;
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+        const struct ddi_vbt_port_info *info =
+                &dev_priv->vbt.ddi_port_info[encoder->port];
+        int max_tmds_clock;
+
+        if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+                max_tmds_clock = 594000;
+        else if (INTEL_GEN(dev_priv) >= 8 || IS_HASWELL(dev_priv))
+                max_tmds_clock = 300000;
+        else if (INTEL_GEN(dev_priv) >= 5)
+                max_tmds_clock = 225000;
         else
-                return 225000;
+                max_tmds_clock = 165000;
+
+        if (info->max_tmds_clock)
+                max_tmds_clock = min(max_tmds_clock, info->max_tmds_clock);
+
+        return max_tmds_clock;
 }
 
 static int hdmi_port_clock_limit(struct intel_hdmi *hdmi,
                                  bool respect_downstream_limits,
                                  bool force_dvi)
 {
-        struct drm_device *dev = intel_hdmi_to_dev(hdmi);
-        int max_tmds_clock = intel_hdmi_source_max_tmds_clock(to_i915(dev));
+        struct intel_encoder *encoder = &hdmi_to_dig_port(hdmi)->base;
+        int max_tmds_clock = intel_hdmi_source_max_tmds_clock(encoder);
 
         if (respect_downstream_limits) {
                 struct intel_connector *connector = hdmi->attached_connector;
@@ -1339,6 +1353,12 @@ static bool hdmi_12bpc_possible(const struct intel_crtc_state *crtc_state)
         if (HAS_GMCH_DISPLAY(dev_priv))
                 return false;
 
+        if (crtc_state->pipe_bpp <= 8*3)
+                return false;
+
+        if (!crtc_state->has_hdmi_sink)
+                return false;
+
         /*
          * HDMI 12bpc affects the clocks, so it's only possible
          * when not cloning with other encoder types.
@@ -1464,9 +1484,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
          * outputs. We also need to check that the higher clock still fits
          * within limits.
          */
-        if (pipe_config->pipe_bpp > 8*3 && pipe_config->has_hdmi_sink && !force_dvi &&
-            hdmi_port_clock_valid(intel_hdmi, clock_12bpc, true, force_dvi) == MODE_OK &&
-            hdmi_12bpc_possible(pipe_config)) {
+        if (hdmi_12bpc_possible(pipe_config) &&
+            hdmi_port_clock_valid(intel_hdmi, clock_12bpc, true, force_dvi) == MODE_OK) {
                 DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n");
                 desired_bpp = 12*3;
 
@@ -1495,7 +1514,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
 
         pipe_config->lane_count = 4;
 
-        if (scdc->scrambling.supported && IS_GEMINILAKE(dev_priv)) {
+        if (scdc->scrambling.supported && (INTEL_GEN(dev_priv) >= 10 ||
+                                           IS_GEMINILAKE(dev_priv))) {
                 if (scdc->scrambling.low_rates)
                         pipe_config->hdmi_scrambling = true;
 
@@ -1529,7 +1549,7 @@ intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid)
 {
         struct drm_i915_private *dev_priv = to_i915(connector->dev);
         struct intel_hdmi *hdmi = intel_attached_hdmi(connector);
-        enum port port = hdmi_to_dig_port(hdmi)->port;
+        enum port port = hdmi_to_dig_port(hdmi)->base.port;
         struct i2c_adapter *adapter =
                 intel_gmbus_get_adapter(dev_priv, hdmi->ddc_bus);
         enum drm_dp_dual_mode_type type = drm_dp_dual_mode_detect(adapter);
@@ -1613,12 +1633,9 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
         intel_hdmi_unset_edid(connector);
 
-        if (intel_hdmi_set_edid(connector)) {
-                struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
-
-                hdmi_to_dig_port(intel_hdmi)->base.type = INTEL_OUTPUT_HDMI;
+        if (intel_hdmi_set_edid(connector))
                 status = connector_status_connected;
-        } else
+        else
                 status = connector_status_disconnected;
 
         intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
@@ -1629,8 +1646,6 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 static void
 intel_hdmi_force(struct drm_connector *connector)
 {
-        struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
-
         DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
                       connector->base.id, connector->name);
 
@@ -1640,7 +1655,6 @@ intel_hdmi_force(struct drm_connector *connector)
                 return;
 
         intel_hdmi_set_edid(connector);
-        hdmi_to_dig_port(intel_hdmi)->base.type = INTEL_OUTPUT_HDMI;
 }
 
 static int intel_hdmi_get_modes(struct drm_connector *connector)
@@ -1673,10 +1687,9 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder,
                                 const struct drm_connector_state *conn_state)
 {
         struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
-        struct drm_device *dev = encoder->base.dev;
-        struct drm_i915_private *dev_priv = to_i915(dev);
+        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 
-        vlv_phy_pre_encoder_enable(encoder);
+        vlv_phy_pre_encoder_enable(encoder, pipe_config);
 
         /* HDMI 1.0V-2dB */
         vlv_set_phy_signal_level(encoder, 0x2b245f5f, 0x00002000, 0x5578b83a,
@@ -1697,7 +1710,7 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder,
 {
         intel_hdmi_prepare(encoder, pipe_config);
 
-        vlv_phy_pre_pll_enable(encoder);
+        vlv_phy_pre_pll_enable(encoder, pipe_config);
 }
 
 static void chv_hdmi_pre_pll_enable(struct intel_encoder *encoder,
@@ -1706,14 +1719,14 @@ static void chv_hdmi_pre_pll_enable(struct intel_encoder *encoder,
 {
         intel_hdmi_prepare(encoder, pipe_config);
 
-        chv_phy_pre_pll_enable(encoder);
+        chv_phy_pre_pll_enable(encoder, pipe_config);
 }
 
 static void chv_hdmi_post_pll_disable(struct intel_encoder *encoder,
                                       const struct intel_crtc_state *old_crtc_state,
                                       const struct drm_connector_state *old_conn_state)
 {
-        chv_phy_post_pll_disable(encoder);
+        chv_phy_post_pll_disable(encoder, old_crtc_state);
 }
 
 static void vlv_hdmi_post_disable(struct intel_encoder *encoder,
@@ -1721,7 +1734,7 @@ static void vlv_hdmi_post_disable(struct intel_encoder *encoder,
                                   const struct drm_connector_state *old_conn_state)
 {
         /* Reset lanes to avoid HDMI flicker (VLV w/a) */
-        vlv_phy_reset_lanes(encoder);
+        vlv_phy_reset_lanes(encoder, old_crtc_state);
 }
 
 static void chv_hdmi_post_disable(struct intel_encoder *encoder,
@@ -1734,7 +1747,7 @@ static void chv_hdmi_post_disable(struct intel_encoder *encoder,
         mutex_lock(&dev_priv->sb_lock);
 
         /* Assert data lane reset */
-        chv_data_lane_soft_reset(encoder, true);
+        chv_data_lane_soft_reset(encoder, old_crtc_state, true);
 
         mutex_unlock(&dev_priv->sb_lock);
 }
@@ -1747,7 +1760,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder,
         struct drm_device *dev = encoder->base.dev;
         struct drm_i915_private *dev_priv = to_i915(dev);
 
-        chv_phy_pre_encoder_enable(encoder);
+        chv_phy_pre_encoder_enable(encoder, pipe_config);
 
         /* FIXME: Program the support xxx V-dB */
         /* Use 800mV-0dB */
@@ -2006,7 +2019,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
         struct intel_encoder *intel_encoder = &intel_dig_port->base;
         struct drm_device *dev = intel_encoder->base.dev;
         struct drm_i915_private *dev_priv = to_i915(dev);
-        enum port port = intel_dig_port->port;
+        enum port port = intel_encoder->port;
 
         DRM_DEBUG_KMS("Adding HDMI connector on port %c\n",
                       port_name(port));
@@ -2024,7 +2037,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
         connector->doublescan_allowed = 0;
         connector->stereo_allowed = 1;
 
-        if (IS_GEMINILAKE(dev_priv))
+        if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
                 connector->ycbcr_420_allowed = true;
 
         intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port);
@@ -2126,7 +2139,6 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,
         if (IS_G4X(dev_priv))
                 intel_encoder->cloneable |= 1 << INTEL_OUTPUT_HDMI;
 
-        intel_dig_port->port = port;
         intel_dig_port->hdmi.hdmi_reg = hdmi_reg;
         intel_dig_port->dp.output_reg = INVALID_MMIO_REG;
         intel_dig_port->max_lanes = 4;