Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp4449279ybv; Tue, 25 Feb 2020 20:32:51 -0800 (PST) X-Google-Smtp-Source: APXvYqzbsa5/CJHgl3Zuwa5DysxIEtbBrb/e3lVG3CgUeTPHAA7YeInIpNQP+BNkJju/egQ8vbAS X-Received: by 2002:aca:4b46:: with SMTP id y67mr1551293oia.122.1582691571282; Tue, 25 Feb 2020 20:32:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582691571; cv=none; d=google.com; s=arc-20160816; b=YngGmGSCPPRlYaHo8u2pBBA/by/AmYydz2cAvcijbZX6B8ghwf66P4ZA2LYUGTg24e QhJTt43ribZbJXhzSlTfRbP+qYVjk0MpjbqaEaTF6KZnFZ0tcIgZ2ymkga5LZjp/2VZm ajUek9Rhhcy58jDu2XKSS4dt3Rbb1QrATlLkcH3JbyYhZN74s2Z7iSEEuMmC6JlR6Nc9 d/FPHn2R+xIlA36+W4YYFATi+aRgBrSOu3q+PMnwsyaaug3csozxrHnQ4N7joic+LJSW N0p0m9xRvXBnx7AfB233lCibYPp0A396gESgAwk2fgalO4zNlVKYZdqL6hGcz5txO1fL FeEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CFJ68ft8qkdRIMc6G1Srh+NvxS7BejwewDvBTrbklnA=; b=CD9E4/7/oGVcKp+3tCeUfJDdTD3H0Ql5yaDRoRpMxZCtHkIi31t3EK0XXiHXznGJ/a gHfwhZAO0VCaxgH1IFR6GsN8RPEDssKeRAsGr1+LISdCcJzSxsYEnJYDBPke5vhzTu/A ng89CeIfQ5+H7vO8DbgjPlP+W3MahhCBVG9GScGVYslBlmvachQgUKQTzEP9TBmsxuTA XQbn7O4XHEJWVT4t9Q93ZPE3xBsY8IMKUSunlFZS3r24aRER+OciWAPCUNOLO1Ovm4pW wRWeFiyLfW7YCOQB5U9ElyX/Eqk1O3f+TmCgJDjTQM2NN4lvDRw7gVX2ZgEHU1rKBV1K mBfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@crapouillou.net header.s=mail header.b=yH2NZdkv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l14si626429otk.225.2020.02.25.20.32.38; Tue, 25 Feb 2020 20:32:51 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@crapouillou.net header.s=mail header.b=yH2NZdkv; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726823AbgBZEbI (ORCPT + 99 others); Tue, 25 Feb 2020 23:31:08 -0500 Received: from outils.crapouillou.net ([89.234.176.41]:33852 "EHLO crapouillou.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726039AbgBZEbI (ORCPT ); Tue, 25 Feb 2020 23:31:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1582691458; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CFJ68ft8qkdRIMc6G1Srh+NvxS7BejwewDvBTrbklnA=; b=yH2NZdkvLYwaL1pCuoXsr5jU8sl0LBH8AkBUKmaWwQ0iYEm4cIHG9Qu69Kw9R6wSdKM6C5 UbVSFV28tWqRWEdWJfSEmKvmDdzmYxV/0UYDReIEM44xJ3hEOgZ1cO3XGqH6MOMUDlarJA WEd5AwmyUJJEsObeZFZ6as01HJljW3s= From: Paul Cercueil To: Daniel Vetter , David Airlie Cc: od@zcrc.me, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH v2 3/3] gpu/drm: ingenic: Add option to mmap GEM buffers cached Date: Wed, 26 Feb 2020 01:30:41 -0300 Message-Id: <20200226043041.289764-3-paul@crapouillou.net> In-Reply-To: <20200226043041.289764-1-paul@crapouillou.net> References: <20200226043041.289764-1-paul@crapouillou.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ingenic SoCs are most notably used in cheap chinese handheld gaming consoles. There, the games and applications generally render in software directly in the emulated framebuffer using SDL1. Since the emulated framebuffer is mapped as write-combine by default, these applications start to run really slow as soon as alpha-blending is used. Add a 'cached_gem_buffers' option to the ingenic-drm driver to mmap the GEM buffers as fully cached to address this issue. v2: Use standard noncoherent DMA APIs Signed-off-by: Paul Cercueil --- drivers/gpu/drm/ingenic/ingenic-drm.c | 35 +++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ingenic/ingenic-drm.c b/drivers/gpu/drm/ingenic/ingenic-drm.c index 3f8cc98d41fe..e51ac8d62d27 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm.c @@ -6,6 +6,8 @@ #include #include +#include +#include #include #include #include @@ -30,6 +32,11 @@ #include #include +static bool ingenic_drm_cached_gem_buf; +module_param_named(cached_gem_buffers, ingenic_drm_cached_gem_buf, bool, 0400); +MODULE_PARM_DESC(cached_gem_buffers, + "Enable fully cached GEM buffers [default=false]"); + #define JZ_REG_LCD_CFG 0x00 #define JZ_REG_LCD_VSYNC 0x04 #define JZ_REG_LCD_HSYNC 0x08 @@ -379,15 +386,23 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane, struct drm_plane_state *state = plane->state; unsigned int width, height, cpp; dma_addr_t addr; + uint32_t len; if (state && state->fb) { addr = drm_fb_cma_get_gem_addr(state->fb, state, 0); + width = state->src_w >> 16; height = state->src_h >> 16; cpp = state->fb->format->cpp[plane->index]; + len = width * height * cpp; + + if (ingenic_drm_cached_gem_buf) { + dma_cache_sync(priv->dev, phys_to_virt(addr), + len, DMA_TO_DEVICE); + } priv->dma_hwdesc->addr = addr; - priv->dma_hwdesc->cmd = width * height * cpp / 4; + priv->dma_hwdesc->cmd = len / 4; priv->dma_hwdesc->cmd |= JZ_LCD_CMD_EOF_IRQ; } } @@ -532,6 +547,22 @@ static void ingenic_drm_disable_vblank(struct drm_crtc *crtc) DEFINE_DRM_GEM_CMA_FOPS(ingenic_drm_fops); +static int ingenic_drm_gem_mmap(struct drm_gem_object *obj, + struct vm_area_struct *vma) +{ + struct drm_gem_cma_object *cma_obj = to_drm_gem_cma_obj(obj); + struct ingenic_drm *priv = drm_device_get_priv(obj->dev); + unsigned long attrs = DMA_ATTR_NON_CONSISTENT; + + if (!ingenic_drm_cached_gem_buf) + return drm_gem_cma_prime_mmap(obj, vma); + + vma->vm_page_prot = dma_pgprot(priv->dev, vma->vm_page_prot, attrs); + + return dma_mmap_attrs(priv->dev, vma, cma_obj->vaddr, cma_obj->paddr, + vma->vm_end - vma->vm_start, attrs); +} + static struct drm_driver ingenic_drm_driver_data = { .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .name = "ingenic-drm", @@ -553,7 +584,7 @@ static struct drm_driver ingenic_drm_driver_data = { .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, .gem_prime_vmap = drm_gem_cma_prime_vmap, .gem_prime_vunmap = drm_gem_cma_prime_vunmap, - .gem_prime_mmap = drm_gem_cma_prime_mmap, + .gem_prime_mmap = ingenic_drm_gem_mmap, .irq_handler = ingenic_drm_irq_handler, .release = ingenic_drm_release, -- 2.25.0