| From 99a6d85292430f6bb6d143b35523cfcd2f9060e8 Mon Sep 17 00:00:00 2001 |
| From: Damien Lespiau <damien.lespiau@intel.com> |
| Date: Wed, 25 Sep 2013 16:45:39 +0100 |
| Subject: drm/i915: Prefer crtc_{h|v}display for pipe src dimensions |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Now that we ask to adjust the crtc timings for stereo modes, the correct |
| pipe_src_w and pipe_src_h can be found in crtc_vdisplay and crtc_hdisplay. |
| |
| v2: Add comment about why pipe_src_w/h need to be set afert |
| set_crtcinfo() (Daniel Vetter) |
| |
| Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> |
| Acked-by: Dave Airlie <airlied@gmail.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 350a10ca7e43f2641ed217f5d248c1ddbadb5da6) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index be6446123e0a..6508419fb32a 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -8433,9 +8433,6 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, |
| drm_mode_copy(&pipe_config->adjusted_mode, mode); |
| drm_mode_copy(&pipe_config->requested_mode, mode); |
| |
| - pipe_config->pipe_src_w = mode->hdisplay; |
| - pipe_config->pipe_src_h = mode->vdisplay; |
| - |
| pipe_config->cpu_transcoder = |
| (enum transcoder) to_intel_crtc(crtc)->pipe; |
| pipe_config->shared_dpll = DPLL_ID_PRIVATE; |
| @@ -8470,6 +8467,10 @@ encoder_retry: |
| /* Fill in default crtc timings, allow encoders to overwrite them. */ |
| drm_mode_set_crtcinfo(&pipe_config->adjusted_mode, CRTC_STEREO_DOUBLE); |
| |
| + /* set_crtcinfo() may have adjusted hdisplay/vdisplay */ |
| + pipe_config->pipe_src_w = pipe_config->adjusted_mode.crtc_hdisplay; |
| + pipe_config->pipe_src_h = pipe_config->adjusted_mode.crtc_vdisplay; |
| + |
| /* Pass our mode to the connectors and the CRTC to give them a chance to |
| * adjust it according to limitations or connector properties, and also |
| * a chance to reject the mode entirely. |
| -- |
| 1.8.5.rc3 |
| |
