aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/gpu/drm/i915/display/intel_dp_mst.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2020-07-10 11:59:59 +0200
committerPeter Zijlstra <peterz@infradead.org>2020-07-10 11:59:59 +0200
commite1bcad609f5a533da45fac071cf0849b86dbab92 (patch)
treebc77cb21c81c053b99271c7bac9f6bc071cc56a6 /drivers/gpu/drm/i915/display/intel_dp_mst.c
parentlockdep: Split header file into lockdep and lockdep_types (diff)
parentx86/entry: Rename idtentry_enter/exit_cond_rcu() to idtentry_enter/exit() (diff)
downloadwireguard-linux-e1bcad609f5a533da45fac071cf0849b86dbab92.tar.xz
wireguard-linux-e1bcad609f5a533da45fac071cf0849b86dbab92.zip
Merge branch 'tip/x86/entry'
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dp_mst.c')
-rw-r--r--drivers/gpu/drm/i915/display/intel_dp_mst.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index d18b406f2a7d..f29e51ce489c 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -397,6 +397,14 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
*/
drm_dp_send_power_updown_phy(&intel_dp->mst_mgr, connector->port,
false);
+
+ /*
+ * BSpec 4287: disable DIP after the transcoder is disabled and before
+ * the transcoder clock select is set to none.
+ */
+ if (last_mst_stream)
+ intel_dp_set_infoframes(&intel_dig_port->base, false,
+ old_crtc_state, NULL);
/*
* From TGL spec: "If multi-stream slave transcoder: Configure
* Transcoder Clock Select to direct no clock to the transcoder"