[PATCH v4] drm: Add struct drm_rect and assorted utility functions
On Sat, Apr 06, 2013 at 02:00:31AM +0200, Laurent Pinchart wrote: > Hi Ville, > > Thanks for the patch. > > On Friday 05 April 2013 16:19:36 ville.syrjala at linux.intel.com wrote: > > From: Ville Syrj?l? > > > > struct drm_rect represents a simple rectangle. The utility > > functions are there to help driver writers. > > > > v2: Moved the region stuff into its own file, made the smaller funcs > > static inline, used 64bit maths in the scaled clipping function to > > avoid overflows (instead it will saturate to INT_MIN or INT_MAX). > > v3: Renamed drm_region to drm_rect, drm_region_clip to > > drm_rect_intersect, and drm_region_subsample to drm_rect_downscale. > > v4: Renamed some function parameters, improve kernel-doc comments a bit, > > and actually generate documentation for drm_rect.[ch]. > > > > Signed-off-by: Ville Syrj?l? > > --- > > Documentation/DocBook/drm.tmpl | 2 + > > drivers/gpu/drm/Makefile | 3 +- > > drivers/gpu/drm/drm_rect.c | 96 ++ > > include/drm/drm_rect.h | 132 ++ > > 4 files changed, 232 insertions(+), 1 deletion(-) > > create mode 100644 drivers/gpu/drm/drm_rect.c > > create mode 100644 include/drm/drm_rect.h > > [snip] > > > diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c > > new file mode 100644 > > index 000..a9861bd > > --- /dev/null > > +++ b/drivers/gpu/drm/drm_rect.c > > [snip] > > > +/** > > + * drm_rect_clip_scaled - perform a scaled clip operation > > + * @src: source window rectangle > > + * @dst: destination window rectangle > > + * @clip: clip rectangle > > + * @hscale: horizontal scaling factor > > + * @vscale: vertical scaling factor > > + * > > + * Clip rectangle @dst by rectangle @clip. Clip rectangle @src by the > > + * same amounts multiplied by @hscale and @vscale. > > + * > > + * RETUTRNS: > > s/RETUTRNS/RETURNS/ Fixed. > > > + * %true if rectangle @dst is still visible after being clipped, > > + * %false otherwise > > + */ > > Otherwise, > > Reviewed-by: Laurent Pinchart Thank you very much. -- Ville Syrj?l? Intel OTC
Re: [PATCH v4] drm: Add struct drm_rect and assorted utility functions
On Sat, Apr 06, 2013 at 02:00:31AM +0200, Laurent Pinchart wrote: > Hi Ville, > > Thanks for the patch. > > On Friday 05 April 2013 16:19:36 ville.syrj...@linux.intel.com wrote: > > From: Ville Syrjälä > > > > struct drm_rect represents a simple rectangle. The utility > > functions are there to help driver writers. > > > > v2: Moved the region stuff into its own file, made the smaller funcs > > static inline, used 64bit maths in the scaled clipping function to > > avoid overflows (instead it will saturate to INT_MIN or INT_MAX). > > v3: Renamed drm_region to drm_rect, drm_region_clip to > > drm_rect_intersect, and drm_region_subsample to drm_rect_downscale. > > v4: Renamed some function parameters, improve kernel-doc comments a bit, > > and actually generate documentation for drm_rect.[ch]. > > > > Signed-off-by: Ville Syrjälä > > --- > > Documentation/DocBook/drm.tmpl | 2 + > > drivers/gpu/drm/Makefile | 3 +- > > drivers/gpu/drm/drm_rect.c | 96 ++ > > include/drm/drm_rect.h | 132 ++ > > 4 files changed, 232 insertions(+), 1 deletion(-) > > create mode 100644 drivers/gpu/drm/drm_rect.c > > create mode 100644 include/drm/drm_rect.h > > [snip] > > > diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c > > new file mode 100644 > > index 000..a9861bd > > --- /dev/null > > +++ b/drivers/gpu/drm/drm_rect.c > > [snip] > > > +/** > > + * drm_rect_clip_scaled - perform a scaled clip operation > > + * @src: source window rectangle > > + * @dst: destination window rectangle > > + * @clip: clip rectangle > > + * @hscale: horizontal scaling factor > > + * @vscale: vertical scaling factor > > + * > > + * Clip rectangle @dst by rectangle @clip. Clip rectangle @src by the > > + * same amounts multiplied by @hscale and @vscale. > > + * > > + * RETUTRNS: > > s/RETUTRNS/RETURNS/ Fixed. > > > + * %true if rectangle @dst is still visible after being clipped, > > + * %false otherwise > > + */ > > Otherwise, > > Reviewed-by: Laurent Pinchart Thank you very much. -- Ville Syrjälä Intel OTC ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[PATCH v4] drm: Add struct drm_rect and assorted utility functions
Hi Ville, Thanks for the patch. On Friday 05 April 2013 16:19:36 ville.syrjala at linux.intel.com wrote: > From: Ville Syrj?l? > > struct drm_rect represents a simple rectangle. The utility > functions are there to help driver writers. > > v2: Moved the region stuff into its own file, made the smaller funcs > static inline, used 64bit maths in the scaled clipping function to > avoid overflows (instead it will saturate to INT_MIN or INT_MAX). > v3: Renamed drm_region to drm_rect, drm_region_clip to > drm_rect_intersect, and drm_region_subsample to drm_rect_downscale. > v4: Renamed some function parameters, improve kernel-doc comments a bit, > and actually generate documentation for drm_rect.[ch]. > > Signed-off-by: Ville Syrj?l? > --- > Documentation/DocBook/drm.tmpl | 2 + > drivers/gpu/drm/Makefile | 3 +- > drivers/gpu/drm/drm_rect.c | 96 ++ > include/drm/drm_rect.h | 132 ++ > 4 files changed, 232 insertions(+), 1 deletion(-) > create mode 100644 drivers/gpu/drm/drm_rect.c > create mode 100644 include/drm/drm_rect.h [snip] > diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c > new file mode 100644 > index 000..a9861bd > --- /dev/null > +++ b/drivers/gpu/drm/drm_rect.c [snip] > +/** > + * drm_rect_clip_scaled - perform a scaled clip operation > + * @src: source window rectangle > + * @dst: destination window rectangle > + * @clip: clip rectangle > + * @hscale: horizontal scaling factor > + * @vscale: vertical scaling factor > + * > + * Clip rectangle @dst by rectangle @clip. Clip rectangle @src by the > + * same amounts multiplied by @hscale and @vscale. > + * > + * RETUTRNS: s/RETUTRNS/RETURNS/ > + * %true if rectangle @dst is still visible after being clipped, > + * %false otherwise > + */ Otherwise, Reviewed-by: Laurent Pinchart -- Regards, Laurent Pinchart
Re: [PATCH v4] drm: Add struct drm_rect and assorted utility functions
Hi Ville, Thanks for the patch. On Friday 05 April 2013 16:19:36 ville.syrj...@linux.intel.com wrote: > From: Ville Syrjälä > > struct drm_rect represents a simple rectangle. The utility > functions are there to help driver writers. > > v2: Moved the region stuff into its own file, made the smaller funcs > static inline, used 64bit maths in the scaled clipping function to > avoid overflows (instead it will saturate to INT_MIN or INT_MAX). > v3: Renamed drm_region to drm_rect, drm_region_clip to > drm_rect_intersect, and drm_region_subsample to drm_rect_downscale. > v4: Renamed some function parameters, improve kernel-doc comments a bit, > and actually generate documentation for drm_rect.[ch]. > > Signed-off-by: Ville Syrjälä > --- > Documentation/DocBook/drm.tmpl | 2 + > drivers/gpu/drm/Makefile | 3 +- > drivers/gpu/drm/drm_rect.c | 96 ++ > include/drm/drm_rect.h | 132 ++ > 4 files changed, 232 insertions(+), 1 deletion(-) > create mode 100644 drivers/gpu/drm/drm_rect.c > create mode 100644 include/drm/drm_rect.h [snip] > diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c > new file mode 100644 > index 000..a9861bd > --- /dev/null > +++ b/drivers/gpu/drm/drm_rect.c [snip] > +/** > + * drm_rect_clip_scaled - perform a scaled clip operation > + * @src: source window rectangle > + * @dst: destination window rectangle > + * @clip: clip rectangle > + * @hscale: horizontal scaling factor > + * @vscale: vertical scaling factor > + * > + * Clip rectangle @dst by rectangle @clip. Clip rectangle @src by the > + * same amounts multiplied by @hscale and @vscale. > + * > + * RETUTRNS: s/RETUTRNS/RETURNS/ > + * %true if rectangle @dst is still visible after being clipped, > + * %false otherwise > + */ Otherwise, Reviewed-by: Laurent Pinchart -- Regards, Laurent Pinchart ___ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
[PATCH v4] drm: Add struct drm_rect and assorted utility functions
From: Ville Syrj?l?
struct drm_rect represents a simple rectangle. The utility
functions are there to help driver writers.
v2: Moved the region stuff into its own file, made the smaller funcs
static inline, used 64bit maths in the scaled clipping function to
avoid overflows (instead it will saturate to INT_MIN or INT_MAX).
v3: Renamed drm_region to drm_rect, drm_region_clip to
drm_rect_intersect, and drm_region_subsample to drm_rect_downscale.
v4: Renamed some function parameters, improve kernel-doc comments a bit,
and actually generate documentation for drm_rect.[ch].
Signed-off-by: Ville Syrj?l?
---
Documentation/DocBook/drm.tmpl | 2 +
drivers/gpu/drm/Makefile | 3 +-
drivers/gpu/drm/drm_rect.c | 96 ++
include/drm/drm_rect.h | 132 +
4 files changed, 232 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/drm_rect.c
create mode 100644 include/drm/drm_rect.h
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index f9df3b8..7c7af25 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -1653,6 +1653,8 @@ void intel_crt_init(struct drm_device *dev)
KMS API Functions
!Edrivers/gpu/drm/drm_crtc.c
+!Edrivers/gpu/drm/drm_rect.c
+!Finclude/drm/drm_rect.h
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 0d59b24..8f94018 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -12,7 +12,8 @@ drm-y :=drm_auth.o drm_buffer.o drm_bufs.o
drm_cache.o \
drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \
drm_crtc.o drm_modes.o drm_edid.o \
drm_info.o drm_debugfs.o drm_encoder_slave.o \
- drm_trace_points.o drm_global.o drm_prime.o
+ drm_trace_points.o drm_global.o drm_prime.o \
+ drm_rect.o
drm-$(CONFIG_COMPAT) += drm_ioc32.o
drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c
new file mode 100644
index 000..a9861bd
--- /dev/null
+++ b/drivers/gpu/drm/drm_rect.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2011-2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE
+ * SOFTWARE.
+ */
+
+#include
+#include
+#include
+#include
+
+/**
+ * drm_rect_intersect - intersect two rectangles
+ * @r1: first rectangle
+ * @r2: second rectangle
+ *
+ * Calculate the intersection of rectangles @r1 and @r2.
+ * @r1 will be overwritten with the intersection.
+ *
+ * RETURNS:
+ * %true if rectangle @r1 is still visible after the operation,
+ * %false otherwise.
+ */
+bool drm_rect_intersect(struct drm_rect *r1, const struct drm_rect *r2)
+{
+ r1->x1 = max(r1->x1, r2->x1);
+ r1->y1 = max(r1->y1, r2->y1);
+ r1->x2 = min(r1->x2, r2->x2);
+ r1->y2 = min(r1->y2, r2->y2);
+
+ return drm_rect_visible(r1);
+}
+EXPORT_SYMBOL(drm_rect_intersect);
+
+/**
+ * drm_rect_clip_scaled - perform a scaled clip operation
+ * @src: source window rectangle
+ * @dst: destination window rectangle
+ * @clip: clip rectangle
+ * @hscale: horizontal scaling factor
+ * @vscale: vertical scaling factor
+ *
+ * Clip rectangle @dst by rectangle @clip. Clip rectangle @src by the
+ * same amounts multiplied by @hscale and @vscale.
+ *
+ * RETUTRNS:
+ * %true if rectangle @dst is still visible after being clipped,
+ * %false otherwise
+ */
+bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
+ const struct drm_rect *clip,
+ int hscale, int vscale)
+{
+ int diff;
+
+ diff = clip->x1 - dst->x1;
+ if (diff > 0) {
+ int64_t tmp = src->x1 + (int64_t) diff * hscale;
+ src->x1 = clamp_t(int64_t, tmp, INT_MIN, INT_MAX);
+ }
+ diff = clip->y1
[PATCH v4] drm: Add struct drm_rect and assorted utility functions
From: Ville Syrjälä
struct drm_rect represents a simple rectangle. The utility
functions are there to help driver writers.
v2: Moved the region stuff into its own file, made the smaller funcs
static inline, used 64bit maths in the scaled clipping function to
avoid overflows (instead it will saturate to INT_MIN or INT_MAX).
v3: Renamed drm_region to drm_rect, drm_region_clip to
drm_rect_intersect, and drm_region_subsample to drm_rect_downscale.
v4: Renamed some function parameters, improve kernel-doc comments a bit,
and actually generate documentation for drm_rect.[ch].
Signed-off-by: Ville Syrjälä
---
Documentation/DocBook/drm.tmpl | 2 +
drivers/gpu/drm/Makefile | 3 +-
drivers/gpu/drm/drm_rect.c | 96 ++
include/drm/drm_rect.h | 132 +
4 files changed, 232 insertions(+), 1 deletion(-)
create mode 100644 drivers/gpu/drm/drm_rect.c
create mode 100644 include/drm/drm_rect.h
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index f9df3b8..7c7af25 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -1653,6 +1653,8 @@ void intel_crt_init(struct drm_device *dev)
KMS API Functions
!Edrivers/gpu/drm/drm_crtc.c
+!Edrivers/gpu/drm/drm_rect.c
+!Finclude/drm/drm_rect.h
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 0d59b24..8f94018 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -12,7 +12,8 @@ drm-y :=drm_auth.o drm_buffer.o drm_bufs.o
drm_cache.o \
drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \
drm_crtc.o drm_modes.o drm_edid.o \
drm_info.o drm_debugfs.o drm_encoder_slave.o \
- drm_trace_points.o drm_global.o drm_prime.o
+ drm_trace_points.o drm_global.o drm_prime.o \
+ drm_rect.o
drm-$(CONFIG_COMPAT) += drm_ioc32.o
drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c
new file mode 100644
index 000..a9861bd
--- /dev/null
+++ b/drivers/gpu/drm/drm_rect.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2011-2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE
+ * SOFTWARE.
+ */
+
+#include
+#include
+#include
+#include
+
+/**
+ * drm_rect_intersect - intersect two rectangles
+ * @r1: first rectangle
+ * @r2: second rectangle
+ *
+ * Calculate the intersection of rectangles @r1 and @r2.
+ * @r1 will be overwritten with the intersection.
+ *
+ * RETURNS:
+ * %true if rectangle @r1 is still visible after the operation,
+ * %false otherwise.
+ */
+bool drm_rect_intersect(struct drm_rect *r1, const struct drm_rect *r2)
+{
+ r1->x1 = max(r1->x1, r2->x1);
+ r1->y1 = max(r1->y1, r2->y1);
+ r1->x2 = min(r1->x2, r2->x2);
+ r1->y2 = min(r1->y2, r2->y2);
+
+ return drm_rect_visible(r1);
+}
+EXPORT_SYMBOL(drm_rect_intersect);
+
+/**
+ * drm_rect_clip_scaled - perform a scaled clip operation
+ * @src: source window rectangle
+ * @dst: destination window rectangle
+ * @clip: clip rectangle
+ * @hscale: horizontal scaling factor
+ * @vscale: vertical scaling factor
+ *
+ * Clip rectangle @dst by rectangle @clip. Clip rectangle @src by the
+ * same amounts multiplied by @hscale and @vscale.
+ *
+ * RETUTRNS:
+ * %true if rectangle @dst is still visible after being clipped,
+ * %false otherwise
+ */
+bool drm_rect_clip_scaled(struct drm_rect *src, struct drm_rect *dst,
+ const struct drm_rect *clip,
+ int hscale, int vscale)
+{
+ int diff;
+
+ diff = clip->x1 - dst->x1;
+ if (diff > 0) {
+ int64_t tmp = src->x1 + (int64_t) diff * hscale;
+ src->x1 = clamp_t(int64_t, tmp, INT_MIN, INT_MAX);
+ }
+ diff = clip->y
