diff options
| author |   Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2015-02-26 09:44:45 +0200 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-02-26 14:26:43 +0100 |
| commit | b4f2bf4c02b27f31e68cbd00fa7ef868061ac2eb (patch) | |
| tree | 301a895b8c30fd69a86c54896aff5b531a71336d | |
| parent | drm/i915: Ensure crtc_state backpointer is always initialized (diff) | |
| download | linux-dev-b4f2bf4c02b27f31e68cbd00fa7ef868061ac2eb.tar.xz linux-dev-b4f2bf4c02b27f31e68cbd00fa7ef868061ac2eb.zip | |
drm/i915: Look at staged config when fixing pipe_src_w for LVDS
The code in function intel_crtc_compute_config() that evens pipe_src_w
if necessary would look at the current config instead of the staged one
when deciding if there is an LVDS encoder in use. This could potentially
lead to the value not being updated, if during the modeset a crtc wasn't
driving an LVDS encoder.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@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 3e13ee187e4d..93f1ff05a6f4 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5577,7 +5577,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, * - LVDS dual channel mode * - Double wide pipe */ - if ((intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) && + if ((intel_pipe_will_have_type(crtc, INTEL_OUTPUT_LVDS) && intel_is_dual_link_lvds(dev)) || pipe_config->double_wide) pipe_config->pipe_src_w &= ~1; |