diff options
| author | Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2015-04-21 14:13:03 (GMT) |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-05-08 11:04:00 (GMT) |
| commit | 4fed33f6485be65b1e8155c843987030a2ae74fa (patch) | |
| tree | 4db5d0becd0a31c06cd851b546cb7e80af53cf54 | |
| parent | 548ee15b38ff5f6d7561f9e633efa20e7d7383b6 (diff) | |
| download | linux-4fed33f6485be65b1e8155c843987030a2ae74fa.tar.xz | |
drm/i915: Calculate a new pipe_config based on new enabled state
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>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0d18a43..aa44538 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12220,7 +12220,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); |