drm: Nuke drm_calc_{h,v}scale_relaxed()

The fuzzy drm_calc_{h,v}scale_relaxed() helpers are no longer used.
Throw them in the bin.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190206183204.21127-1-ville.syrjala@linux.intel.com
Acked-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c
index 8c057829b80423c93984f8ec78e9ed5a18ba0e5c..66c41b12719cbdbc3bbf7a43d6f45fab861b98d8 100644 (file)
--- a/drivers/gpu/drm/drm_rect.c
+++ b/drivers/gpu/drm/drm_rect.c
@@ -207,114 +207,6 @@ int drm_rect_calc_vscale(const struct drm_rect *src,
 }
 EXPORT_SYMBOL(drm_rect_calc_vscale);
 
-/**
- * drm_calc_hscale_relaxed - calculate the horizontal scaling factor
- * @src: source window rectangle
- * @dst: destination window rectangle
- * @min_hscale: minimum allowed horizontal scaling factor
- * @max_hscale: maximum allowed horizontal scaling factor
- *
- * Calculate the horizontal scaling factor as
- * (@src width) / (@dst width).
- *
- * If the calculated scaling factor is below @min_vscale,
- * decrease the height of rectangle @dst to compensate.
- *
- * If the calculated scaling factor is above @max_vscale,
- * decrease the height of rectangle @src to compensate.
- *
- * If the scale is below 1 << 16, round down. If the scale is above
- * 1 << 16, round up. This will calculate the scale with the most
- * pessimistic limit calculation.
- *
- * RETURNS:
- * The horizontal scaling factor.
- */
-int drm_rect_calc_hscale_relaxed(struct drm_rect *src,
-                                struct drm_rect *dst,
-                                int min_hscale, int max_hscale)
-{
-       int src_w = drm_rect_width(src);
-       int dst_w = drm_rect_width(dst);
-       int hscale = drm_calc_scale(src_w, dst_w);
-
-       if (hscale < 0 || dst_w == 0)
-               return hscale;
-
-       if (hscale < min_hscale) {
-               int max_dst_w = src_w / min_hscale;
-
-               drm_rect_adjust_size(dst, max_dst_w - dst_w, 0);
-
-               return min_hscale;
-       }
-
-       if (hscale > max_hscale) {
-               int max_src_w = dst_w * max_hscale;
-
-               drm_rect_adjust_size(src, max_src_w - src_w, 0);
-
-               return max_hscale;
-       }
-
-       return hscale;
-}
-EXPORT_SYMBOL(drm_rect_calc_hscale_relaxed);
-
-/**
- * drm_rect_calc_vscale_relaxed - calculate the vertical scaling factor
- * @src: source window rectangle
- * @dst: destination window rectangle
- * @min_vscale: minimum allowed vertical scaling factor
- * @max_vscale: maximum allowed vertical scaling factor
- *
- * Calculate the vertical scaling factor as
- * (@src height) / (@dst height).
- *
- * If the calculated scaling factor is below @min_vscale,
- * decrease the height of rectangle @dst to compensate.
- *
- * If the calculated scaling factor is above @max_vscale,
- * decrease the height of rectangle @src to compensate.
- *
- * If the scale is below 1 << 16, round down. If the scale is above
- * 1 << 16, round up. This will calculate the scale with the most
- * pessimistic limit calculation.
- *
- * RETURNS:
- * The vertical scaling factor.
- */
-int drm_rect_calc_vscale_relaxed(struct drm_rect *src,
-                                struct drm_rect *dst,
-                                int min_vscale, int max_vscale)
-{
-       int src_h = drm_rect_height(src);
-       int dst_h = drm_rect_height(dst);
-       int vscale = drm_calc_scale(src_h, dst_h);
-
-       if (vscale < 0 || dst_h == 0)
-               return vscale;
-
-       if (vscale < min_vscale) {
-               int max_dst_h = src_h / min_vscale;
-
-               drm_rect_adjust_size(dst, 0, max_dst_h - dst_h);
-
-               return min_vscale;
-       }
-
-       if (vscale > max_vscale) {
-               int max_src_h = dst_h * max_vscale;
-
-               drm_rect_adjust_size(src, 0, max_src_h - src_h);
-
-               return max_vscale;
-       }
-
-       return vscale;
-}
-EXPORT_SYMBOL(drm_rect_calc_vscale_relaxed);
-
 /**
  * drm_rect_debug_print - print the rectangle information
  * @prefix: prefix string

diff --git a/include/drm/drm_rect.h b/include/drm/drm_rect.h
index 6c54544a4be7f0f3f153ded441ece7b8fbc6f1ff..6195820aa5c5f539946532d38578cefa47e5f341 100644 (file)
--- a/include/drm/drm_rect.h
+++ b/include/drm/drm_rect.h
@@ -182,12 +182,6 @@ int drm_rect_calc_hscale(const struct drm_rect *src,
 int drm_rect_calc_vscale(const struct drm_rect *src,
                         const struct drm_rect *dst,
                         int min_vscale, int max_vscale);
-int drm_rect_calc_hscale_relaxed(struct drm_rect *src,
-                                struct drm_rect *dst,
-                                int min_hscale, int max_hscale);
-int drm_rect_calc_vscale_relaxed(struct drm_rect *src,
-                                struct drm_rect *dst,
-                                int min_vscale, int max_vscale);
 void drm_rect_debug_print(const char *prefix,
                          const struct drm_rect *r, bool fixed_point);
 void drm_rect_rotate(struct drm_rect *r,