[PATCH] drm/i915/display: use old bpp as a base when modeset is not allowed

[Jouni Högander]

Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 26 ++++++++++++--------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index cce1420fb541..5430448eaff2 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4359,21 +4359,27 @@ compute_baseline_pipe_bpp(struct intel_atomic_state *state,
 			  struct intel_crtc *crtc)
 {
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-	struct intel_crtc_state *crtc_state =
+	struct intel_crtc_state *new_crtc_state =
 		intel_atomic_get_new_crtc_state(state, crtc);
+	struct intel_crtc_state *old_crtc_state =
+		intel_atomic_get_old_crtc_state(state, crtc);
 	struct drm_connector *connector;
 	struct drm_connector_state *connector_state;
 	int bpp, i;
 
-	if ((IS_G4X(dev_priv) || IS_VALLEYVIEW(dev_priv) ||
-	    IS_CHERRYVIEW(dev_priv)))
-		bpp = 10*3;
-	else if (DISPLAY_VER(dev_priv) >= 5)
-		bpp = 12*3;
-	else
-		bpp = 8*3;
+	if (state->base.allow_modeset) {
+		if ((IS_G4X(dev_priv) || IS_VALLEYVIEW(dev_priv) ||
+		     IS_CHERRYVIEW(dev_priv)))
+			bpp = 10*3;
+		else if (DISPLAY_VER(dev_priv) >= 5)
+			bpp = 12*3;
+		else
+			bpp = 8*3;
+	} else {
+		bpp = old_crtc_state->pipe_bpp;
+	}
 
-	crtc_state->pipe_bpp = bpp;
+	new_crtc_state->pipe_bpp = bpp;
 
 	/* Clamp display bpp to connector max bpp */
 	for_each_new_connector_in_state(&state->base, connector, connector_state, i) {
@@ -4382,7 +4388,7 @@ compute_baseline_pipe_bpp(struct intel_atomic_state *state,
 		if (connector_state->crtc != &crtc->base)
 			continue;
 
-		ret = compute_sink_pipe_bpp(connector_state, crtc_state);
+		ret = compute_sink_pipe_bpp(connector_state, new_crtc_state);
 		if (ret)
 			return ret;
 	}
-- 
2.34.1