From: Sean Paul <seanpaul@chromium.org>
Date: Tue, 20 Jun 2017 15:50:41 +0000 (-0400)
Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes
X-Git-Tag: v4.13-rc1~45^2~1^2~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b15cdca5b5de52dc2262c41917e8727b96b30fb0;p=linux.git

Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes

Backmerging airlied/drm-next
---

b15cdca5b5de52dc2262c41917e8727b96b30fb0
diff --cc drivers/gpu/drm/i915/intel_pm.c
index 078fd1bfa5ea,fce4bc5ccc99..f2c1d030f7f9
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -3373,31 -3841,26 +3841,32 @@@ skl_plane_downscale_amount(const struc
  
  	/* n.b., src is 16.16 fixed point, dst is whole integer */
  	if (plane->id == PLANE_CURSOR) {
 +		/*
 +		 * Cursors only support 0/180 degree rotation,
 +		 * hence no need to account for rotation here.
 +		 */
- 		src_w = pstate->base.src_w;
- 		src_h = pstate->base.src_h;
+ 		src_w = pstate->base.src_w >> 16;
+ 		src_h = pstate->base.src_h >> 16;
  		dst_w = pstate->base.crtc_w;
  		dst_h = pstate->base.crtc_h;
  	} else {
 +		/*
 +		 * 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.
 +		 */
- 		src_w = drm_rect_width(&pstate->base.src);
- 		src_h = drm_rect_height(&pstate->base.src);
+ 		src_w = drm_rect_width(&pstate->base.src) >> 16;
+ 		src_h = drm_rect_height(&pstate->base.src) >> 16;
  		dst_w = drm_rect_width(&pstate->base.dst);
  		dst_h = drm_rect_height(&pstate->base.dst);
  	}
  
- 	downscale_h = max(src_h / dst_h, (uint32_t)DRM_PLANE_HELPER_NO_SCALING);
- 	downscale_w = max(src_w / dst_w, (uint32_t)DRM_PLANE_HELPER_NO_SCALING);
 -	if (drm_rotation_90_or_270(pstate->base.rotation))
 -		swap(dst_w, dst_h);
 -
+ 	fp_w_ratio = fixed_16_16_div(src_w, dst_w);
+ 	fp_h_ratio = fixed_16_16_div(src_h, dst_h);
+ 	downscale_w = max_fixed_16_16(fp_w_ratio, u32_to_fixed_16_16(1));
+ 	downscale_h = max_fixed_16_16(fp_h_ratio, u32_to_fixed_16_16(1));
  
- 	/* Provide result in 16.16 fixed point */
- 	return (uint64_t)downscale_w * downscale_h >> 16;
+ 	return mul_fixed16(downscale_w, downscale_h);
  }
  
  static unsigned int