Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73714c05 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Fix 90/270 rotated coordinates for FBC 



The clipped src coordinates have already been rotated by 270 degrees for
when the plane rotation is 90/270 degrees, hence the FBC code should no
longer swap the width and height.

Cc: stable@vger.kernel.org
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Fixes: b63a16f6 ("drm/i915: Compute display surface offset in the plane check hook for SKL+")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170331180056.14086-4-ville.syrjala@linux.intel.com


Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Tested-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent fce5adf5

drivers/gpu/drm/i915/intel_fbc.c

+7 −12
Original line number Diff line number Diff line
@@ -82,20 +82,10 @@ static unsigned int get_crtc_fence_y_offset(struct intel_crtc *crtc) 
static void intel_fbc_get_plane_source_size(struct intel_fbc_state_cache *cache,

					    int *width, int *height)

{

	int w, h;



	if (drm_rotation_90_or_270(cache->plane.rotation)) {

		w = cache->plane.src_h;

		h = cache->plane.src_w;

	} else {

		w = cache->plane.src_w;

		h = cache->plane.src_h;

	}



	if (width)

		*width = w;

		*width = cache->plane.src_w;

	if (height)

		*height = h;

		*height = cache->plane.src_h;

}



static int intel_fbc_calculate_cfb_size(struct drm_i915_private *dev_priv,
@@ -746,6 +736,11 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, 
		cache->crtc.hsw_bdw_pixel_rate = crtc_state->pixel_rate;



	cache->plane.rotation = plane_state->base.rotation;

	/*

	 * Src coordinates are already rotated by 270 degrees for

	 * the 90/270 degree plane rotation cases (to match the

	 * GTT mapping), hence no need to account for rotation here.

	 */

	cache->plane.src_w = drm_rect_width(&plane_state->base.src) >> 16;

	cache->plane.src_h = drm_rect_height(&plane_state->base.src) >> 16;

	cache->plane.visible = plane_state->base.visible;