[v6,6/8] drm/i915/display: Prepare for fastset external dependencies check
diff mbox series

Message ID 20191220214228.262345-6-jose.souza@intel.com
State New
Headers show
  • [v6,1/8] drm/i915: Introduce intel_crtc_state_alloc()
Related show

Commit Message

José Roberto de Souza Dec. 20, 2019, 9:42 p.m. UTC
MST and port sync have master and slaves pipes and it brings
dependencies between pipes to allow fastset.
For example if only MST master needs a modeset all of its slaves also
needs to do a modeset.

This patch adds the base for external dependencies check, the MST and
port sync bits will be added in another patches.

- moved handling to intel_atomic_check() this way is guarantee that
all pipes will have its state computed

- added a function to return if MST master neeeds modeset to simply
code in intel_atomic_check()

- fixed and moved code to check if MST master needs a modeset

- previons version of this patch was split into two patches

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
 drivers/gpu/drm/i915/display/intel_display.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff mbox series

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 24841dde490b..8390ad46629b 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -13909,7 +13909,11 @@  static void intel_crtc_check_fastset(const struct intel_crtc_state *old_crtc_sta
 	new_crtc_state->uapi.mode_changed = false;
 	new_crtc_state->update_pipe = true;
+static void intel_crtc_copy_fastset(const struct intel_crtc_state *old_crtc_state,
+				    struct intel_crtc_state *new_crtc_state)
 	 * If we're not doing the full modeset we want to
 	 * keep the current M/N values as they may be
@@ -14070,8 +14074,6 @@  static int intel_atomic_check(struct drm_device *dev,
 		if (!new_crtc_state->uapi.enable) {
-			any_ms = true;
@@ -14084,9 +14086,19 @@  static int intel_atomic_check(struct drm_device *dev,
 			goto fail;
 		intel_crtc_check_fastset(old_crtc_state, new_crtc_state);
+	}
-		if (needs_modeset(new_crtc_state))
+	for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
+					    new_crtc_state, i) {
+		if (needs_modeset(new_crtc_state)) {
 			any_ms = true;
+			continue;
+		}
+		if (!new_crtc_state->update_pipe)
+			continue;
+		intel_crtc_copy_fastset(old_crtc_state, new_crtc_state);
 	if (any_ms && !check_digital_port_conflicts(state)) {