On ke, 2016-07-20 at 16:18 +0300, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Move the plane control register rotation setup away from the
> coordinate munging code. This will result in neater looking
> code once we add reflection support for CHV.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
Looks cleaner,
Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> ---
> Â drivers/gpu/drm/i915/intel_display.c | 28 ++++++++++++++--------------
>  drivers/gpu/drm/i915/intel_sprite.c  | 28 +++++++++++++++-------------
> Â 2 files changed, 29 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 79c1a8b89d1d..88a7c4173715 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2674,6 +2674,9 @@ static void i9xx_update_primary_plane(struct drm_plane
> *primary,
> Â Â Â Â Â obj->tiling_mode != I915_TILING_NONE)
> Â dspcntr |= DISPPLANE_TILED;
> Â
> + if (rotation & BIT(DRM_ROTATE_180))
> + dspcntr |= DISPPLANE_ROTATE_180;
> +
> Â if (IS_G4X(dev))
> Â dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
> Â
> @@ -2689,8 +2692,6 @@ static void i9xx_update_primary_plane(struct drm_plane
> *primary,
> Â }
> Â
> Â if (rotation & BIT(DRM_ROTATE_180)) {
> - dspcntr |= DISPPLANE_ROTATE_180;
> -
> Â x += (crtc_state->pipe_src_w - 1);
> Â y += (crtc_state->pipe_src_h - 1);
> Â
> @@ -2783,6 +2784,9 @@ static void ironlake_update_primary_plane(struct
> drm_plane *primary,
> Â if (obj->tiling_mode != I915_TILING_NONE)
> Â dspcntr |= DISPPLANE_TILED;
> Â
> + if (rotation & BIT(DRM_ROTATE_180))
> + dspcntr |= DISPPLANE_ROTATE_180;
> +
> Â if (!IS_HASWELL(dev) && !IS_BROADWELL(dev))
> Â dspcntr |= DISPPLANE_TRICKLE_FEED_DISABLE;
> Â
> @@ -2792,19 +2796,15 @@ static void ironlake_update_primary_plane(struct
> drm_plane *primary,
> Â Â Â fb->pitches[0], rotation);
> Â linear_offset -= intel_crtc->dspaddr_offset;
> Â
> - if (rotation & BIT(DRM_ROTATE_180)) {
> - dspcntr |= DISPPLANE_ROTATE_180;
> -
> - if (!IS_HASWELL(dev) && !IS_BROADWELL(dev)) {
> - x += (crtc_state->pipe_src_w - 1);
> - y += (crtc_state->pipe_src_h - 1);
> + /* HSW and BDW does this automagically in hardware */
> + if (!IS_HASWELL(dev) && !IS_BROADWELL(dev) &&
> + Â Â Â Â rotation & BIT(DRM_ROTATE_180)) {
> + x += (crtc_state->pipe_src_w - 1);
> + y += (crtc_state->pipe_src_h - 1);
> Â
> - /* Finding the last pixel of the last line of the
> display
> - data and adding to linear_offset*/
> - linear_offset +=
> - (crtc_state->pipe_src_h - 1) * fb->pitches[0] +
> - (crtc_state->pipe_src_w - 1) * cpp;
> - }
> + linear_offset +=
> + (crtc_state->pipe_src_h - 1) * fb->pitches[0] +
> + (crtc_state->pipe_src_w - 1) * cpp;
> Â }
> Â
> Â intel_crtc->adjusted_x = x;
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c
> b/drivers/gpu/drm/i915/intel_sprite.c
> index 6b815d57d75a..14173f53f520 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -433,6 +433,9 @@ vlv_update_plane(struct drm_plane *dplane,
> Â if (obj->tiling_mode != I915_TILING_NONE)
> Â sprctl |= SP_TILED;
> Â
> + if (rotation & BIT(DRM_ROTATE_180))
> + sprctl |= SP_ROTATE_180;
> +
> Â /* Sizes are 0 based */
> Â src_w--;
> Â src_h--;
> @@ -445,8 +448,6 @@ vlv_update_plane(struct drm_plane *dplane,
> Â linear_offset -= sprsurf_offset;
> Â
> Â if (rotation & BIT(DRM_ROTATE_180)) {
> - sprctl |= SP_ROTATE_180;
> -
> Â x += src_w;
> Â y += src_h;
> Â linear_offset += src_h * fb->pitches[0] + src_w * cpp;
> @@ -555,6 +556,9 @@ ivb_update_plane(struct drm_plane *plane,
> Â if (obj->tiling_mode != I915_TILING_NONE)
> Â sprctl |= SPRITE_TILED;
> Â
> + if (rotation & BIT(DRM_ROTATE_180))
> + sprctl |= SPRITE_ROTATE_180;
> +
> Â if (IS_HASWELL(dev) || IS_BROADWELL(dev))
> Â sprctl &= ~SPRITE_TRICKLE_FEED_DISABLE;
> Â else
> @@ -577,15 +581,12 @@ ivb_update_plane(struct drm_plane *plane,
> Â Â Â Â fb->pitches[0], rotation);
> Â linear_offset -= sprsurf_offset;
> Â
> - if (rotation & BIT(DRM_ROTATE_180)) {
> - sprctl |= SPRITE_ROTATE_180;
> -
> - /* HSW and BDW does this automagically in hardware */
> - if (!IS_HASWELL(dev) && !IS_BROADWELL(dev)) {
> - x += src_w;
> - y += src_h;
> - linear_offset += src_h * fb->pitches[0] + src_w * cpp;
> - }
> + /* HSW and BDW does this automagically in hardware */
> + if (!IS_HASWELL(dev) && !IS_BROADWELL(dev) &&
> + Â Â Â Â rotation & BIT(DRM_ROTATE_180)) {
> + x += src_w;
> + y += src_h;
> + linear_offset += src_h * fb->pitches[0] + src_w * cpp;
> Â }
> Â
> Â if (key->flags) {
> @@ -696,6 +697,9 @@ ilk_update_plane(struct drm_plane *plane,
> Â if (obj->tiling_mode != I915_TILING_NONE)
> Â dvscntr |= DVS_TILED;
> Â
> + if (rotation & BIT(DRM_ROTATE_180))
> + dvscntr |= DVS_ROTATE_180;
> +
> Â if (IS_GEN6(dev))
> Â dvscntr |= DVS_TRICKLE_FEED_DISABLE; /* must disable */
> Â
> @@ -715,8 +719,6 @@ ilk_update_plane(struct drm_plane *plane,
> Â linear_offset -= dvssurf_offset;
> Â
> Â if (rotation & BIT(DRM_ROTATE_180)) {
> - dvscntr |= DVS_ROTATE_180;
> -
> Â x += src_w;
> Â y += src_h;
> Â linear_offset += src_h * fb->pitches[0] + src_w * cpp;
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
