diff options
author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2015-03-23 07:10:38 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-03-23 10:09:33 -0400 |
commit | 1fc0a8f7c45275c38d3322089313fe2e309c1f17 (patch) | |
tree | 68aa352ddfcbe64f95f3c1d04b7fd42f66b2ad28 /drivers/gpu/drm/i915/intel_drv.h | |
parent | 121920faf2ccce9aa66a7e2588415c9647b66104 (diff) |
drm/i915/skl: Take 90/270 rotation into account in watermark calculations
v2: Pass in rotation info to sprite plane updates as well.
v3: Use helper to determine 90/270 rotation. (Michel Thierry)
v4: Rebased for fb modifiers and atomic changes.
For: VIZ-4546
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Michel Thierry <michel.thierry@intel.com> (v3)
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.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.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index db0e7bfd0baa..811a1db8b6ed 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -501,6 +501,7 @@ struct intel_plane_wm_parameters { | |||
501 | bool enabled; | 501 | bool enabled; |
502 | bool scaled; | 502 | bool scaled; |
503 | u64 tiling; | 503 | u64 tiling; |
504 | unsigned int rotation; | ||
504 | }; | 505 | }; |
505 | 506 | ||
506 | struct intel_plane { | 507 | struct intel_plane { |
@@ -994,6 +995,9 @@ intel_rotation_90_or_270(unsigned int rotation) | |||
994 | return rotation & (BIT(DRM_ROTATE_90) | BIT(DRM_ROTATE_270)); | 995 | return rotation & (BIT(DRM_ROTATE_90) | BIT(DRM_ROTATE_270)); |
995 | } | 996 | } |
996 | 997 | ||
998 | bool intel_wm_need_update(struct drm_plane *plane, | ||
999 | struct drm_plane_state *state); | ||
1000 | |||
997 | /* shared dpll functions */ | 1001 | /* shared dpll functions */ |
998 | struct intel_shared_dpll *intel_crtc_to_shared_dpll(struct intel_crtc *crtc); | 1002 | struct intel_shared_dpll *intel_crtc_to_shared_dpll(struct intel_crtc *crtc); |
999 | void assert_shared_dpll(struct drm_i915_private *dev_priv, | 1003 | void assert_shared_dpll(struct drm_i915_private *dev_priv, |