diff mbox

[5/5] drm/i915: check for audio and infoframe changes across mode sets

Message ID 1414083556-26054-5-git-send-email-jbarnes@virtuousgeek.org (mailing list archive)
State New, archived
Headers show

Commit Message

Jesse Barnes Oct. 23, 2014, 4:59 p.m. UTC 
If these change (e.g. after a modeset following a fastboot), we need to
do a full mode set.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index b2d4f9c..6fbe2fc 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11507,6 +11507,16 @@  static int intel_crtc_set_config(struct drm_mode_set *set)
 	if (ret)
 		goto fail;
 
+	if (to_intel_crtc(set->crtc)->new_config->has_audio !=
+	    to_intel_crtc(set->crtc)->config.has_audio)
+		config->mode_changed = true;
+
+	/* Force mode sets for any infoframe stuff */
+	if (to_intel_crtc(set->crtc)->new_config->has_infoframe ||
+	    to_intel_crtc(set->crtc)->config.has_infoframe)
+		config->mode_changed = true;
+
+
 	if (config->mode_changed) {
 		ret = intel_set_mode_pipes(set->crtc, set->mode,
 					   set->x, set->y, set->fb,