From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Date: Mon, 25 Apr 2016 16:38:16 +0000 Subject: Re: [PATCH v2 1/8] drm/rect: Add some drm_clip_rect utility functions Message-Id: <20160425163816.GF4329@intel.com> List-Id: References: <1461530942-22485-1-git-send-email-noralf@tronnes.org> <1461530942-22485-2-git-send-email-noralf@tronnes.org> <20160425123907.GY4329@intel.com> <571E13D8.4060100@tronnes.org> <20160425130229.GZ4329@intel.com> <571E23A1.2040100@tronnes.org> <20160425150944.GB4329@intel.com> <20160425160520.GV2510@phenom.ffwll.local> In-Reply-To: <20160425160520.GV2510@phenom.ffwll.local> 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?= , linux-fbdev@vger.kernel.org, tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org On Mon, Apr 25, 2016 at 06:05:20PM +0200, Daniel Vetter wrote: > On Mon, Apr 25, 2016 at 06:09:44PM +0300, Ville Syrj=E4l=E4 wrote: > > On Mon, Apr 25, 2016 at 04:03:13PM +0200, Noralf Tr=F8nnes wrote: > > >=20 > > > Den 25.04.2016 15:02, skrev Ville Syrj=E4l=E4: > > > > On Mon, Apr 25, 2016 at 02:55:52PM +0200, Noralf Tr=F8nnes wrote: > > > >> Den 25.04.2016 14:39, skrev Ville Syrj=E4l=E4: > > > >>> 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? > > > >> That's because the framebuffer flushing uses drm_clip_rect and not= drm_rect: > > > > Converting to drm_rect is not an option? > > >=20 > > > That's difficult or at least verbose to do because clips is an array. > > > I could use drm_rect on the calling side (fbdev) since it's only one = clip > > > which the changes are merged into, and then convert it when I call di= rty(). > > > But the driver can get zero or more clips from the dirty ioctl so I d= on't > > > see a clean way to convert this array to drm_rect without more code t= han > > > this proposal has. > >=20 > > Just some kind of simple drm_clip_rect_to_rect() thing should be enough= AFAICS. >=20 > Yeah, drm_clip_rect is the uapi struct, drm_rect is the internal one. > Similar case is drm_display_mode vs. drm_mode_modeinfo. We have > umode_to_mode and mode_to_umode helpers to deal with that. I do agree that > it would make sense to switch the internal ->dirty callback over to the > internal drm_struct. Would need a kmalloc+copy in the dirtyfb ioctl, but > since the structs actually match in their member names (just not the > size/signedness, sigh) there shouldn't be any need for driver changes. So > fairly simple patch. Or if we want to avoid the malloc, then the merge() thing could just internally convert one at a time on stack when going through them. Though then someone might want to do a merge() with internal drm_rects, and we'd be right where we started. But I'm not sure that will happen, so perhaps it's just too much future proofing. >=20 > Ofc you need to compile-test all the drivers (at least those using ->dirty > hook) to make sure gcc is still happy with all the signed vs. unsigned > stuff. Maybe that turns up something, but hopefully not. >=20 > Sorry for that late request, but I really didn't realize what's going on > here :( > -Daniel >=20 > >=20 > > >=20 > > > Here's the driver side: > > >=20 > > > static int mipi_dbi_dirtyfb(struct drm_framebuffer *fb, void *vmem, > > > unsigned flags, unsigned color, > > > struct drm_clip_rect *clips, unsigned num_clips) > > > { > > > struct tinydrm_device *tdev =3D fb->dev->dev_private; > > > struct lcdreg *reg =3D tdev->lcdreg; > > > struct drm_clip_rect full_clip =3D { > > > .x1 =3D 0, > > > .x2 =3D fb->width, > > > .y1 =3D 0, > > > .y2 =3D fb->height, > > > }; > > > struct drm_clip_rect clip; > > > int ret; > > >=20 > > > drm_clip_rect_reset(&clip); > > > drm_clip_rect_merge(&clip, clips, num_clips, flags, > > > fb->width, fb->height); > > > if (!drm_clip_rect_intersect(&clip, &full_clip)) { > > > DRM_DEBUG_KMS("Empty clip\n"); > > > return -EINVAL; > > > } > > > [...] > >=20 > > >=20 > > > >> struct drm_framebuffer_funcs { > > > >> [...] > > > >> int (*dirty)(struct drm_framebuffer *framebuffer, > > > >> struct drm_file *file_priv, unsigned flags, > > > >> unsigned color, struct drm_clip_rect *clips, > > > >> unsigned num_clips); > > > >> }; > > > >> > > > >>>> Signed-off-by: Noralf Tr=F8nnes > > > >>>> --- > > > >>>> 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_re= ct.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_ANNOT= ATE_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 pas= sed in, > > > >>>> + * so if @src is NULL, width and height is used to set a full c= lip 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 =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_rec= t *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_re= ct *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 *cl= ip) > > > >>>> +{ > > > >>>> + 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 > > > >>>> > > > >>>> _______________________________________________ > > > >>>> dri-devel mailing list > > > >>>> dri-devel@lists.freedesktop.org > > > >>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel > >=20 > > --=20 > > Ville Syrj=E4l=E4 > > Intel OTC > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel >=20 > --=20 > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch --=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 19:38:16 +0300 Message-ID: <20160425163816.GF4329@intel.com> References: <1461530942-22485-1-git-send-email-noralf@tronnes.org> <1461530942-22485-2-git-send-email-noralf@tronnes.org> <20160425123907.GY4329@intel.com> <571E13D8.4060100@tronnes.org> <20160425130229.GZ4329@intel.com> <571E23A1.2040100@tronnes.org> <20160425150944.GB4329@intel.com> <20160425160520.GV2510@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id E2CDB6E0D9 for ; Mon, 25 Apr 2016 16:38:36 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20160425160520.GV2510@phenom.ffwll.local> 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?= , 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 T24gTW9uLCBBcHIgMjUsIDIwMTYgYXQgMDY6MDU6MjBQTSArMDIwMCwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiBPbiBNb24sIEFwciAyNSwgMjAxNiBhdCAwNjowOTo0NFBNICswMzAwLCBWaWxsZSBT eXJqw6Rsw6Qgd3JvdGU6Cj4gPiBPbiBNb24sIEFwciAyNSwgMjAxNiBhdCAwNDowMzoxM1BNICsw MjAwLCBOb3JhbGYgVHLDuG5uZXMgd3JvdGU6Cj4gPiA+IAo+ID4gPiBEZW4gMjUuMDQuMjAxNiAx NTowMiwgc2tyZXYgVmlsbGUgU3lyasOkbMOkOgo+ID4gPiA+IE9uIE1vbiwgQXByIDI1LCAyMDE2 IGF0IDAyOjU1OjUyUE0gKzAyMDAsIE5vcmFsZiBUcsO4bm5lcyB3cm90ZToKPiA+ID4gPj4gRGVu IDI1LjA0LjIwMTYgMTQ6MzksIHNrcmV2IFZpbGxlIFN5cmrDpGzDpDoKPiA+ID4gPj4+IE9uIFN1 biwgQXByIDI0LCAyMDE2IGF0IDEwOjQ4OjU1UE0gKzAyMDAsIE5vcmFsZiBUcsO4bm5lcyB3cm90 ZToKPiA+ID4gPj4+PiBBZGQgc29tZSB1dGlsaXR5IGZ1bmN0aW9ucyBmb3Igc3RydWN0IGRybV9j bGlwX3JlY3QuCj4gPiA+ID4+PiBMb29rcyBsaWtlIG1vc3RseSB5b3UncmUganVzdCBkdXBsaWNh dGluZyB0aGUgZHJtX3JlY3Qgc3R1ZmYuIFdoeSBjYW4ndAo+ID4gPiA+Pj4geW91IHVzZSB3aGF0 J3MgdGhlcmUgYWxyZWFkeT8KPiA+ID4gPj4gVGhhdCdzIGJlY2F1c2UgdGhlIGZyYW1lYnVmZmVy IGZsdXNoaW5nIHVzZXMgZHJtX2NsaXBfcmVjdCBhbmQgbm90IGRybV9yZWN0Ogo+ID4gPiA+IENv bnZlcnRpbmcgdG8gZHJtX3JlY3QgaXMgbm90IGFuIG9wdGlvbj8KPiA+ID4gCj4gPiA+IFRoYXQn cyBkaWZmaWN1bHQgb3IgYXQgbGVhc3QgdmVyYm9zZSB0byBkbyBiZWNhdXNlIGNsaXBzIGlzIGFu IGFycmF5Lgo+ID4gPiBJIGNvdWxkIHVzZSBkcm1fcmVjdCBvbiB0aGUgY2FsbGluZyBzaWRlIChm YmRldikgc2luY2UgaXQncyBvbmx5IG9uZSBjbGlwCj4gPiA+IHdoaWNoIHRoZSBjaGFuZ2VzIGFy ZSBtZXJnZWQgaW50bywgYW5kIHRoZW4gY29udmVydCBpdCB3aGVuIEkgY2FsbCBkaXJ0eSgpLgo+ ID4gPiBCdXQgdGhlIGRyaXZlciBjYW4gZ2V0IHplcm8gb3IgbW9yZSBjbGlwcyBmcm9tIHRoZSBk aXJ0eSBpb2N0bCBzbyBJIGRvbid0Cj4gPiA+IHNlZSBhIGNsZWFuIHdheSB0byBjb252ZXJ0IHRo aXMgYXJyYXkgdG8gZHJtX3JlY3Qgd2l0aG91dCBtb3JlIGNvZGUgdGhhbgo+ID4gPiB0aGlzIHBy b3Bvc2FsIGhhcy4KPiA+IAo+ID4gSnVzdCBzb21lIGtpbmQgb2Ygc2ltcGxlIGRybV9jbGlwX3Jl Y3RfdG9fcmVjdCgpIHRoaW5nIHNob3VsZCBiZSBlbm91Z2ggQUZBSUNTLgo+IAo+IFllYWgsIGRy bV9jbGlwX3JlY3QgaXMgdGhlIHVhcGkgc3RydWN0LCBkcm1fcmVjdCBpcyB0aGUgaW50ZXJuYWwg b25lLgo+IFNpbWlsYXIgY2FzZSBpcyBkcm1fZGlzcGxheV9tb2RlIHZzLiBkcm1fbW9kZV9tb2Rl aW5mby4gV2UgaGF2ZQo+IHVtb2RlX3RvX21vZGUgYW5kIG1vZGVfdG9fdW1vZGUgaGVscGVycyB0 byBkZWFsIHdpdGggdGhhdC4gSSBkbyBhZ3JlZSB0aGF0Cj4gaXQgd291bGQgbWFrZSBzZW5zZSB0 byBzd2l0Y2ggdGhlIGludGVybmFsIC0+ZGlydHkgY2FsbGJhY2sgb3ZlciB0byB0aGUKPiBpbnRl cm5hbCBkcm1fc3RydWN0LiBXb3VsZCBuZWVkIGEga21hbGxvYytjb3B5IGluIHRoZSBkaXJ0eWZi IGlvY3RsLCBidXQKPiBzaW5jZSB0aGUgc3RydWN0cyBhY3R1YWxseSBtYXRjaCBpbiB0aGVpciBt ZW1iZXIgbmFtZXMgKGp1c3Qgbm90IHRoZQo+IHNpemUvc2lnbmVkbmVzcywgc2lnaCkgdGhlcmUg c2hvdWxkbid0IGJlIGFueSBuZWVkIGZvciBkcml2ZXIgY2hhbmdlcy4gU28KPiBmYWlybHkgc2lt cGxlIHBhdGNoLgoKT3IgaWYgd2Ugd2FudCB0byBhdm9pZCB0aGUgbWFsbG9jLCB0aGVuIHRoZSBt ZXJnZSgpIHRoaW5nIGNvdWxkIGp1c3QKaW50ZXJuYWxseSBjb252ZXJ0IG9uZSBhdCBhIHRpbWUg b24gc3RhY2sgd2hlbiBnb2luZyB0aHJvdWdoIHRoZW0uClRob3VnaCB0aGVuIHNvbWVvbmUgbWln aHQgd2FudCB0byBkbyBhIG1lcmdlKCkgd2l0aCBpbnRlcm5hbCBkcm1fcmVjdHMsCmFuZCB3ZSdk IGJlIHJpZ2h0IHdoZXJlIHdlIHN0YXJ0ZWQuIEJ1dCBJJ20gbm90IHN1cmUgdGhhdCB3aWxsIGhh cHBlbiwKc28gcGVyaGFwcyBpdCdzIGp1c3QgdG9vIG11Y2ggZnV0dXJlIHByb29maW5nLgoKPiAK PiBPZmMgeW91IG5lZWQgdG8gY29tcGlsZS10ZXN0IGFsbCB0aGUgZHJpdmVycyAoYXQgbGVhc3Qg dGhvc2UgdXNpbmcgLT5kaXJ0eQo+IGhvb2spIHRvIG1ha2Ugc3VyZSBnY2MgaXMgc3RpbGwgaGFw cHkgd2l0aCBhbGwgdGhlIHNpZ25lZCB2cy4gdW5zaWduZWQKPiBzdHVmZi4gTWF5YmUgdGhhdCB0 dXJucyB1cCBzb21ldGhpbmcsIGJ1dCBob3BlZnVsbHkgbm90Lgo+IAo+IFNvcnJ5IGZvciB0aGF0 IGxhdGUgcmVxdWVzdCwgYnV0IEkgcmVhbGx5IGRpZG4ndCByZWFsaXplIHdoYXQncyBnb2luZyBv bgo+IGhlcmUgOigKPiAtRGFuaWVsCj4gCj4gPiAKPiA+ID4gCj4gPiA+IEhlcmUncyB0aGUgZHJp dmVyIHNpZGU6Cj4gPiA+IAo+ID4gPiBzdGF0aWMgaW50IG1pcGlfZGJpX2RpcnR5ZmIoc3RydWN0 IGRybV9mcmFtZWJ1ZmZlciAqZmIsIHZvaWQgKnZtZW0sCj4gPiA+ICAgICAgICAgICAgICAgICAg dW5zaWduZWQgZmxhZ3MsIHVuc2lnbmVkIGNvbG9yLAo+ID4gPiAgICAgICAgICAgICAgICAgIHN0 cnVjdCBkcm1fY2xpcF9yZWN0ICpjbGlwcywgdW5zaWduZWQgbnVtX2NsaXBzKQo+ID4gPiB7Cj4g PiA+ICAgICAgc3RydWN0IHRpbnlkcm1fZGV2aWNlICp0ZGV2ID0gZmItPmRldi0+ZGV2X3ByaXZh dGU7Cj4gPiA+ICAgICAgc3RydWN0IGxjZHJlZyAqcmVnID0gdGRldi0+bGNkcmVnOwo+ID4gPiAg ICAgIHN0cnVjdCBkcm1fY2xpcF9yZWN0IGZ1bGxfY2xpcCA9IHsKPiA+ID4gICAgICAgICAgLngx ID0gMCwKPiA+ID4gICAgICAgICAgLngyID0gZmItPndpZHRoLAo+ID4gPiAgICAgICAgICAueTEg PSAwLAo+ID4gPiAgICAgICAgICAueTIgPSBmYi0+aGVpZ2h0LAo+ID4gPiAgICAgIH07Cj4gPiA+ ICAgICAgc3RydWN0IGRybV9jbGlwX3JlY3QgY2xpcDsKPiA+ID4gICAgICBpbnQgcmV0Owo+ID4g PiAKPiA+ID4gICAgICBkcm1fY2xpcF9yZWN0X3Jlc2V0KCZjbGlwKTsKPiA+ID4gICAgICBkcm1f Y2xpcF9yZWN0X21lcmdlKCZjbGlwLCBjbGlwcywgbnVtX2NsaXBzLCBmbGFncywKPiA+ID4gICAg ICAgICAgICAgICAgICBmYi0+d2lkdGgsIGZiLT5oZWlnaHQpOwo+ID4gPiAgICAgIGlmICghZHJt X2NsaXBfcmVjdF9pbnRlcnNlY3QoJmNsaXAsICZmdWxsX2NsaXApKSB7Cj4gPiA+ICAgICAgICAg IERSTV9ERUJVR19LTVMoIkVtcHR5IGNsaXBcbiIpOwo+ID4gPiAgICAgICAgICByZXR1cm4gLUVJ TlZBTDsKPiA+ID4gICAgICB9Cj4gPiA+IFsuLi5dCj4gPiAKPiA+ID4gCj4gPiA+ID4+IHN0cnVj dCBkcm1fZnJhbWVidWZmZXJfZnVuY3Mgewo+ID4gPiA+PiBbLi4uXQo+ID4gPiA+PiAgICAgICAg ICAgaW50ICgqZGlydHkpKHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZyYW1lYnVmZmVyLAo+ID4g PiA+PiAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2LCB1 bnNpZ25lZCBmbGFncywKPiA+ID4gPj4gICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBj b2xvciwgc3RydWN0IGRybV9jbGlwX3JlY3QgKmNsaXBzLAo+ID4gPiA+PiAgICAgICAgICAgICAg ICAgICAgICAgIHVuc2lnbmVkIG51bV9jbGlwcyk7Cj4gPiA+ID4+IH07Cj4gPiA+ID4+Cj4gPiA+ ID4+Pj4gU2lnbmVkLW9mZi1ieTogTm9yYWxmIFRyw7hubmVzIDxub3JhbGZAdHJvbm5lcy5vcmc+ Cj4gPiA+ID4+Pj4gLS0tCj4gPiA+ID4+Pj4gICAgZHJpdmVycy9ncHUvZHJtL2RybV9yZWN0LmMg fCA2NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+ID4gPiA+ Pj4+ICAgIGluY2x1ZGUvZHJtL2RybV9yZWN0LmggICAgIHwgNjkgKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+ID4gPiA+Pj4+ICAgIDIgZmlsZXMgY2hhbmdl ZCwgMTM2IGluc2VydGlvbnMoKykKPiA+ID4gPj4+Pgo+ID4gPiA+Pj4+IGRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vZHJtX3JlY3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcmVjdC5jCj4g PiA+ID4+Pj4gaW5kZXggYThlMmM4Ni4uYTlmYjFhOCAxMDA2NDQKPiA+ID4gPj4+PiAtLS0gYS9k cml2ZXJzL2dwdS9kcm0vZHJtX3JlY3QuYwo+ID4gPiA+Pj4+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fcmVjdC5jCj4gPiA+ID4+Pj4gQEAgLTQzNCwzICs0MzQsNzAgQEAgdm9pZCBkcm1fcmVj dF9yb3RhdGVfaW52KHN0cnVjdCBkcm1fcmVjdCAqciwKPiA+ID4gPj4+PiAgICAJfQo+ID4gPiA+ Pj4+ICAgIH0KPiA+ID4gPj4+PiAgICBFWFBPUlRfU1lNQk9MKGRybV9yZWN0X3JvdGF0ZV9pbnYp Owo+ID4gPiA+Pj4+ICsKPiA+ID4gPj4+PiArLyoqCj4gPiA+ID4+Pj4gKyAqIGRybV9jbGlwX3Jl Y3RfaW50ZXJzZWN0IC0gaW50ZXJzZWN0IHR3byBjbGlwIHJlY3RhbmdsZXMKPiA+ID4gPj4+PiAr ICogQHIxOiBmaXJzdCBjbGlwIHJlY3RhbmdsZQo+ID4gPiA+Pj4+ICsgKiBAcjI6IHNlY29uZCBj bGlwIHJlY3RhbmdsZQo+ID4gPiA+Pj4+ICsgKgo+ID4gPiA+Pj4+ICsgKiBDYWxjdWxhdGUgdGhl IGludGVyc2VjdGlvbiBvZiBjbGlwIHJlY3RhbmdsZXMgQHIxIGFuZCBAcjIuCj4gPiA+ID4+Pj4g KyAqIEByMSB3aWxsIGJlIG92ZXJ3cml0dGVuIHdpdGggdGhlIGludGVyc2VjdGlvbi4KPiA+ID4g Pj4+PiArICoKPiA+ID4gPj4+PiArICogUkVUVVJOUzoKPiA+ID4gPj4+PiArICogJXRydWUgaWYg cmVjdGFuZ2xlIEByMSBpcyBzdGlsbCB2aXNpYmxlIGFmdGVyIHRoZSBvcGVyYXRpb24sCj4gPiA+ ID4+Pj4gKyAqICVmYWxzZSBvdGhlcndpc2UuCj4gPiA+ID4+Pj4gKyAqLwo+ID4gPiA+Pj4+ICti b29sIGRybV9jbGlwX3JlY3RfaW50ZXJzZWN0KHN0cnVjdCBkcm1fY2xpcF9yZWN0ICpyMSwKPiA+ ID4gPj4+PiArCQkJICAgICBjb25zdCBzdHJ1Y3QgZHJtX2NsaXBfcmVjdCAqcjIpCj4gPiA+ID4+ Pj4gK3sKPiA+ID4gPj4+PiArCXIxLT54MSA9IG1heChyMS0+eDEsIHIyLT54MSk7Cj4gPiA+ID4+ Pj4gKwlyMS0+eTEgPSBtYXgocjEtPnkxLCByMi0+eTEpOwo+ID4gPiA+Pj4+ICsJcjEtPngyID0g bWluKHIxLT54MiwgcjItPngyKTsKPiA+ID4gPj4+PiArCXIxLT55MiA9IG1pbihyMS0+eTIsIHIy LT55Mik7Cj4gPiA+ID4+Pj4gKwo+ID4gPiA+Pj4+ICsJcmV0dXJuIGRybV9jbGlwX3JlY3Rfdmlz aWJsZShyMSk7Cj4gPiA+ID4+Pj4gK30KPiA+ID4gPj4+PiArRVhQT1JUX1NZTUJPTChkcm1fY2xp cF9yZWN0X2ludGVyc2VjdCk7Cj4gPiA+ID4+Pj4gKwo+ID4gPiA+Pj4+ICsvKioKPiA+ID4gPj4+ PiArICogZHJtX2NsaXBfcmVjdF9tZXJnZSAtIE1lcmdlIGNsaXAgcmVjdGFuZ2xlcwo+ID4gPiA+ Pj4+ICsgKiBAZHN0OiBkZXN0aW5hdGlvbiBjbGlwIHJlY3RhbmdsZQo+ID4gPiA+Pj4+ICsgKiBA c3JjOiBzb3VyY2UgY2xpcCByZWN0YW5nbGUocyksIGNhbiBiZSBOVUxMCj4gPiA+ID4+Pj4gKyAq IEBudW1fY2xpcHM6IG51bWJlciBvZiBzb3VyY2UgY2xpcCByZWN0YW5nbGVzCj4gPiA+ID4+Pj4g KyAqIEBmbGFnczogZHJtX21vZGVfZmJfZGlydHlfY21kIGZsYWdzIChEUk1fTU9ERV9GQl9ESVJU WV9BTk5PVEFURV9DT1BZKQo+ID4gPiA+Pj4+ICsgKiBAd2lkdGg6IHdpZHRoIG9mIGNsaXAgcmVj dGFuZ2xlIGlmIEBzcmMgaXMgTlVMTAo+ID4gPiA+Pj4+ICsgKiBAaGVpZ2h0OiBoZWlnaHQgb2Yg Y2xpcCByZWN0YW5nbGUgaWYgQHNyYyBpcyBOVUxMCj4gPiA+ID4+Pj4gKyAqCj4gPiA+ID4+Pj4g KyAqIFRoZSBkaXJ0eWZiIGlvY3RsIGFsbG93cyBmb3IgYSBOVUxMIGNsaXAgcmVjdGFuZ2xlIHRv IGJlIHBhc3NlZCBpbiwKPiA+ID4gPj4+PiArICogc28gaWYgQHNyYyBpcyBOVUxMLCB3aWR0aCBh bmQgaGVpZ2h0IGlzIHVzZWQgdG8gc2V0IGEgZnVsbCBjbGlwIHJlY3RhbmdsZS4KPiA+ID4gPj4+ PiArICogQGRzdCB0YWtlcyBwYXJ0IGluIHRoZSBtZXJnZSB1bmxlc3MgaXQgaXMgZW1wdHkgezAs MCwwLDB9Lgo+ID4gPiA+Pj4+ICsgKi8KPiA+ID4gPj4+PiArdm9pZCBkcm1fY2xpcF9yZWN0X21l cmdlKHN0cnVjdCBkcm1fY2xpcF9yZWN0ICpkc3QsCj4gPiA+ID4+Pj4gKwkJCSBzdHJ1Y3QgZHJt X2NsaXBfcmVjdCAqc3JjLCB1bnNpZ25lZCBudW1fY2xpcHMsCj4gPiA+ID4+Pj4gKwkJCSB1bnNp Z25lZCBmbGFncywgdTMyIHdpZHRoLCB1MzIgaGVpZ2h0KQo+ID4gPiA+Pj4+ICt7Cj4gPiA+ID4+ Pj4gKwlpbnQgaTsKPiA+ID4gPj4+PiArCj4gPiA+ID4+Pj4gKwlpZiAoIXNyYyB8fCAhbnVtX2Ns aXBzKSB7Cj4gPiA+ID4+Pj4gKwkJZHN0LT54MSA9IDA7Cj4gPiA+ID4+Pj4gKwkJZHN0LT54MiA9 IHdpZHRoOwo+ID4gPiA+Pj4+ICsJCWRzdC0+eTEgPSAwOwo+ID4gPiA+Pj4+ICsJCWRzdC0+eTIg PSBoZWlnaHQ7Cj4gPiA+ID4+Pj4gKwkJcmV0dXJuOwo+ID4gPiA+Pj4+ICsJfQo+ID4gPiA+Pj4+ ICsKPiA+ID4gPj4+PiArCWlmIChkcm1fY2xpcF9yZWN0X2lzX2VtcHR5KGRzdCkpIHsKPiA+ID4g Pj4+PiArCQlkc3QtPngxID0gfjA7Cj4gPiA+ID4+Pj4gKwkJZHN0LT55MSA9IH4wOwo+ID4gPiA+ Pj4+ICsJfQo+ID4gPiA+Pj4+ICsKPiA+ID4gPj4+PiArCWZvciAoaSA9IDA7IGkgPCBudW1fY2xp cHM7IGkrKykgewo+ID4gPiA+Pj4+ICsJCWlmIChmbGFncyAmIERSTV9NT0RFX0ZCX0RJUlRZX0FO Tk9UQVRFX0NPUFkpCj4gPiA+ID4+Pj4gKwkJCWkrKzsKPiA+ID4gPj4+PiArCQlkc3QtPngxID0g bWluKGRzdC0+eDEsIHNyY1tpXS54MSk7Cj4gPiA+ID4+Pj4gKwkJZHN0LT54MiA9IG1heChkc3Qt PngyLCBzcmNbaV0ueDIpOwo+ID4gPiA+Pj4+ICsJCWRzdC0+eTEgPSBtaW4oZHN0LT55MSwgc3Jj W2ldLnkxKTsKPiA+ID4gPj4+PiArCQlkc3QtPnkyID0gbWF4KGRzdC0+eTIsIHNyY1tpXS55Mik7 Cj4gPiA+ID4+Pj4gKwl9Cj4gPiA+ID4+Pj4gK30KPiA+ID4gPj4+PiArRVhQT1JUX1NZTUJPTChk cm1fY2xpcF9yZWN0X21lcmdlKTsKPiA+ID4gPj4+PiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0v ZHJtX3JlY3QuaCBiL2luY2x1ZGUvZHJtL2RybV9yZWN0LmgKPiA+ID4gPj4+PiBpbmRleCA4M2Ji MTU2Li45MzZhZDhkIDEwMDY0NAo+ID4gPiA+Pj4+IC0tLSBhL2luY2x1ZGUvZHJtL2RybV9yZWN0 LmgKPiA+ID4gPj4+PiArKysgYi9pbmNsdWRlL2RybS9kcm1fcmVjdC5oCj4gPiA+ID4+Pj4gQEAg LTI0LDYgKzI0LDggQEAKPiA+ID4gPj4+PiAgICAjaWZuZGVmIERSTV9SRUNUX0gKPiA+ID4gPj4+ PiAgICAjZGVmaW5lIERSTV9SRUNUX0gKPiA+ID4gPj4+PiAgICAKPiA+ID4gPj4+PiArI2luY2x1 ZGUgPHVhcGkvZHJtL2RybS5oPgo+ID4gPiA+Pj4+ICsKPiA+ID4gPj4+PiAgICAvKioKPiA+ID4g Pj4+PiAgICAgKiBET0M6IHJlY3QgdXRpbHMKPiA+ID4gPj4+PiAgICAgKgo+ID4gPiA+Pj4+IEBA IC0xNzEsNCArMTczLDcxIEBAIHZvaWQgZHJtX3JlY3Rfcm90YXRlX2ludihzdHJ1Y3QgZHJtX3Jl Y3QgKnIsCj4gPiA+ID4+Pj4gICAgCQkJIGludCB3aWR0aCwgaW50IGhlaWdodCwKPiA+ID4gPj4+ PiAgICAJCQkgdW5zaWduZWQgaW50IHJvdGF0aW9uKTsKPiA+ID4gPj4+PiAgICAKPiA+ID4gPj4+ PiArLyoqCj4gPiA+ID4+Pj4gKyAqIGRybV9jbGlwX3JlY3Rfd2lkdGggLSBkZXRlcm1pbmUgdGhl IGNsaXAgcmVjdGFuZ2xlIHdpZHRoCj4gPiA+ID4+Pj4gKyAqIEByOiBjbGlwIHJlY3RhbmdsZSB3 aG9zZSB3aWR0aCBpcyByZXR1cm5lZAo+ID4gPiA+Pj4+ICsgKgo+ID4gPiA+Pj4+ICsgKiBSRVRV Uk5TOgo+ID4gPiA+Pj4+ICsgKiBUaGUgd2lkdGggb2YgdGhlIGNsaXAgcmVjdGFuZ2xlLgo+ID4g PiA+Pj4+ICsgKi8KPiA+ID4gPj4+PiArc3RhdGljIGlubGluZSBpbnQgZHJtX2NsaXBfcmVjdF93 aWR0aChjb25zdCBzdHJ1Y3QgZHJtX2NsaXBfcmVjdCAqcikKPiA+ID4gPj4+PiArewo+ID4gPiA+ Pj4+ICsJcmV0dXJuIHItPngyIC0gci0+eDE7Cj4gPiA+ID4+Pj4gK30KPiA+ID4gPj4+PiArCj4g PiA+ID4+Pj4gKy8qKgo+ID4gPiA+Pj4+ICsgKiBkcm1fY2xpcF9yZWN0X2hlaWdodCAtIGRldGVy bWluZSB0aGUgY2xpcCByZWN0YW5nbGUgaGVpZ2h0Cj4gPiA+ID4+Pj4gKyAqIEByOiBjbGlwIHJl Y3RhbmdsZSB3aG9zZSBoZWlnaHQgaXMgcmV0dXJuZWQKPiA+ID4gPj4+PiArICoKPiA+ID4gPj4+ PiArICogUkVUVVJOUzoKPiA+ID4gPj4+PiArICogVGhlIGhlaWdodCBvZiB0aGUgY2xpcCByZWN0 YW5nbGUuCj4gPiA+ID4+Pj4gKyAqLwo+ID4gPiA+Pj4+ICtzdGF0aWMgaW5saW5lIGludCBkcm1f Y2xpcF9yZWN0X2hlaWdodChjb25zdCBzdHJ1Y3QgZHJtX2NsaXBfcmVjdCAqcikKPiA+ID4gPj4+ PiArewo+ID4gPiA+Pj4+ICsJcmV0dXJuIHItPnkyIC0gci0+eTE7Cj4gPiA+ID4+Pj4gK30KPiA+ ID4gPj4+PiArCj4gPiA+ID4+Pj4gKy8qKgo+ID4gPiA+Pj4+ICsgKiBkcm1fY2xpcF9yZWN0X3Zp c2libGUgLSBkZXRlcm1pbmUgaWYgdGhlIHRoZSBjbGlwIHJlY3RhbmdsZSBpcyB2aXNpYmxlCj4g PiA+ID4+Pj4gKyAqIEByOiBjbGlwIHJlY3RhbmdsZSB3aG9zZSB2aXNpYmlsaXR5IGlzIHJldHVy bmVkCj4gPiA+ID4+Pj4gKyAqCj4gPiA+ID4+Pj4gKyAqIFJFVFVSTlM6Cj4gPiA+ID4+Pj4gKyAq ICV0cnVlIGlmIHRoZSBjbGlwIHJlY3RhbmdsZSBpcyB2aXNpYmxlLCAlZmFsc2Ugb3RoZXJ3aXNl Lgo+ID4gPiA+Pj4+ICsgKi8KPiA+ID4gPj4+PiArc3RhdGljIGlubGluZSBib29sIGRybV9jbGlw X3JlY3RfdmlzaWJsZShjb25zdCBzdHJ1Y3QgZHJtX2NsaXBfcmVjdCAqcikKPiA+ID4gPj4+PiAr ewo+ID4gPiA+Pj4+ICsJcmV0dXJuIGRybV9jbGlwX3JlY3Rfd2lkdGgocikgPiAwICYmIGRybV9j bGlwX3JlY3RfaGVpZ2h0KHIpID4gMDsKPiA+ID4gPj4+PiArfQo+ID4gPiA+Pj4+ICsKPiA+ID4g Pj4+PiArLyoqCj4gPiA+ID4+Pj4gKyAqIGRybV9jbGlwX3JlY3RfcmVzZXQgLSBSZXNldCBjbGlw IHJlY3RhbmdsZQo+ID4gPiA+Pj4+ICsgKiBAY2xpcDogY2xpcCByZWN0YW5nbGUKPiA+ID4gPj4+ PiArICoKPiA+ID4gPj4+PiArICogU2V0cyBjbGlwIHJlY3RhbmdsZSB0byB7MCwwLDAsMH0uCj4g PiA+ID4+Pj4gKyAqLwo+ID4gPiA+Pj4+ICtzdGF0aWMgaW5saW5lIHZvaWQgZHJtX2NsaXBfcmVj dF9yZXNldChzdHJ1Y3QgZHJtX2NsaXBfcmVjdCAqY2xpcCkKPiA+ID4gPj4+PiArewo+ID4gPiA+ Pj4+ICsJY2xpcC0+eDEgPSAwOwo+ID4gPiA+Pj4+ICsJY2xpcC0+eDIgPSAwOwo+ID4gPiA+Pj4+ ICsJY2xpcC0+eTEgPSAwOwo+ID4gPiA+Pj4+ICsJY2xpcC0+eTIgPSAwOwo+ID4gPiA+Pj4+ICt9 Cj4gPiA+ID4+Pj4gKwo+ID4gPiA+Pj4+ICsvKioKPiA+ID4gPj4+PiArICogZHJtX2NsaXBfcmVj dF9pc19lbXB0eSAtIElzIGNsaXAgcmVjdGFuZ2xlIGVtcHR5Pwo+ID4gPiA+Pj4+ICsgKiBAY2xp cDogY2xpcCByZWN0YW5nbGUKPiA+ID4gPj4+PiArICoKPiA+ID4gPj4+PiArICogUmV0dXJucyB0 cnVlIGlmIGNsaXAgcmVjdGFuZ2xlIGlzIHswLDAsMCwwfS4KPiA+ID4gPj4+PiArICovCj4gPiA+ ID4+Pj4gK3N0YXRpYyBpbmxpbmUgYm9vbCBkcm1fY2xpcF9yZWN0X2lzX2VtcHR5KHN0cnVjdCBk cm1fY2xpcF9yZWN0ICpjbGlwKQo+ID4gPiA+Pj4+ICt7Cj4gPiA+ID4+Pj4gKwlyZXR1cm4gKCFj bGlwLT54MSAmJiAhY2xpcC0+eDIgJiYgIWNsaXAtPnkxICYmICFjbGlwLT55Mik7Cj4gPiA+ID4+ Pj4gK30KPiA+ID4gPj4+PiArCj4gPiA+ID4+Pj4gK2Jvb2wgZHJtX2NsaXBfcmVjdF9pbnRlcnNl Y3Qoc3RydWN0IGRybV9jbGlwX3JlY3QgKnIxLAo+ID4gPiA+Pj4+ICsJCQkgICAgIGNvbnN0IHN0 cnVjdCBkcm1fY2xpcF9yZWN0ICpyMik7Cj4gPiA+ID4+Pj4gK3ZvaWQgZHJtX2NsaXBfcmVjdF9t ZXJnZShzdHJ1Y3QgZHJtX2NsaXBfcmVjdCAqZHN0LAo+ID4gPiA+Pj4+ICsJCQkgc3RydWN0IGRy bV9jbGlwX3JlY3QgKnNyYywgdW5zaWduZWQgbnVtX2NsaXBzLAo+ID4gPiA+Pj4+ICsJCQkgdW5z aWduZWQgZmxhZ3MsIHUzMiB3aWR0aCwgdTMyIGhlaWdodCk7Cj4gPiA+ID4+Pj4gKwo+ID4gPiA+ Pj4+ICAgICNlbmRpZgo+ID4gPiA+Pj4+IC0tIAo+ID4gPiA+Pj4+IDIuMi4yCj4gPiA+ID4+Pj4K PiA+ID4gPj4+PiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Xwo+ID4gPiA+Pj4+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiA+ID4gPj4+PiBkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gPiA+ID4+Pj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwKPiA+IAo+ID4gLS0gCj4gPiBWaWxsZSBT eXJqw6Rsw6QKPiA+IEludGVsIE9UQwo+ID4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KPiA+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiA+IGRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiA+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCj4gCj4gLS0gCj4gRGFuaWVsIFZldHRlcgo+IFNv ZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgo+IGh0dHA6Ly9ibG9nLmZmd2xsLmNo CgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754925AbcDYQij (ORCPT ); Mon, 25 Apr 2016 12:38:39 -0400 Received: from mga09.intel.com ([134.134.136.24]:35612 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933065AbcDYQiW (ORCPT ); Mon, 25 Apr 2016 12:38:22 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,533,1455004800"; d="scan'208";a="691979332" Date: Mon, 25 Apr 2016 19:38:16 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= , linux-fbdev@vger.kernel.org, tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 1/8] drm/rect: Add some drm_clip_rect utility functions Message-ID: <20160425163816.GF4329@intel.com> References: <1461530942-22485-1-git-send-email-noralf@tronnes.org> <1461530942-22485-2-git-send-email-noralf@tronnes.org> <20160425123907.GY4329@intel.com> <571E13D8.4060100@tronnes.org> <20160425130229.GZ4329@intel.com> <571E23A1.2040100@tronnes.org> <20160425150944.GB4329@intel.com> <20160425160520.GV2510@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160425160520.GV2510@phenom.ffwll.local> 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 Mon, Apr 25, 2016 at 06:05:20PM +0200, Daniel Vetter wrote: > On Mon, Apr 25, 2016 at 06:09:44PM +0300, Ville Syrjälä wrote: > > On Mon, Apr 25, 2016 at 04:03:13PM +0200, Noralf Trønnes wrote: > > > > > > Den 25.04.2016 15:02, skrev Ville Syrjälä: > > > > On Mon, Apr 25, 2016 at 02:55:52PM +0200, Noralf Trønnes wrote: > > > >> Den 25.04.2016 14:39, skrev Ville Syrjälä: > > > >>> 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? > > > >> That's because the framebuffer flushing uses drm_clip_rect and not drm_rect: > > > > Converting to drm_rect is not an option? > > > > > > That's difficult or at least verbose to do because clips is an array. > > > I could use drm_rect on the calling side (fbdev) since it's only one clip > > > which the changes are merged into, and then convert it when I call dirty(). > > > But the driver can get zero or more clips from the dirty ioctl so I don't > > > see a clean way to convert this array to drm_rect without more code than > > > this proposal has. > > > > Just some kind of simple drm_clip_rect_to_rect() thing should be enough AFAICS. > > Yeah, drm_clip_rect is the uapi struct, drm_rect is the internal one. > Similar case is drm_display_mode vs. drm_mode_modeinfo. We have > umode_to_mode and mode_to_umode helpers to deal with that. I do agree that > it would make sense to switch the internal ->dirty callback over to the > internal drm_struct. Would need a kmalloc+copy in the dirtyfb ioctl, but > since the structs actually match in their member names (just not the > size/signedness, sigh) there shouldn't be any need for driver changes. So > fairly simple patch. Or if we want to avoid the malloc, then the merge() thing could just internally convert one at a time on stack when going through them. Though then someone might want to do a merge() with internal drm_rects, and we'd be right where we started. But I'm not sure that will happen, so perhaps it's just too much future proofing. > > Ofc you need to compile-test all the drivers (at least those using ->dirty > hook) to make sure gcc is still happy with all the signed vs. unsigned > stuff. Maybe that turns up something, but hopefully not. > > Sorry for that late request, but I really didn't realize what's going on > here :( > -Daniel > > > > > > > > > Here's the driver side: > > > > > > static int mipi_dbi_dirtyfb(struct drm_framebuffer *fb, void *vmem, > > > unsigned flags, unsigned color, > > > struct drm_clip_rect *clips, unsigned num_clips) > > > { > > > struct tinydrm_device *tdev = fb->dev->dev_private; > > > struct lcdreg *reg = tdev->lcdreg; > > > struct drm_clip_rect full_clip = { > > > .x1 = 0, > > > .x2 = fb->width, > > > .y1 = 0, > > > .y2 = fb->height, > > > }; > > > struct drm_clip_rect clip; > > > int ret; > > > > > > drm_clip_rect_reset(&clip); > > > drm_clip_rect_merge(&clip, clips, num_clips, flags, > > > fb->width, fb->height); > > > if (!drm_clip_rect_intersect(&clip, &full_clip)) { > > > DRM_DEBUG_KMS("Empty clip\n"); > > > return -EINVAL; > > > } > > > [...] > > > > > > > > >> struct drm_framebuffer_funcs { > > > >> [...] > > > >> int (*dirty)(struct drm_framebuffer *framebuffer, > > > >> struct drm_file *file_priv, unsigned flags, > > > >> unsigned color, struct drm_clip_rect *clips, > > > >> unsigned num_clips); > > > >> }; > > > >> > > > >>>> 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 > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch -- Ville Syrjälä Intel OTC