aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2013-09-04 11:25:28 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-09-16 17:36:49 -0400
commit37327abdfbb4e2d7c9033f450de5e36e401d6efc (patch)
tree70ffd4c8b97b0c54a14036efb46fa8b8e3a55f5f /drivers/gpu/drm/i915/intel_drv.h
parenta74821454249d32ba5f63a7de22bd6187be1ebd8 (diff)
drm/i915: Add explicit pipe src size to pipe config
Rather that mess about with hdisplay/vdisplay from requested_mode, add explicit pipe src size information to pipe config. Now requested_mode is only really relevant for dvo/sdvo output timings. For everything else either adjusted_mode or pipe src size should be used. In many places where we end up using pipe source size, we should actually use the primary plane size, but we don't currently store that information explicitly. As long as we treat primaries as full screen only, we can get away with this. Eventually when we move primaries over to drm_plane, we need to fix it all up. v2: Add a comment to explain what pipe_src_{w,h} are Add a note about primary planes to commit message Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 8306940f0ae7..3046e78f31eb 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -215,6 +215,12 @@ struct intel_crtc_config {
215 /* Actual pipe timings ie. what we program into the pipe timing 215 /* Actual pipe timings ie. what we program into the pipe timing
216 * registers. adjusted_mode.clock is the pipe pixel clock. */ 216 * registers. adjusted_mode.clock is the pipe pixel clock. */
217 struct drm_display_mode adjusted_mode; 217 struct drm_display_mode adjusted_mode;
218
219 /* Pipe source size (ie. panel fitter input size)
220 * All planes will be positioned inside this space,
221 * and get clipped at the edges. */
222 int pipe_src_w, pipe_src_h;
223
218 /* Whether to set up the PCH/FDI. Note that we never allow sharing 224 /* Whether to set up the PCH/FDI. Note that we never allow sharing
219 * between pch encoders and cpu encoders. */ 225 * between pch encoders and cpu encoders. */
220 bool has_pch_encoder; 226 bool has_pch_encoder;