diff mbox

[14/35] drm/i915: Calculate a new pipe_config based on new enabled state

Message ID 1429625604-22252-15-git-send-email-ander.conselvan.de.oliveira@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ander Conselvan de Oliveira April 21, 2015, 2:13 p.m. UTC
With the current implementation of intel_modeset_affected_pipes(), if a
pipe will be enabled then it is in modeset_pipes. We'll remove that mask
in a follow up patch, but want to preserve this behavior, so just make
that explicit.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d1253b1..b0755eb 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12132,7 +12132,7 @@  intel_modeset_compute_config(struct drm_crtc *crtc,
 	if (IS_ERR(pipe_config))
 		return pipe_config;
 
-	if (!(*modeset_pipes & (1 << to_intel_crtc(crtc)->pipe)))
+	if (!pipe_config->base.enable)
 		return pipe_config;
 
 	ret = intel_modeset_pipe_config(crtc, mode, state, pipe_config);