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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS 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 24D91C4360F for ; Thu, 4 Apr 2019 15:24:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE96C20855 for ; Thu, 4 Apr 2019 15:24:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729428AbfDDPYs (ORCPT ); Thu, 4 Apr 2019 11:24:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41006 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729208AbfDDPYh (ORCPT ); Thu, 4 Apr 2019 11:24:37 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 489547F6C7; Thu, 4 Apr 2019 15:24:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-22.ams2.redhat.com [10.36.116.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CAB76B49D; Thu, 4 Apr 2019 15:24:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4AB911747D; Thu, 4 Apr 2019 17:24:30 +0200 (CEST) From: Gerd Hoffmann To: dri-devel@lists.freedesktop.org Cc: Gerd Hoffmann , Maarten Lankhorst , Maxime Ripard , Sean Paul , David Airlie , Daniel Vetter , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 1/6] drm: move tinydrm_memcpy() to drm_fb_helper.c Date: Thu, 4 Apr 2019 17:24:25 +0200 Message-Id: <20190404152430.8263-2-kraxel@redhat.com> In-Reply-To: <20190404152430.8263-1-kraxel@redhat.com> References: <20190404152430.8263-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 04 Apr 2019 15:24:37 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Also rename to drm_fb_memcpy(). Pure code motion, no functional change. Signed-off-by: Gerd Hoffmann --- include/drm/drm_fb_helper.h | 3 +++ include/drm/tinydrm/tinydrm-helpers.h | 2 -- drivers/gpu/drm/drm_fb_helper.c | 25 +++++++++++++++++++ .../gpu/drm/tinydrm/core/tinydrm-helpers.c | 24 ------------------ drivers/gpu/drm/tinydrm/mipi-dbi.c | 3 ++- 5 files changed, 30 insertions(+), 27 deletions(-) diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 81ae48a0df48..696017b38add 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -642,4 +642,7 @@ drm_fb_helper_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, #endif } +void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb, + struct drm_rect *clip); + #endif diff --git a/include/drm/tinydrm/tinydrm-helpers.h b/include/drm/tinydrm/tinydrm-helpers.h index ae4a6abc43b5..591ca83330c4 100644 --- a/include/drm/tinydrm/tinydrm-helpers.h +++ b/include/drm/tinydrm/tinydrm-helpers.h @@ -46,8 +46,6 @@ int tinydrm_display_pipe_init(struct drm_device *drm, const struct drm_display_mode *mode, unsigned int rotation); -void tinydrm_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb, - struct drm_rect *clip); void tinydrm_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb, struct drm_rect *clip); void tinydrm_xrgb8888_to_rgb565(u16 *dst, void *vaddr, diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 03749a24e4dd..22d29834bbe9 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -3353,3 +3353,28 @@ int __init drm_fb_helper_modinit(void) return 0; } EXPORT_SYMBOL(drm_fb_helper_modinit); + +/** + * drm_fb_memcpy - Copy clip buffer + * @dst: Destination buffer + * @vaddr: Source buffer + * @fb: DRM framebuffer + * @clip: Clip rectangle area to copy + * @dstclip: Clip destination too. + */ +void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb, + struct drm_rect *clip) +{ + unsigned int cpp = drm_format_plane_cpp(fb->format->format, 0); + unsigned int pitch = fb->pitches[0]; + void *src = vaddr + (clip->y1 * pitch) + (clip->x1 * cpp); + size_t len = (clip->x2 - clip->x1) * cpp; + unsigned int y; + + for (y = clip->y1; y < clip->y2; y++) { + memcpy(dst, src, len); + src += pitch; + dst += len; + } +} +EXPORT_SYMBOL(drm_fb_memcpy); diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c index d7b38dfb6438..f5c6f35e6161 100644 --- a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c @@ -26,30 +26,6 @@ static unsigned int spi_max; module_param(spi_max, uint, 0400); MODULE_PARM_DESC(spi_max, "Set a lower SPI max transfer size"); -/** - * tinydrm_memcpy - Copy clip buffer - * @dst: Destination buffer - * @vaddr: Source buffer - * @fb: DRM framebuffer - * @clip: Clip rectangle area to copy - */ -void tinydrm_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb, - struct drm_rect *clip) -{ - unsigned int cpp = drm_format_plane_cpp(fb->format->format, 0); - unsigned int pitch = fb->pitches[0]; - void *src = vaddr + (clip->y1 * pitch) + (clip->x1 * cpp); - size_t len = (clip->x2 - clip->x1) * cpp; - unsigned int y; - - for (y = clip->y1; y < clip->y2; y++) { - memcpy(dst, src, len); - src += pitch; - dst += len; - } -} -EXPORT_SYMBOL(tinydrm_memcpy); - /** * tinydrm_swab16 - Swap bytes into clip buffer * @dst: RGB565 destination buffer diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c index 869c8f56da3b..fb7e4582e293 100644 --- a/drivers/gpu/drm/tinydrm/mipi-dbi.c +++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -220,7 +221,7 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb, if (swap) tinydrm_swab16(dst, src, fb, clip); else - tinydrm_memcpy(dst, src, fb, clip); + drm_fb_memcpy(dst, src, fb, clip); break; case DRM_FORMAT_XRGB8888: tinydrm_xrgb8888_to_rgb565(dst, src, fb, clip, swap); -- 2.18.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v2 1/6] drm: move tinydrm_memcpy() to drm_fb_helper.c Date: Thu, 4 Apr 2019 17:24:25 +0200 Message-ID: <20190404152430.8263-2-kraxel@redhat.com> References: <20190404152430.8263-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id B7EBE6EA12 for ; Thu, 4 Apr 2019 15:24:37 +0000 (UTC) In-Reply-To: <20190404152430.8263-1-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: dri-devel@lists.freedesktop.org Cc: Maxime Ripard , open list , David Airlie , Gerd Hoffmann , Sean Paul List-Id: dri-devel@lists.freedesktop.org QWxzbyByZW5hbWUgdG8gZHJtX2ZiX21lbWNweSgpLgpQdXJlIGNvZGUgbW90aW9uLCBubyBmdW5j dGlvbmFsIGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6IEdlcmQgSG9mZm1hbm4gPGtyYXhlbEByZWRo YXQuY29tPgotLS0KIGluY2x1ZGUvZHJtL2RybV9mYl9oZWxwZXIuaCAgICAgICAgICAgICAgICAg ICB8ICAzICsrKwogaW5jbHVkZS9kcm0vdGlueWRybS90aW55ZHJtLWhlbHBlcnMuaCAgICAgICAg IHwgIDIgLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVscGVyLmMgICAgICAgICAgICAgICB8 IDI1ICsrKysrKysrKysrKysrKysrKysKIC4uLi9ncHUvZHJtL3Rpbnlkcm0vY29yZS90aW55ZHJt LWhlbHBlcnMuYyAgICB8IDI0IC0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3Rp bnlkcm0vbWlwaS1kYmkuYyAgICAgICAgICAgIHwgIDMgKystCiA1IGZpbGVzIGNoYW5nZWQsIDMw IGluc2VydGlvbnMoKyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJt L2RybV9mYl9oZWxwZXIuaCBiL2luY2x1ZGUvZHJtL2RybV9mYl9oZWxwZXIuaAppbmRleCA4MWFl NDhhMGRmNDguLjY5NjAxN2IzOGFkZCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJtX2ZiX2hl bHBlci5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9mYl9oZWxwZXIuaApAQCAtNjQyLDQgKzY0Miw3 IEBAIGRybV9mYl9oZWxwZXJfcmVtb3ZlX2NvbmZsaWN0aW5nX3BjaV9mcmFtZWJ1ZmZlcnMoc3Ry dWN0IHBjaV9kZXYgKnBkZXYsCiAjZW5kaWYKIH0KIAordm9pZCBkcm1fZmJfbWVtY3B5KHZvaWQg KmRzdCwgdm9pZCAqdmFkZHIsIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAorCQkgICBzdHJ1 Y3QgZHJtX3JlY3QgKmNsaXApOworCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL3Rp bnlkcm0vdGlueWRybS1oZWxwZXJzLmggYi9pbmNsdWRlL2RybS90aW55ZHJtL3Rpbnlkcm0taGVs cGVycy5oCmluZGV4IGFlNGE2YWJjNDNiNS4uNTkxY2E4MzMzMGM0IDEwMDY0NAotLS0gYS9pbmNs dWRlL2RybS90aW55ZHJtL3Rpbnlkcm0taGVscGVycy5oCisrKyBiL2luY2x1ZGUvZHJtL3Rpbnlk cm0vdGlueWRybS1oZWxwZXJzLmgKQEAgLTQ2LDggKzQ2LDYgQEAgaW50IHRpbnlkcm1fZGlzcGxh eV9waXBlX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRybSwKIAkJCSAgICAgIGNvbnN0IHN0cnVj dCBkcm1fZGlzcGxheV9tb2RlICptb2RlLAogCQkJICAgICAgdW5zaWduZWQgaW50IHJvdGF0aW9u KTsKIAotdm9pZCB0aW55ZHJtX21lbWNweSh2b2lkICpkc3QsIHZvaWQgKnZhZGRyLCBzdHJ1Y3Qg ZHJtX2ZyYW1lYnVmZmVyICpmYiwKLQkJICAgIHN0cnVjdCBkcm1fcmVjdCAqY2xpcCk7CiB2b2lk IHRpbnlkcm1fc3dhYjE2KHUxNiAqZHN0LCB2b2lkICp2YWRkciwgc3RydWN0IGRybV9mcmFtZWJ1 ZmZlciAqZmIsCiAJCSAgICBzdHJ1Y3QgZHJtX3JlY3QgKmNsaXApOwogdm9pZCB0aW55ZHJtX3hy Z2I4ODg4X3RvX3JnYjU2NSh1MTYgKmRzdCwgdm9pZCAqdmFkZHIsCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9mYl9oZWxw ZXIuYwppbmRleCAwMzc0OWEyNGU0ZGQuLjIyZDI5ODM0YmJlOSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hl bHBlci5jCkBAIC0zMzUzLDMgKzMzNTMsMjggQEAgaW50IF9faW5pdCBkcm1fZmJfaGVscGVyX21v ZGluaXQodm9pZCkKIAlyZXR1cm4gMDsKIH0KIEVYUE9SVF9TWU1CT0woZHJtX2ZiX2hlbHBlcl9t b2Rpbml0KTsKKworLyoqCisgKiBkcm1fZmJfbWVtY3B5IC0gQ29weSBjbGlwIGJ1ZmZlcgorICog QGRzdDogRGVzdGluYXRpb24gYnVmZmVyCisgKiBAdmFkZHI6IFNvdXJjZSBidWZmZXIKKyAqIEBm YjogRFJNIGZyYW1lYnVmZmVyCisgKiBAY2xpcDogQ2xpcCByZWN0YW5nbGUgYXJlYSB0byBjb3B5 CisgKiBAZHN0Y2xpcDogQ2xpcCBkZXN0aW5hdGlvbiB0b28uCisgKi8KK3ZvaWQgZHJtX2ZiX21l bWNweSh2b2lkICpkc3QsIHZvaWQgKnZhZGRyLCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwK KwkJICAgc3RydWN0IGRybV9yZWN0ICpjbGlwKQoreworCXVuc2lnbmVkIGludCBjcHAgPSBkcm1f Zm9ybWF0X3BsYW5lX2NwcChmYi0+Zm9ybWF0LT5mb3JtYXQsIDApOworCXVuc2lnbmVkIGludCBw aXRjaCA9IGZiLT5waXRjaGVzWzBdOworCXZvaWQgKnNyYyA9IHZhZGRyICsgKGNsaXAtPnkxICog cGl0Y2gpICsgKGNsaXAtPngxICogY3BwKTsKKwlzaXplX3QgbGVuID0gKGNsaXAtPngyIC0gY2xp cC0+eDEpICogY3BwOworCXVuc2lnbmVkIGludCB5OworCisJZm9yICh5ID0gY2xpcC0+eTE7IHkg PCBjbGlwLT55MjsgeSsrKSB7CisJCW1lbWNweShkc3QsIHNyYywgbGVuKTsKKwkJc3JjICs9IHBp dGNoOworCQlkc3QgKz0gbGVuOworCX0KK30KK0VYUE9SVF9TWU1CT0woZHJtX2ZiX21lbWNweSk7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdGlueWRybS9jb3JlL3Rpbnlkcm0taGVscGVy cy5jIGIvZHJpdmVycy9ncHUvZHJtL3Rpbnlkcm0vY29yZS90aW55ZHJtLWhlbHBlcnMuYwppbmRl eCBkN2IzOGRmYjY0MzguLmY1YzZmMzVlNjE2MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L3Rpbnlkcm0vY29yZS90aW55ZHJtLWhlbHBlcnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdGlu eWRybS9jb3JlL3Rpbnlkcm0taGVscGVycy5jCkBAIC0yNiwzMCArMjYsNiBAQCBzdGF0aWMgdW5z aWduZWQgaW50IHNwaV9tYXg7CiBtb2R1bGVfcGFyYW0oc3BpX21heCwgdWludCwgMDQwMCk7CiBN T0RVTEVfUEFSTV9ERVNDKHNwaV9tYXgsICJTZXQgYSBsb3dlciBTUEkgbWF4IHRyYW5zZmVyIHNp emUiKTsKIAotLyoqCi0gKiB0aW55ZHJtX21lbWNweSAtIENvcHkgY2xpcCBidWZmZXIKLSAqIEBk c3Q6IERlc3RpbmF0aW9uIGJ1ZmZlcgotICogQHZhZGRyOiBTb3VyY2UgYnVmZmVyCi0gKiBAZmI6 IERSTSBmcmFtZWJ1ZmZlcgotICogQGNsaXA6IENsaXAgcmVjdGFuZ2xlIGFyZWEgdG8gY29weQot ICovCi12b2lkIHRpbnlkcm1fbWVtY3B5KHZvaWQgKmRzdCwgdm9pZCAqdmFkZHIsIHN0cnVjdCBk cm1fZnJhbWVidWZmZXIgKmZiLAotCQkgICAgc3RydWN0IGRybV9yZWN0ICpjbGlwKQotewotCXVu c2lnbmVkIGludCBjcHAgPSBkcm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+Zm9ybWF0LT5mb3JtYXQs IDApOwotCXVuc2lnbmVkIGludCBwaXRjaCA9IGZiLT5waXRjaGVzWzBdOwotCXZvaWQgKnNyYyA9 IHZhZGRyICsgKGNsaXAtPnkxICogcGl0Y2gpICsgKGNsaXAtPngxICogY3BwKTsKLQlzaXplX3Qg bGVuID0gKGNsaXAtPngyIC0gY2xpcC0+eDEpICogY3BwOwotCXVuc2lnbmVkIGludCB5OwotCi0J Zm9yICh5ID0gY2xpcC0+eTE7IHkgPCBjbGlwLT55MjsgeSsrKSB7Ci0JCW1lbWNweShkc3QsIHNy YywgbGVuKTsKLQkJc3JjICs9IHBpdGNoOwotCQlkc3QgKz0gbGVuOwotCX0KLX0KLUVYUE9SVF9T WU1CT0wodGlueWRybV9tZW1jcHkpOwotCiAvKioKICAqIHRpbnlkcm1fc3dhYjE2IC0gU3dhcCBi eXRlcyBpbnRvIGNsaXAgYnVmZmVyCiAgKiBAZHN0OiBSR0I1NjUgZGVzdGluYXRpb24gYnVmZmVy CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdGlueWRybS9taXBpLWRiaS5jIGIvZHJpdmVy cy9ncHUvZHJtL3Rpbnlkcm0vbWlwaS1kYmkuYwppbmRleCA4NjljOGY1NmRhM2IuLmZiN2U0NTgy ZTI5MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Rpbnlkcm0vbWlwaS1kYmkuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vdGlueWRybS9taXBpLWRiaS5jCkBAIC0xOSw2ICsxOSw3IEBACiAK ICNpbmNsdWRlIDxkcm0vZHJtX2RhbWFnZV9oZWxwZXIuaD4KICNpbmNsdWRlIDxkcm0vZHJtX2Ry di5oPgorI2luY2x1ZGUgPGRybS9kcm1fZmJfaGVscGVyLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9m Yl9jbWFfaGVscGVyLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9nZW1fY21hX2hlbHBlci5oPgogI2lu Y2x1ZGUgPGRybS9kcm1fZm91cmNjLmg+CkBAIC0yMjAsNyArMjIxLDcgQEAgaW50IG1pcGlfZGJp X2J1Zl9jb3B5KHZvaWQgKmRzdCwgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJCWlmIChz d2FwKQogCQkJdGlueWRybV9zd2FiMTYoZHN0LCBzcmMsIGZiLCBjbGlwKTsKIAkJZWxzZQotCQkJ dGlueWRybV9tZW1jcHkoZHN0LCBzcmMsIGZiLCBjbGlwKTsKKwkJCWRybV9mYl9tZW1jcHkoZHN0 LCBzcmMsIGZiLCBjbGlwKTsKIAkJYnJlYWs7CiAJY2FzZSBEUk1fRk9STUFUX1hSR0I4ODg4Ogog CQl0aW55ZHJtX3hyZ2I4ODg4X3RvX3JnYjU2NShkc3QsIHNyYywgZmIsIGNsaXAsIHN3YXApOwot LSAKMi4xOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=