From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4C8DC10F0E for ; Thu, 4 Apr 2019 17:17:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 79DF0206BA for ; Thu, 4 Apr 2019 17:17:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729166AbfDDRRX (ORCPT ); Thu, 4 Apr 2019 13:17:23 -0400 Received: from asavdk4.altibox.net ([109.247.116.15]:55898 "EHLO asavdk4.altibox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728643AbfDDRRW (ORCPT ); Thu, 4 Apr 2019 13:17:22 -0400 Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by asavdk4.altibox.net (Postfix) with ESMTPS id 2AA838037F; Thu, 4 Apr 2019 19:17:20 +0200 (CEST) Date: Thu, 4 Apr 2019 19:17:18 +0200 From: Sam Ravnborg To: Gerd Hoffmann Cc: dri-devel@lists.freedesktop.org, Maxime Ripard , open list , David Airlie , Sean Paul Subject: Re: [PATCH v2 4/6] drm: add dstclip parameter to drm_fb_xrgb8888_to_rgb565() Message-ID: <20190404171718.GF23897@ravnborg.org> References: <20190404152430.8263-1-kraxel@redhat.com> <20190404152430.8263-5-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190404152430.8263-5-kraxel@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=UpRNyd4B c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=20KFwNOVAAAA:8 a=cXxxXYB-JrVh0EPT2CgA:9 a=CjuIK1q_8ugA:10 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 04, 2019 at 05:24:28PM +0200, Gerd Hoffmann wrote: > When set apply clipping logic to destination too. > > Signed-off-by: Gerd Hoffmann > --- > include/drm/drm_fb_helper.h | 3 ++- > drivers/gpu/drm/drm_fb_helper.c | 8 +++++++- > drivers/gpu/drm/tinydrm/mipi-dbi.c | 2 +- > 3 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h > index 0350c7e9d6ba..1406057e1a93 100644 > --- a/include/drm/drm_fb_helper.h > +++ b/include/drm/drm_fb_helper.h > @@ -646,6 +646,7 @@ void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb, > struct drm_rect *clip, bool dstclip); > void drm_fb_xrgb8888_to_rgb565(u16 *dst, void *vaddr, > struct drm_framebuffer *fb, > - struct drm_rect *clip, bool swap); > + struct drm_rect *clip, > + bool swap, bool dstclip); > > #endif > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 087e49741094..2c9286702c3f 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -3388,13 +3388,15 @@ EXPORT_SYMBOL(drm_fb_memcpy); > * @fb: DRM framebuffer > * @clip: Clip rectangle area to copy > * @swap: Swap bytes > + * @dstclip: Clip destination too. > * > * Drivers can use this function for RGB565 devices that don't natively > * support XRGB8888. > */ > void drm_fb_xrgb8888_to_rgb565(u16 *dst, void *vaddr, > struct drm_framebuffer *fb, > - struct drm_rect *clip, bool swap) > + struct drm_rect *clip, > + bool swap, bool dstclip) > { > size_t len = (clip->x2 - clip->x1) * sizeof(u32); > unsigned int x, y; > @@ -3405,6 +3407,8 @@ void drm_fb_xrgb8888_to_rgb565(u16 *dst, void *vaddr, > if (!buf) > return; > > + if (dstclip) > + dst += clip->y1 * fb->width + clip->x1; > for (y = clip->y1; y < clip->y2; y++) { > src = vaddr + (y * fb->pitches[0]); > src += clip->x1; > @@ -3420,6 +3424,8 @@ void drm_fb_xrgb8888_to_rgb565(u16 *dst, void *vaddr, > else > *dst++ = val16; > } > + if (dstclip) > + dst += fb->width - (clip->x2 - clip->x1); > } Same story as before with dstclip and boolean parameters to functions. A small helper and you had two functions with and without clip. Sam From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: Re: [PATCH v2 4/6] drm: add dstclip parameter to drm_fb_xrgb8888_to_rgb565() Date: Thu, 4 Apr 2019 19:17:18 +0200 Message-ID: <20190404171718.GF23897@ravnborg.org> References: <20190404152430.8263-1-kraxel@redhat.com> <20190404152430.8263-5-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from asavdk4.altibox.net (asavdk4.altibox.net [109.247.116.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id E1AB26E324 for ; Thu, 4 Apr 2019 17:17:21 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20190404152430.8263-5-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gerd Hoffmann Cc: Maxime Ripard , David Airlie , Sean Paul , open list , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBBcHIgMDQsIDIwMTkgYXQgMDU6MjQ6MjhQTSArMDIwMCwgR2VyZCBIb2ZmbWFubiB3 cm90ZToKPiBXaGVuIHNldCBhcHBseSBjbGlwcGluZyBsb2dpYyB0byBkZXN0aW5hdGlvbiB0b28u Cj4gCj4gU2lnbmVkLW9mZi1ieTogR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+Cj4g LS0tCj4gIGluY2x1ZGUvZHJtL2RybV9mYl9oZWxwZXIuaCAgICAgICAgfCAzICsrLQo+ICBkcml2 ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jICAgIHwgOCArKysrKysrLQo+ICBkcml2ZXJzL2dw dS9kcm0vdGlueWRybS9taXBpLWRiaS5jIHwgMiArLQo+ICAzIGZpbGVzIGNoYW5nZWQsIDEwIGlu c2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJt L2RybV9mYl9oZWxwZXIuaCBiL2luY2x1ZGUvZHJtL2RybV9mYl9oZWxwZXIuaAo+IGluZGV4IDAz NTBjN2U5ZDZiYS4uMTQwNjA1N2UxYTkzIDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvZHJtL2RybV9m Yl9oZWxwZXIuaAo+ICsrKyBiL2luY2x1ZGUvZHJtL2RybV9mYl9oZWxwZXIuaAo+IEBAIC02NDYs NiArNjQ2LDcgQEAgdm9pZCBkcm1fZmJfbWVtY3B5KHZvaWQgKmRzdCwgdm9pZCAqdmFkZHIsIHN0 cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAo+ICAJCSAgIHN0cnVjdCBkcm1fcmVjdCAqY2xpcCwg Ym9vbCBkc3RjbGlwKTsKPiAgdm9pZCBkcm1fZmJfeHJnYjg4ODhfdG9fcmdiNTY1KHUxNiAqZHN0 LCB2b2lkICp2YWRkciwKPiAgCQkJICAgICAgIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAo+ IC0JCQkgICAgICAgc3RydWN0IGRybV9yZWN0ICpjbGlwLCBib29sIHN3YXApOwo+ICsJCQkgICAg ICAgc3RydWN0IGRybV9yZWN0ICpjbGlwLAo+ICsJCQkgICAgICAgYm9vbCBzd2FwLCBib29sIGRz dGNsaXApOwo+ICAKPiAgI2VuZGlmCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1f ZmJfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jCj4gaW5kZXggMDg3 ZTQ5NzQxMDk0Li4yYzkyODY3MDJjM2YgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ry bV9mYl9oZWxwZXIuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMKPiBA QCAtMzM4OCwxMyArMzM4OCwxNSBAQCBFWFBPUlRfU1lNQk9MKGRybV9mYl9tZW1jcHkpOwo+ICAg KiBAZmI6IERSTSBmcmFtZWJ1ZmZlcgo+ICAgKiBAY2xpcDogQ2xpcCByZWN0YW5nbGUgYXJlYSB0 byBjb3B5Cj4gICAqIEBzd2FwOiBTd2FwIGJ5dGVzCj4gKyAqIEBkc3RjbGlwOiBDbGlwIGRlc3Rp bmF0aW9uIHRvby4KPiAgICoKPiAgICogRHJpdmVycyBjYW4gdXNlIHRoaXMgZnVuY3Rpb24gZm9y IFJHQjU2NSBkZXZpY2VzIHRoYXQgZG9uJ3QgbmF0aXZlbHkKPiAgICogc3VwcG9ydCBYUkdCODg4 OC4KPiAgICovCj4gIHZvaWQgZHJtX2ZiX3hyZ2I4ODg4X3RvX3JnYjU2NSh1MTYgKmRzdCwgdm9p ZCAqdmFkZHIsCj4gIAkJCSAgICAgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKPiAtCQkJ ICAgICAgIHN0cnVjdCBkcm1fcmVjdCAqY2xpcCwgYm9vbCBzd2FwKQo+ICsJCQkgICAgICAgc3Ry dWN0IGRybV9yZWN0ICpjbGlwLAo+ICsJCQkgICAgICAgYm9vbCBzd2FwLCBib29sIGRzdGNsaXAp Cj4gIHsKPiAgCXNpemVfdCBsZW4gPSAoY2xpcC0+eDIgLSBjbGlwLT54MSkgKiBzaXplb2YodTMy KTsKPiAgCXVuc2lnbmVkIGludCB4LCB5Owo+IEBAIC0zNDA1LDYgKzM0MDcsOCBAQCB2b2lkIGRy bV9mYl94cmdiODg4OF90b19yZ2I1NjUodTE2ICpkc3QsIHZvaWQgKnZhZGRyLAo+ICAJaWYgKCFi dWYpCj4gIAkJcmV0dXJuOwo+ICAKPiArCWlmIChkc3RjbGlwKQo+ICsJCWRzdCArPSBjbGlwLT55 MSAqIGZiLT53aWR0aCArIGNsaXAtPngxOwo+ICAJZm9yICh5ID0gY2xpcC0+eTE7IHkgPCBjbGlw LT55MjsgeSsrKSB7Cj4gIAkJc3JjID0gdmFkZHIgKyAoeSAqIGZiLT5waXRjaGVzWzBdKTsKPiAg CQlzcmMgKz0gY2xpcC0+eDE7Cj4gQEAgLTM0MjAsNiArMzQyNCw4IEBAIHZvaWQgZHJtX2ZiX3hy Z2I4ODg4X3RvX3JnYjU2NSh1MTYgKmRzdCwgdm9pZCAqdmFkZHIsCj4gIAkJCWVsc2UKPiAgCQkJ CSpkc3QrKyA9IHZhbDE2Owo+ICAJCX0KPiArCQlpZiAoZHN0Y2xpcCkKPiArCQkJZHN0ICs9IGZi LT53aWR0aCAtIChjbGlwLT54MiAtIGNsaXAtPngxKTsKPiAgCX0KClNhbWUgc3RvcnkgYXMgYmVm b3JlIHdpdGggZHN0Y2xpcCBhbmQgYm9vbGVhbiBwYXJhbWV0ZXJzIHRvIGZ1bmN0aW9ucy4KQSBz bWFsbCBoZWxwZXIgYW5kIHlvdSBoYWQgdHdvIGZ1bmN0aW9ucyB3aXRoIGFuZCB3aXRob3V0IGNs aXAuCgoJU2FtCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==