From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Date: Mon, 25 Apr 2016 12:39:07 +0000 Subject: Re: [PATCH v2 1/8] drm/rect: Add some drm_clip_rect utility functions Message-Id: <20160425123907.GY4329@intel.com> List-Id: References: <1461530942-22485-1-git-send-email-noralf@tronnes.org> <1461530942-22485-2-git-send-email-noralf@tronnes.org> In-Reply-To: <1461530942-22485-2-git-send-email-noralf@tronnes.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: linux-fbdev@vger.kernel.org, tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org On Sun, Apr 24, 2016 at 10:48:55PM +0200, Noralf Tr=F8nnes wrote: > Add some utility functions for struct drm_clip_rect. Looks like mostly you're just duplicating the drm_rect stuff. Why can't you use what's there already? >=20 > Signed-off-by: Noralf Tr=F8nnes > --- > drivers/gpu/drm/drm_rect.c | 67 ++++++++++++++++++++++++++++++++++++++++= ++++ > include/drm/drm_rect.h | 69 ++++++++++++++++++++++++++++++++++++++++= ++++++ > 2 files changed, 136 insertions(+) >=20 > diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c > index a8e2c86..a9fb1a8 100644 > --- a/drivers/gpu/drm/drm_rect.c > +++ b/drivers/gpu/drm/drm_rect.c > @@ -434,3 +434,70 @@ void drm_rect_rotate_inv(struct drm_rect *r, > } > } > EXPORT_SYMBOL(drm_rect_rotate_inv); > + > +/** > + * drm_clip_rect_intersect - intersect two clip rectangles > + * @r1: first clip rectangle > + * @r2: second clip rectangle > + * > + * Calculate the intersection of clip 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_clip_rect_intersect(struct drm_clip_rect *r1, > + const struct drm_clip_rect *r2) > +{ > + r1->x1 =3D max(r1->x1, r2->x1); > + r1->y1 =3D max(r1->y1, r2->y1); > + r1->x2 =3D min(r1->x2, r2->x2); > + r1->y2 =3D min(r1->y2, r2->y2); > + > + return drm_clip_rect_visible(r1); > +} > +EXPORT_SYMBOL(drm_clip_rect_intersect); > + > +/** > + * drm_clip_rect_merge - Merge clip rectangles > + * @dst: destination clip rectangle > + * @src: source clip rectangle(s), can be NULL > + * @num_clips: number of source clip rectangles > + * @flags: drm_mode_fb_dirty_cmd flags (DRM_MODE_FB_DIRTY_ANNOTATE_COPY) > + * @width: width of clip rectangle if @src is NULL > + * @height: height of clip rectangle if @src is NULL > + * > + * The dirtyfb ioctl allows for a NULL clip rectangle to be passed in, > + * so if @src is NULL, width and height is used to set a full clip recta= ngle. > + * @dst takes part in the merge unless it is empty {0,0,0,0}. > + */ > +void drm_clip_rect_merge(struct drm_clip_rect *dst, > + struct drm_clip_rect *src, unsigned num_clips, > + unsigned flags, u32 width, u32 height) > +{ > + int i; > + > + if (!src || !num_clips) { > + dst->x1 =3D 0; > + dst->x2 =3D width; > + dst->y1 =3D 0; > + dst->y2 =3D height; > + return; > + } > + > + if (drm_clip_rect_is_empty(dst)) { > + dst->x1 =3D ~0; > + dst->y1 =3D ~0; > + } > + > + for (i =3D 0; i < num_clips; i++) { > + if (flags & DRM_MODE_FB_DIRTY_ANNOTATE_COPY) > + i++; > + dst->x1 =3D min(dst->x1, src[i].x1); > + dst->x2 =3D max(dst->x2, src[i].x2); > + dst->y1 =3D min(dst->y1, src[i].y1); > + dst->y2 =3D max(dst->y2, src[i].y2); > + } > +} > +EXPORT_SYMBOL(drm_clip_rect_merge); > diff --git a/include/drm/drm_rect.h b/include/drm/drm_rect.h > index 83bb156..936ad8d 100644 > --- a/include/drm/drm_rect.h > +++ b/include/drm/drm_rect.h > @@ -24,6 +24,8 @@ > #ifndef DRM_RECT_H > #define DRM_RECT_H > =20 > +#include > + > /** > * DOC: rect utils > * > @@ -171,4 +173,71 @@ void drm_rect_rotate_inv(struct drm_rect *r, > int width, int height, > unsigned int rotation); > =20 > +/** > + * drm_clip_rect_width - determine the clip rectangle width > + * @r: clip rectangle whose width is returned > + * > + * RETURNS: > + * The width of the clip rectangle. > + */ > +static inline int drm_clip_rect_width(const struct drm_clip_rect *r) > +{ > + return r->x2 - r->x1; > +} > + > +/** > + * drm_clip_rect_height - determine the clip rectangle height > + * @r: clip rectangle whose height is returned > + * > + * RETURNS: > + * The height of the clip rectangle. > + */ > +static inline int drm_clip_rect_height(const struct drm_clip_rect *r) > +{ > + return r->y2 - r->y1; > +} > + > +/** > + * drm_clip_rect_visible - determine if the the clip rectangle is visible > + * @r: clip rectangle whose visibility is returned > + * > + * RETURNS: > + * %true if the clip rectangle is visible, %false otherwise. > + */ > +static inline bool drm_clip_rect_visible(const struct drm_clip_rect *r) > +{ > + return drm_clip_rect_width(r) > 0 && drm_clip_rect_height(r) > 0; > +} > + > +/** > + * drm_clip_rect_reset - Reset clip rectangle > + * @clip: clip rectangle > + * > + * Sets clip rectangle to {0,0,0,0}. > + */ > +static inline void drm_clip_rect_reset(struct drm_clip_rect *clip) > +{ > + clip->x1 =3D 0; > + clip->x2 =3D 0; > + clip->y1 =3D 0; > + clip->y2 =3D 0; > +} > + > +/** > + * drm_clip_rect_is_empty - Is clip rectangle empty? > + * @clip: clip rectangle > + * > + * Returns true if clip rectangle is {0,0,0,0}. > + */ > +static inline bool drm_clip_rect_is_empty(struct drm_clip_rect *clip) > +{ > + return (!clip->x1 && !clip->x2 && !clip->y1 && !clip->y2); > +} > + > +bool drm_clip_rect_intersect(struct drm_clip_rect *r1, > + const struct drm_clip_rect *r2); > +void drm_clip_rect_merge(struct drm_clip_rect *dst, > + struct drm_clip_rect *src, unsigned num_clips, > + unsigned flags, u32 width, u32 height); > + > #endif > --=20 > 2.2.2 >=20 > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel --=20 Ville Syrj=E4l=E4 Intel OTC From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2 1/8] drm/rect: Add some drm_clip_rect utility functions Date: Mon, 25 Apr 2016 15:39:07 +0300 Message-ID: <20160425123907.GY4329@intel.com> References: <1461530942-22485-1-git-send-email-noralf@tronnes.org> <1461530942-22485-2-git-send-email-noralf@tronnes.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id D04F16E5CA for ; Mon, 25 Apr 2016 12:39:11 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1461530942-22485-2-git-send-email-noralf@tronnes.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: linux-fbdev@vger.kernel.org, tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gU3VuLCBBcHIgMjQsIDIwMTYgYXQgMTA6NDg6NTVQTSArMDIwMCwgTm9yYWxmIFRyw7hubmVz IHdyb3RlOgo+IEFkZCBzb21lIHV0aWxpdHkgZnVuY3Rpb25zIGZvciBzdHJ1Y3QgZHJtX2NsaXBf cmVjdC4KCkxvb2tzIGxpa2UgbW9zdGx5IHlvdSdyZSBqdXN0IGR1cGxpY2F0aW5nIHRoZSBkcm1f cmVjdCBzdHVmZi4gV2h5IGNhbid0CnlvdSB1c2Ugd2hhdCdzIHRoZXJlIGFscmVhZHk/Cgo+IAo+ IFNpZ25lZC1vZmYtYnk6IE5vcmFsZiBUcsO4bm5lcyA8bm9yYWxmQHRyb25uZXMub3JnPgo+IC0t LQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX3JlY3QuYyB8IDY3ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrCj4gIGluY2x1ZGUvZHJtL2RybV9yZWN0LmggICAgIHwg NjkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+ICAyIGZp bGVzIGNoYW5nZWQsIDEzNiBpbnNlcnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fcmVjdC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9yZWN0LmMKPiBpbmRleCBh OGUyYzg2Li5hOWZiMWE4IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcmVjdC5j Cj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9yZWN0LmMKPiBAQCAtNDM0LDMgKzQzNCw3MCBA QCB2b2lkIGRybV9yZWN0X3JvdGF0ZV9pbnYoc3RydWN0IGRybV9yZWN0ICpyLAo+ICAJfQo+ICB9 Cj4gIEVYUE9SVF9TWU1CT0woZHJtX3JlY3Rfcm90YXRlX2ludik7Cj4gKwo+ICsvKioKPiArICog ZHJtX2NsaXBfcmVjdF9pbnRlcnNlY3QgLSBpbnRlcnNlY3QgdHdvIGNsaXAgcmVjdGFuZ2xlcwo+ ICsgKiBAcjE6IGZpcnN0IGNsaXAgcmVjdGFuZ2xlCj4gKyAqIEByMjogc2Vjb25kIGNsaXAgcmVj dGFuZ2xlCj4gKyAqCj4gKyAqIENhbGN1bGF0ZSB0aGUgaW50ZXJzZWN0aW9uIG9mIGNsaXAgcmVj dGFuZ2xlcyBAcjEgYW5kIEByMi4KPiArICogQHIxIHdpbGwgYmUgb3ZlcndyaXR0ZW4gd2l0aCB0 aGUgaW50ZXJzZWN0aW9uLgo+ICsgKgo+ICsgKiBSRVRVUk5TOgo+ICsgKiAldHJ1ZSBpZiByZWN0 YW5nbGUgQHIxIGlzIHN0aWxsIHZpc2libGUgYWZ0ZXIgdGhlIG9wZXJhdGlvbiwKPiArICogJWZh bHNlIG90aGVyd2lzZS4KPiArICovCj4gK2Jvb2wgZHJtX2NsaXBfcmVjdF9pbnRlcnNlY3Qoc3Ry dWN0IGRybV9jbGlwX3JlY3QgKnIxLAo+ICsJCQkgICAgIGNvbnN0IHN0cnVjdCBkcm1fY2xpcF9y ZWN0ICpyMikKPiArewo+ICsJcjEtPngxID0gbWF4KHIxLT54MSwgcjItPngxKTsKPiArCXIxLT55 MSA9IG1heChyMS0+eTEsIHIyLT55MSk7Cj4gKwlyMS0+eDIgPSBtaW4ocjEtPngyLCByMi0+eDIp Owo+ICsJcjEtPnkyID0gbWluKHIxLT55MiwgcjItPnkyKTsKPiArCj4gKwlyZXR1cm4gZHJtX2Ns aXBfcmVjdF92aXNpYmxlKHIxKTsKPiArfQo+ICtFWFBPUlRfU1lNQk9MKGRybV9jbGlwX3JlY3Rf aW50ZXJzZWN0KTsKPiArCj4gKy8qKgo+ICsgKiBkcm1fY2xpcF9yZWN0X21lcmdlIC0gTWVyZ2Ug Y2xpcCByZWN0YW5nbGVzCj4gKyAqIEBkc3Q6IGRlc3RpbmF0aW9uIGNsaXAgcmVjdGFuZ2xlCj4g KyAqIEBzcmM6IHNvdXJjZSBjbGlwIHJlY3RhbmdsZShzKSwgY2FuIGJlIE5VTEwKPiArICogQG51 bV9jbGlwczogbnVtYmVyIG9mIHNvdXJjZSBjbGlwIHJlY3RhbmdsZXMKPiArICogQGZsYWdzOiBk cm1fbW9kZV9mYl9kaXJ0eV9jbWQgZmxhZ3MgKERSTV9NT0RFX0ZCX0RJUlRZX0FOTk9UQVRFX0NP UFkpCj4gKyAqIEB3aWR0aDogd2lkdGggb2YgY2xpcCByZWN0YW5nbGUgaWYgQHNyYyBpcyBOVUxM Cj4gKyAqIEBoZWlnaHQ6IGhlaWdodCBvZiBjbGlwIHJlY3RhbmdsZSBpZiBAc3JjIGlzIE5VTEwK PiArICoKPiArICogVGhlIGRpcnR5ZmIgaW9jdGwgYWxsb3dzIGZvciBhIE5VTEwgY2xpcCByZWN0 YW5nbGUgdG8gYmUgcGFzc2VkIGluLAo+ICsgKiBzbyBpZiBAc3JjIGlzIE5VTEwsIHdpZHRoIGFu ZCBoZWlnaHQgaXMgdXNlZCB0byBzZXQgYSBmdWxsIGNsaXAgcmVjdGFuZ2xlLgo+ICsgKiBAZHN0 IHRha2VzIHBhcnQgaW4gdGhlIG1lcmdlIHVubGVzcyBpdCBpcyBlbXB0eSB7MCwwLDAsMH0uCj4g KyAqLwo+ICt2b2lkIGRybV9jbGlwX3JlY3RfbWVyZ2Uoc3RydWN0IGRybV9jbGlwX3JlY3QgKmRz dCwKPiArCQkJIHN0cnVjdCBkcm1fY2xpcF9yZWN0ICpzcmMsIHVuc2lnbmVkIG51bV9jbGlwcywK PiArCQkJIHVuc2lnbmVkIGZsYWdzLCB1MzIgd2lkdGgsIHUzMiBoZWlnaHQpCj4gK3sKPiArCWlu dCBpOwo+ICsKPiArCWlmICghc3JjIHx8ICFudW1fY2xpcHMpIHsKPiArCQlkc3QtPngxID0gMDsK PiArCQlkc3QtPngyID0gd2lkdGg7Cj4gKwkJZHN0LT55MSA9IDA7Cj4gKwkJZHN0LT55MiA9IGhl aWdodDsKPiArCQlyZXR1cm47Cj4gKwl9Cj4gKwo+ICsJaWYgKGRybV9jbGlwX3JlY3RfaXNfZW1w dHkoZHN0KSkgewo+ICsJCWRzdC0+eDEgPSB+MDsKPiArCQlkc3QtPnkxID0gfjA7Cj4gKwl9Cj4g Kwo+ICsJZm9yIChpID0gMDsgaSA8IG51bV9jbGlwczsgaSsrKSB7Cj4gKwkJaWYgKGZsYWdzICYg RFJNX01PREVfRkJfRElSVFlfQU5OT1RBVEVfQ09QWSkKPiArCQkJaSsrOwo+ICsJCWRzdC0+eDEg PSBtaW4oZHN0LT54MSwgc3JjW2ldLngxKTsKPiArCQlkc3QtPngyID0gbWF4KGRzdC0+eDIsIHNy Y1tpXS54Mik7Cj4gKwkJZHN0LT55MSA9IG1pbihkc3QtPnkxLCBzcmNbaV0ueTEpOwo+ICsJCWRz dC0+eTIgPSBtYXgoZHN0LT55Miwgc3JjW2ldLnkyKTsKPiArCX0KPiArfQo+ICtFWFBPUlRfU1lN Qk9MKGRybV9jbGlwX3JlY3RfbWVyZ2UpOwo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1f cmVjdC5oIGIvaW5jbHVkZS9kcm0vZHJtX3JlY3QuaAo+IGluZGV4IDgzYmIxNTYuLjkzNmFkOGQg MTAwNjQ0Cj4gLS0tIGEvaW5jbHVkZS9kcm0vZHJtX3JlY3QuaAo+ICsrKyBiL2luY2x1ZGUvZHJt L2RybV9yZWN0LmgKPiBAQCAtMjQsNiArMjQsOCBAQAo+ICAjaWZuZGVmIERSTV9SRUNUX0gKPiAg I2RlZmluZSBEUk1fUkVDVF9ICj4gIAo+ICsjaW5jbHVkZSA8dWFwaS9kcm0vZHJtLmg+Cj4gKwo+ ICAvKioKPiAgICogRE9DOiByZWN0IHV0aWxzCj4gICAqCj4gQEAgLTE3MSw0ICsxNzMsNzEgQEAg dm9pZCBkcm1fcmVjdF9yb3RhdGVfaW52KHN0cnVjdCBkcm1fcmVjdCAqciwKPiAgCQkJIGludCB3 aWR0aCwgaW50IGhlaWdodCwKPiAgCQkJIHVuc2lnbmVkIGludCByb3RhdGlvbik7Cj4gIAo+ICsv KioKPiArICogZHJtX2NsaXBfcmVjdF93aWR0aCAtIGRldGVybWluZSB0aGUgY2xpcCByZWN0YW5n bGUgd2lkdGgKPiArICogQHI6IGNsaXAgcmVjdGFuZ2xlIHdob3NlIHdpZHRoIGlzIHJldHVybmVk Cj4gKyAqCj4gKyAqIFJFVFVSTlM6Cj4gKyAqIFRoZSB3aWR0aCBvZiB0aGUgY2xpcCByZWN0YW5n bGUuCj4gKyAqLwo+ICtzdGF0aWMgaW5saW5lIGludCBkcm1fY2xpcF9yZWN0X3dpZHRoKGNvbnN0 IHN0cnVjdCBkcm1fY2xpcF9yZWN0ICpyKQo+ICt7Cj4gKwlyZXR1cm4gci0+eDIgLSByLT54MTsK PiArfQo+ICsKPiArLyoqCj4gKyAqIGRybV9jbGlwX3JlY3RfaGVpZ2h0IC0gZGV0ZXJtaW5lIHRo ZSBjbGlwIHJlY3RhbmdsZSBoZWlnaHQKPiArICogQHI6IGNsaXAgcmVjdGFuZ2xlIHdob3NlIGhl aWdodCBpcyByZXR1cm5lZAo+ICsgKgo+ICsgKiBSRVRVUk5TOgo+ICsgKiBUaGUgaGVpZ2h0IG9m IHRoZSBjbGlwIHJlY3RhbmdsZS4KPiArICovCj4gK3N0YXRpYyBpbmxpbmUgaW50IGRybV9jbGlw X3JlY3RfaGVpZ2h0KGNvbnN0IHN0cnVjdCBkcm1fY2xpcF9yZWN0ICpyKQo+ICt7Cj4gKwlyZXR1 cm4gci0+eTIgLSByLT55MTsKPiArfQo+ICsKPiArLyoqCj4gKyAqIGRybV9jbGlwX3JlY3Rfdmlz aWJsZSAtIGRldGVybWluZSBpZiB0aGUgdGhlIGNsaXAgcmVjdGFuZ2xlIGlzIHZpc2libGUKPiAr ICogQHI6IGNsaXAgcmVjdGFuZ2xlIHdob3NlIHZpc2liaWxpdHkgaXMgcmV0dXJuZWQKPiArICoK PiArICogUkVUVVJOUzoKPiArICogJXRydWUgaWYgdGhlIGNsaXAgcmVjdGFuZ2xlIGlzIHZpc2li bGUsICVmYWxzZSBvdGhlcndpc2UuCj4gKyAqLwo+ICtzdGF0aWMgaW5saW5lIGJvb2wgZHJtX2Ns aXBfcmVjdF92aXNpYmxlKGNvbnN0IHN0cnVjdCBkcm1fY2xpcF9yZWN0ICpyKQo+ICt7Cj4gKwly ZXR1cm4gZHJtX2NsaXBfcmVjdF93aWR0aChyKSA+IDAgJiYgZHJtX2NsaXBfcmVjdF9oZWlnaHQo cikgPiAwOwo+ICt9Cj4gKwo+ICsvKioKPiArICogZHJtX2NsaXBfcmVjdF9yZXNldCAtIFJlc2V0 IGNsaXAgcmVjdGFuZ2xlCj4gKyAqIEBjbGlwOiBjbGlwIHJlY3RhbmdsZQo+ICsgKgo+ICsgKiBT ZXRzIGNsaXAgcmVjdGFuZ2xlIHRvIHswLDAsMCwwfS4KPiArICovCj4gK3N0YXRpYyBpbmxpbmUg dm9pZCBkcm1fY2xpcF9yZWN0X3Jlc2V0KHN0cnVjdCBkcm1fY2xpcF9yZWN0ICpjbGlwKQo+ICt7 Cj4gKwljbGlwLT54MSA9IDA7Cj4gKwljbGlwLT54MiA9IDA7Cj4gKwljbGlwLT55MSA9IDA7Cj4g KwljbGlwLT55MiA9IDA7Cj4gK30KPiArCj4gKy8qKgo+ICsgKiBkcm1fY2xpcF9yZWN0X2lzX2Vt cHR5IC0gSXMgY2xpcCByZWN0YW5nbGUgZW1wdHk/Cj4gKyAqIEBjbGlwOiBjbGlwIHJlY3Rhbmds ZQo+ICsgKgo+ICsgKiBSZXR1cm5zIHRydWUgaWYgY2xpcCByZWN0YW5nbGUgaXMgezAsMCwwLDB9 Lgo+ICsgKi8KPiArc3RhdGljIGlubGluZSBib29sIGRybV9jbGlwX3JlY3RfaXNfZW1wdHkoc3Ry dWN0IGRybV9jbGlwX3JlY3QgKmNsaXApCj4gK3sKPiArCXJldHVybiAoIWNsaXAtPngxICYmICFj bGlwLT54MiAmJiAhY2xpcC0+eTEgJiYgIWNsaXAtPnkyKTsKPiArfQo+ICsKPiArYm9vbCBkcm1f Y2xpcF9yZWN0X2ludGVyc2VjdChzdHJ1Y3QgZHJtX2NsaXBfcmVjdCAqcjEsCj4gKwkJCSAgICAg Y29uc3Qgc3RydWN0IGRybV9jbGlwX3JlY3QgKnIyKTsKPiArdm9pZCBkcm1fY2xpcF9yZWN0X21l cmdlKHN0cnVjdCBkcm1fY2xpcF9yZWN0ICpkc3QsCj4gKwkJCSBzdHJ1Y3QgZHJtX2NsaXBfcmVj dCAqc3JjLCB1bnNpZ25lZCBudW1fY2xpcHMsCj4gKwkJCSB1bnNpZ25lZCBmbGFncywgdTMyIHdp ZHRoLCB1MzIgaGVpZ2h0KTsKPiArCj4gICNlbmRpZgo+IC0tIAo+IDIuMi4yCj4gCj4gX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBkcmktZGV2ZWwgbWFp bGluZyBsaXN0Cj4gZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCgotLSAKVmlsbGUg U3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932333AbcDYMjP (ORCPT ); Mon, 25 Apr 2016 08:39:15 -0400 Received: from mga01.intel.com ([192.55.52.88]:37293 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754372AbcDYMjM (ORCPT ); Mon, 25 Apr 2016 08:39:12 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,532,1455004800"; d="scan'208";a="962200709" Date: Mon, 25 Apr 2016 15:39:07 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 1/8] drm/rect: Add some drm_clip_rect utility functions Message-ID: <20160425123907.GY4329@intel.com> References: <1461530942-22485-1-git-send-email-noralf@tronnes.org> <1461530942-22485-2-git-send-email-noralf@tronnes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1461530942-22485-2-git-send-email-noralf@tronnes.org> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Apr 24, 2016 at 10:48:55PM +0200, Noralf Trønnes wrote: > Add some utility functions for struct drm_clip_rect. Looks like mostly you're just duplicating the drm_rect stuff. Why can't you use what's there already? > > Signed-off-by: Noralf Trønnes > --- > drivers/gpu/drm/drm_rect.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ > include/drm/drm_rect.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 136 insertions(+) > > diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c > index a8e2c86..a9fb1a8 100644 > --- a/drivers/gpu/drm/drm_rect.c > +++ b/drivers/gpu/drm/drm_rect.c > @@ -434,3 +434,70 @@ void drm_rect_rotate_inv(struct drm_rect *r, > } > } > EXPORT_SYMBOL(drm_rect_rotate_inv); > + > +/** > + * drm_clip_rect_intersect - intersect two clip rectangles > + * @r1: first clip rectangle > + * @r2: second clip rectangle > + * > + * Calculate the intersection of clip 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_clip_rect_intersect(struct drm_clip_rect *r1, > + const struct drm_clip_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_clip_rect_visible(r1); > +} > +EXPORT_SYMBOL(drm_clip_rect_intersect); > + > +/** > + * drm_clip_rect_merge - Merge clip rectangles > + * @dst: destination clip rectangle > + * @src: source clip rectangle(s), can be NULL > + * @num_clips: number of source clip rectangles > + * @flags: drm_mode_fb_dirty_cmd flags (DRM_MODE_FB_DIRTY_ANNOTATE_COPY) > + * @width: width of clip rectangle if @src is NULL > + * @height: height of clip rectangle if @src is NULL > + * > + * The dirtyfb ioctl allows for a NULL clip rectangle to be passed in, > + * so if @src is NULL, width and height is used to set a full clip rectangle. > + * @dst takes part in the merge unless it is empty {0,0,0,0}. > + */ > +void drm_clip_rect_merge(struct drm_clip_rect *dst, > + struct drm_clip_rect *src, unsigned num_clips, > + unsigned flags, u32 width, u32 height) > +{ > + int i; > + > + if (!src || !num_clips) { > + dst->x1 = 0; > + dst->x2 = width; > + dst->y1 = 0; > + dst->y2 = height; > + return; > + } > + > + if (drm_clip_rect_is_empty(dst)) { > + dst->x1 = ~0; > + dst->y1 = ~0; > + } > + > + for (i = 0; i < num_clips; i++) { > + if (flags & DRM_MODE_FB_DIRTY_ANNOTATE_COPY) > + i++; > + dst->x1 = min(dst->x1, src[i].x1); > + dst->x2 = max(dst->x2, src[i].x2); > + dst->y1 = min(dst->y1, src[i].y1); > + dst->y2 = max(dst->y2, src[i].y2); > + } > +} > +EXPORT_SYMBOL(drm_clip_rect_merge); > diff --git a/include/drm/drm_rect.h b/include/drm/drm_rect.h > index 83bb156..936ad8d 100644 > --- a/include/drm/drm_rect.h > +++ b/include/drm/drm_rect.h > @@ -24,6 +24,8 @@ > #ifndef DRM_RECT_H > #define DRM_RECT_H > > +#include > + > /** > * DOC: rect utils > * > @@ -171,4 +173,71 @@ void drm_rect_rotate_inv(struct drm_rect *r, > int width, int height, > unsigned int rotation); > > +/** > + * drm_clip_rect_width - determine the clip rectangle width > + * @r: clip rectangle whose width is returned > + * > + * RETURNS: > + * The width of the clip rectangle. > + */ > +static inline int drm_clip_rect_width(const struct drm_clip_rect *r) > +{ > + return r->x2 - r->x1; > +} > + > +/** > + * drm_clip_rect_height - determine the clip rectangle height > + * @r: clip rectangle whose height is returned > + * > + * RETURNS: > + * The height of the clip rectangle. > + */ > +static inline int drm_clip_rect_height(const struct drm_clip_rect *r) > +{ > + return r->y2 - r->y1; > +} > + > +/** > + * drm_clip_rect_visible - determine if the the clip rectangle is visible > + * @r: clip rectangle whose visibility is returned > + * > + * RETURNS: > + * %true if the clip rectangle is visible, %false otherwise. > + */ > +static inline bool drm_clip_rect_visible(const struct drm_clip_rect *r) > +{ > + return drm_clip_rect_width(r) > 0 && drm_clip_rect_height(r) > 0; > +} > + > +/** > + * drm_clip_rect_reset - Reset clip rectangle > + * @clip: clip rectangle > + * > + * Sets clip rectangle to {0,0,0,0}. > + */ > +static inline void drm_clip_rect_reset(struct drm_clip_rect *clip) > +{ > + clip->x1 = 0; > + clip->x2 = 0; > + clip->y1 = 0; > + clip->y2 = 0; > +} > + > +/** > + * drm_clip_rect_is_empty - Is clip rectangle empty? > + * @clip: clip rectangle > + * > + * Returns true if clip rectangle is {0,0,0,0}. > + */ > +static inline bool drm_clip_rect_is_empty(struct drm_clip_rect *clip) > +{ > + return (!clip->x1 && !clip->x2 && !clip->y1 && !clip->y2); > +} > + > +bool drm_clip_rect_intersect(struct drm_clip_rect *r1, > + const struct drm_clip_rect *r2); > +void drm_clip_rect_merge(struct drm_clip_rect *dst, > + struct drm_clip_rect *src, unsigned num_clips, > + unsigned flags, u32 width, u32 height); > + > #endif > -- > 2.2.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Ville Syrjälä Intel OTC