drm: ctxt refresh

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/queue/drm-i915-sdvo-Implement-proper-HDMI-audio-support-fo.patch b/queue/drm-i915-sdvo-Implement-proper-HDMI-audio-support-fo.patch
index cee0be6..e98f6fe 100644
--- a/queue/drm-i915-sdvo-Implement-proper-HDMI-audio-support-fo.patch
+++ b/queue/drm-i915-sdvo-Implement-proper-HDMI-audio-support-fo.patch
@@ -1,4 +1,4 @@
-From d74408f528261f900dddb9778f61b5c5a7a6249c Mon Sep 17 00:00:00 2001
+From 7fdf6ceb176cbab9e48383128f69e01f8b26a117 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
 Date: Tue, 9 Apr 2019 17:40:49 +0300
 Subject: [PATCH] drm/i915/sdvo: Implement proper HDMI audio support for SDVO
@@ -50,10 +50,10 @@ Reviewed-by: Imre Deak <imre.deak@intel.com>
 Signed-off-by: Jani Nikula <jani.nikula@intel.com>
 
 diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
-index 0e3d91d9ef13..9ecfba0a54a1 100644
+index 26975df4e593..addc0df08380 100644
 --- a/drivers/gpu/drm/i915/intel_sdvo.c
 +++ b/drivers/gpu/drm/i915/intel_sdvo.c
-@@ -916,6 +916,13 @@ static bool intel_sdvo_set_colorimetry(struct intel_sdvo *intel_sdvo,
+@@ -925,6 +925,13 @@ static bool intel_sdvo_set_colorimetry(struct intel_sdvo *intel_sdvo,
  	return intel_sdvo_set_value(intel_sdvo, SDVO_CMD_SET_COLORIMETRY, &mode, 1);
  }
  
@@ -67,7 +67,7 @@ index 0e3d91d9ef13..9ecfba0a54a1 100644
  #if 0
  static void intel_sdvo_dump_hdmi_buf(struct intel_sdvo *intel_sdvo)
  {
-@@ -1487,11 +1494,6 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,
+@@ -1370,11 +1377,6 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,
  	else
  		sdvox |= SDVO_PIPE_SEL(crtc->pipe);
  
@@ -79,7 +79,7 @@ index 0e3d91d9ef13..9ecfba0a54a1 100644
  	if (INTEL_GEN(dev_priv) >= 4) {
  		/* done in crtc_mode_set as the dpll_md reg must be written early */
  	} else if (IS_I945G(dev_priv) || IS_I945GM(dev_priv) ||
-@@ -1635,8 +1637,13 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,
+@@ -1507,8 +1509,13 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,
  	if (sdvox & HDMI_COLOR_RANGE_16_235)
  		pipe_config->limited_color_range = true;
  
@@ -95,8 +95,8 @@ index 0e3d91d9ef13..9ecfba0a54a1 100644
  
  	if (intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_ENCODE,
  				 &val, 1)) {
-@@ -1647,6 +1654,32 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,
- 	intel_sdvo_get_avi_infoframe(intel_sdvo, pipe_config);
+@@ -1521,6 +1528,32 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,
+ 	     pipe_config->pixel_multiplier, encoder_pixel_multiplier);
  }
  
 +static void intel_sdvo_disable_audio(struct intel_sdvo *intel_sdvo)
@@ -128,7 +128,7 @@ index 0e3d91d9ef13..9ecfba0a54a1 100644
  static void intel_disable_sdvo(struct intel_encoder *encoder,
  			       const struct intel_crtc_state *old_crtc_state,
  			       const struct drm_connector_state *conn_state)
-@@ -1656,6 +1689,9 @@ static void intel_disable_sdvo(struct intel_encoder *encoder,
+@@ -1530,6 +1563,9 @@ static void intel_disable_sdvo(struct intel_encoder *encoder,
  	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);
  	u32 temp;
  
@@ -138,7 +138,7 @@ index 0e3d91d9ef13..9ecfba0a54a1 100644
  	intel_sdvo_set_active_outputs(intel_sdvo, 0);
  	if (0)
  		intel_sdvo_set_encoder_power_state(intel_sdvo,
-@@ -1741,6 +1777,9 @@ static void intel_enable_sdvo(struct intel_encoder *encoder,
+@@ -1615,6 +1651,9 @@ static void intel_enable_sdvo(struct intel_encoder *encoder,
  		intel_sdvo_set_encoder_power_state(intel_sdvo,
  						   DRM_MODE_DPMS_ON);
  	intel_sdvo_set_active_outputs(intel_sdvo, intel_sdvo->attached_output);
@@ -148,7 +148,7 @@ index 0e3d91d9ef13..9ecfba0a54a1 100644
  }
  
  static enum drm_mode_status
-@@ -2603,7 +2642,6 @@ static bool
+@@ -2501,7 +2540,6 @@ static bool
  intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
  {
  	struct drm_encoder *encoder = &intel_sdvo->base.base;
@@ -156,7 +156,7 @@ index 0e3d91d9ef13..9ecfba0a54a1 100644
  	struct drm_connector *connector;
  	struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
  	struct intel_connector *intel_connector;
-@@ -2640,9 +2678,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
+@@ -2538,9 +2576,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device)
  	encoder->encoder_type = DRM_MODE_ENCODER_TMDS;
  	connector->connector_type = DRM_MODE_CONNECTOR_DVID;
  
@@ -165,7 +165,7 @@ index 0e3d91d9ef13..9ecfba0a54a1 100644
 -	    intel_sdvo_is_hdmi_connector(intel_sdvo, device)) {
 +	if (intel_sdvo_is_hdmi_connector(intel_sdvo, device)) {
  		connector->connector_type = DRM_MODE_CONNECTOR_HDMIA;
- 		intel_sdvo_connector->is_hdmi = true;
+ 		intel_sdvo->is_hdmi = true;
  	}
 diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h
 index db0ed499268a..e9ba3b047f93 100644