All of lore.kernel.org
 help / color / mirror / Atom feed
From: ville.syrjala@linux.intel.com
To: dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH 02/81] drm: Add drm_calc_{hscale, vscale}() utility functions
Date: Wed, 12 Dec 2012 18:15:29 +0200	[thread overview]
Message-ID: <1355329008-31459-3-git-send-email-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <1355329008-31459-1-git-send-email-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/drm_crtc.c |  102 ++++++++++++++++++++++++++++++++++++++++++++
 include/drm/drm_crtc.h     |    4 ++
 2 files changed, 106 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index f64e572..8918179 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -4078,3 +4078,105 @@ bool drm_region_clip_scaled(struct drm_region *src, struct drm_region *dst,
 	return drm_region_clip(dst, clip);
 }
 EXPORT_SYMBOL(drm_region_clip_scaled);
+
+/**
+ * drm_calc_hscale - calculate the horizontal scaling factor
+ * @src: source window region
+ * @dst: destination window region
+ * @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_hscale,
+ * decrease the width of region @dst to compensate.
+ *
+ * If the calculcated scaling factor is above @max_hscale,
+ * decrease the width of region @src to compensate.
+ *
+ * RETURNS:
+ * The horizontal scaling factor.
+ */
+int drm_calc_hscale(struct drm_region *src, struct drm_region *dst,
+		    int min_hscale, int max_hscale)
+{
+	int src_w = drm_region_width(src);
+	int dst_w = drm_region_width(dst);
+	int hscale;
+
+	if (dst_w <= 0)
+		return 0;
+
+	hscale = src_w / dst_w;
+
+	if (hscale < min_hscale) {
+		int max_dst_w = src_w / min_hscale;
+
+		drm_region_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_region_adjust_size(src, max_src_w - src_w, 0);
+
+		return max_hscale;
+	}
+
+	return hscale;
+}
+EXPORT_SYMBOL(drm_calc_hscale);
+
+/**
+ * drm_calc_vscale - calculate the vertical scaling factor
+ * @src: source window region
+ * @dst: destination window region
+ * @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 region @dst to compensate.
+ *
+ * If the calculcated scaling factor is above @max_vscale,
+ * decrease the height of region @src to compensate.
+ *
+ * RETURNS:
+ * The vertical scaling factor.
+ */
+int drm_calc_vscale(struct drm_region *src, struct drm_region *dst,
+		    int min_vscale, int max_vscale)
+{
+	int src_h = drm_region_height(src);
+	int dst_h = drm_region_height(dst);
+	int vscale;
+
+	if (dst_h <= 0)
+		return 0;
+
+	vscale = src_h / dst_h;
+
+	if (vscale < min_vscale) {
+		int max_dst_h = src_h / min_vscale;
+
+		drm_region_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_region_adjust_size(src, 0, max_src_h - src_h);
+
+		return max_vscale;
+	}
+
+	return vscale;
+}
+EXPORT_SYMBOL(drm_calc_vscale);
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 0ac6d83..a80a346 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -1105,5 +1105,9 @@ extern bool drm_region_clip_scaled(struct drm_region *src,
 				   struct drm_region *dst,
 				   const struct drm_region *clip,
 				   int hscale, int vscale);
+extern int drm_calc_hscale(struct drm_region *src, struct drm_region *dst,
+			   int min_hscale, int max_hscale);
+extern int drm_calc_vscale(struct drm_region *src, struct drm_region *dst,
+			   int min_vscale, int max_vscale);
 
 #endif /* __DRM_CRTC_H__ */
-- 
1.7.8.6

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2012-12-12 16:15 UTC|newest]

Thread overview: 85+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-12 16:15 [PATCH 00/81] drm/i915: Atomic mode setting / page flip, yet again ville.syrjala
2012-12-12 16:15 ` [PATCH 01/81] drm: Add struct drm_region and assorted utility functions ville.syrjala
2012-12-12 16:15 ` ville.syrjala [this message]
2012-12-12 16:15 ` [PATCH 03/81] drm: Keep a copy of last plane coordinates ville.syrjala
2012-12-12 16:15 ` [PATCH 04/81] drm: Add restore_fbdev_mode() hook to drm_fb_helper ville.syrjala
2012-12-12 16:15 ` [PATCH 05/81] drm: Export drm_property_create_blob() and drm_property_destroy_blob() ville.syrjala
2012-12-12 16:15 ` [PATCH 06/81] drm: Allow signed values for range properties ville.syrjala
2012-12-12 16:15 ` [PATCH 07/81] drm: Allow drm_mode_object_find() to look up an object of any type ville.syrjala
2012-12-12 16:15 ` [PATCH 08/81] drm: Export drm_encoder_crtc_ok ville.syrjala
2012-12-12 16:15 ` [PATCH 09/81] drm: Export drm_crtc_prepare_encoders() ville.syrjala
2012-12-12 16:15 ` [PATCH 10/81] drm: Refactor object property check code ville.syrjala
2012-12-12 16:15 ` [PATCH 11/81] drm: Export mode<->umode conversion functions ville.syrjala
2012-12-12 16:15 ` [PATCH 12/81] drm: Make blobs resizeable ville.syrjala
2012-12-12 16:15 ` [PATCH 13/81] drm: Add drm_flip helper ville.syrjala
2012-12-12 16:15 ` [PATCH 14/81] drm: Add mode_blob and connector_ids_blob to drm_crtc ville.syrjala
2012-12-12 16:15 ` [PATCH 15/81] drm: Add the atomic modeset ioctl ville.syrjala
2012-12-12 16:15 ` [PATCH 16/81] drm/i915: Use drm_format_plane_cpp() rather than bits_per_pixel/8 ville.syrjala
2012-12-12 16:15 ` [PATCH 17/81] drm/i915: Implement proper clipping for video sprites ville.syrjala
2012-12-12 16:15 ` [PATCH 18/81] drm/i915: Implement restore_fbdev_mode hook ville.syrjala
2012-12-12 16:15 ` [PATCH 19/81] drm/i915: Split clipping and checking from update_plane hook ville.syrjala
2012-12-12 16:15 ` [PATCH 20/81] drm/i915: Factor out i9xx_compute_clocks() like ironlake_compute_clocks() ville.syrjala
2012-12-12 16:15 ` [PATCH 21/81] drm/i915: Consitify adjusted_mode parameter ville.syrjala
2012-12-12 16:15 ` [PATCH 22/81] drm/i915: Add intel_check_clock() ville.syrjala
2012-12-12 16:15 ` [PATCH 23/81] drm/i915: store cursor_handle in struct intel_crtc ville.syrjala
2012-12-12 16:15 ` [PATCH 24/81] drm/i915: split cursor setting code into prepare/commit/unref parts ville.syrjala
2012-12-12 16:15 ` [PATCH 25/81] drm/i915: unstatic cursor functions for use with atomic modesetting ville.syrjala
2012-12-12 16:15 ` [PATCH 26/81] drm/i915: Unstatic intel_finish_fb() ville.syrjala
2012-12-12 16:15 ` [PATCH 27/81] drm/i915: Pull intel_pipe_set_base() out of the crtc_mode_set() functions ville.syrjala
2012-12-12 16:15 ` [PATCH 28/81] drm/i915: Unstatic intel_crtc_update_sarea() ville.syrjala
2012-12-12 16:15 ` [PATCH 29/81] drm/i915: Unstatic intel_crtc_update_sarea_pos() ville.syrjala
2012-12-12 16:15 ` [PATCH 30/81] drm/i915: Constify mode argument to intel_modeset_adjusted_mode() ville.syrjala
2012-12-12 16:15 ` [PATCH 31/81] drm/i915: Unstatic intel_crtc_mode_fixup() ville.syrjala
2012-12-12 16:15 ` [PATCH 32/81] drm/i915: Introduce intel_plane_regs ville.syrjala
2012-12-12 16:16 ` [PATCH 33/81] drm/i915: Split primary plane update_plane() into calc+commit phases ville.syrjala
2012-12-12 16:16 ` [PATCH 34/81] drm/i915: Split sprite " ville.syrjala
2012-12-12 16:16 ` [PATCH 35/81] drm/i915: Implement atomic modesetting ville.syrjala
2012-12-12 16:16 ` [PATCH 36/81] drm/i915: Add support for atomic modesetting completion events ville.syrjala
2012-12-12 16:16 ` [PATCH 37/81] drm/i915: Add atomic page flip support ville.syrjala
2012-12-12 16:16 ` [PATCH 38/81] drm/i915: Unstatic intel_enable_primary() and intel_disable_primary() ville.syrjala
2012-12-12 16:16 ` [PATCH 39/81] drm/i915: Respect primary_disabled in crtc_enable() ville.syrjala
2012-12-12 16:16 ` [PATCH 40/81] drm/i915: Enable/disable primary plane in calc_plane() ville.syrjala
2012-12-12 16:16 ` [PATCH 41/81] drm/i915: Add primary plane disable logic to atomic mode setting code ville.syrjala
2012-12-12 16:16 ` [PATCH 42/81] drm: Add missing EXPORT_SYMBOL()s for drm_flip ville.syrjala
2012-12-12 16:16 ` [PATCH 43/81] drm/i915: Clear flip helpers for sprites too ville.syrjala
2012-12-12 16:16 ` [PATCH 44/81] drm/i915: Refactor property handling in atomic code ville.syrjala
2012-12-12 16:16 ` [PATCH 45/81] drm/i915: Move standard properties under mode_config ville.syrjala
2012-12-12 16:16 ` [PATCH 46/81] drm_crtc_helper: Update standard crtc properties after modeset ville.syrjala
2012-12-12 16:16 ` [PATCH 47/81] drm: Update standard plane properties after update_plane/disable_plane ville.syrjala
2012-12-12 16:16 ` [PATCH 48/81] drm/i915: Update CRTC properties after modeset ville.syrjala
2012-12-12 16:16 ` [PATCH 49/81] drm: Move standard crtc/plane prop handling to drm_crtc.c ville.syrjala
2012-12-12 16:16 ` [PATCH 50/81] drm/i915: Use intel_best_encoder() directly ville.syrjala
2012-12-12 16:16 ` [PATCH 51/81] drm/i915: Unstatic intel_modeset_update_staged_output_state() ville.syrjala
2012-12-12 16:16 ` [PATCH 52/81] drm/i915: Update new_crtc and new_encoder fields after atomic modeset ville.syrjala
2012-12-12 16:16 ` [PATCH 53/81] drm/i915: Update connector DPMS state after an " ville.syrjala
2012-12-12 16:16 ` [PATCH 54/81] drm/i915: Kill the pending_flip counter manipulations ville.syrjala
2012-12-12 16:16 ` [PATCH 55/81] drm/i915: Don't mark cursor as pinned, when we don't have a cursor bo ville.syrjala
2012-12-12 16:16 ` [PATCH 56/81] drm/i915: Fix sprite_scaling_enabled for multiple sprites ville.syrjala
2012-12-12 16:16 ` [PATCH 57/81] drm/i915: Fix hiding the cursor with atomic ioctl ville.syrjala
2012-12-12 16:16 ` [PATCH 58/81] drm/i915: Fix plane src rectangle dirty check ville.syrjala
2012-12-12 16:16 ` [PATCH 59/81] drm/i915: Send atomic completion events even if nothing changed ville.syrjala
2012-12-12 16:16 ` [PATCH 60/81] drm/i915: Unpin old fbs only when appropriate ville.syrjala
2012-12-12 16:16 ` [PATCH 61/81] drm/i915: Remove stale prototypes form atomic code ville.syrjala
2012-12-12 16:16 ` [PATCH 62/81] drm/i915: Unstatic i915_gem_check_olr() ville.syrjala
2012-12-12 16:16 ` [PATCH 63/81] drm/i915: Refactor atomic flip code ville.syrjala
2012-12-12 16:16 ` [PATCH 64/81] drm/i915: Implement a non-blocking GPU synchronization mechanism for atomic page flips ville.syrjala
2012-12-12 16:16 ` [PATCH 65/81] drm/i915: Release all atomic flips when GPU hangs ville.syrjala
2012-12-12 16:16 ` [PATCH 66/81] drm/i915: Make a copy of the calculated plane regs ville.syrjala
2012-12-12 16:16 ` [PATCH 67/81] drm/i915: Clear pending flips in haswell_crtc_disable() ville.syrjala
2012-12-12 16:16 ` [PATCH 68/81] drm/i915: Drop all flips waiting for the GPU when the CRTC is about to be disabled ville.syrjala
2012-12-12 16:16 ` [PATCH 69/81] drm/i915: Refactor flip preaparation ville.syrjala
2012-12-12 16:16 ` [PATCH 70/81] drm/i915: Unstatic intel_modeset_commit_output_state() ville.syrjala
2012-12-12 16:16 ` [PATCH 71/81] drm/i915: Eliminate swap_old_new() hack in the atomic code ville.syrjala
2012-12-12 16:16 ` [PATCH 72/81] drm: Drop old_crtc and old_encoder pointers ville.syrjala
2012-12-12 16:16 ` [PATCH 73/81] drm/i915: Use new_crtc when checking if CRTC is in use ville.syrjala
2012-12-12 16:16 ` [PATCH 74/81] drm/i915: Add some TODO items to the atomic code ville.syrjala
2012-12-12 16:16 ` [PATCH 75/81] drm/i915: Drop some stale FIXMEs from " ville.syrjala
2012-12-12 16:16 ` [PATCH 76/81] drm/i915: Add pin count trace point ville.syrjala
2012-12-12 16:16 ` [PATCH 77/81] drm/i915: Add trace points for flip queue length ville.syrjala
2012-12-12 16:16 ` [PATCH 78/81] HACK: drm/i915: Make non-blocking GPU synchronization optional ville.syrjala
2012-12-12 16:16 ` [PATCH 79/81] drm/i915: Add some timing debugs to atomic flips ville.syrjala
2012-12-12 16:16 ` [PATCH 80/81] drm/i915: Add post flush DSL readout for surflive debug ville.syrjala
2012-12-12 16:16 ` [PATCH 81/81] drm/i915: Add trace point for atomic flip vblank evade ville.syrjala
2012-12-13 14:17 ` [PATCH 00/81] drm/i915: Atomic mode setting / page flip, yet again Daniel Vetter
2012-12-13 14:33   ` Ville Syrjälä
2012-12-14 16:28 ` Ville Syrjälä

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1355329008-31459-3-git-send-email-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.