Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp3877622ybv; Sun, 16 Feb 2020 07:59:48 -0800 (PST) X-Google-Smtp-Source: APXvYqz/MNzpofQU/zxj6RUwqvcs6KWVCr+1CoeCzucm3MK7IOKW/QIxcTzSM1HQMW0XP3C5P/r2 X-Received: by 2002:a9d:7304:: with SMTP id e4mr8554949otk.99.1581868788151; Sun, 16 Feb 2020 07:59:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581868788; cv=none; d=google.com; s=arc-20160816; b=JhDDncyNmJJQExv46mf2X2CASjESL/0Tq/A++KUdvhRNrgdpP+BVHwpEb2gSBG6VkF cnC3mnXkYHAG4HHduXy9rW8L9SaauCtPs8SxYeAhJmST0VrjPFhV7X9MSU1+bTy0WShH DLF2gcmEm0eP+XsI1cdsTHMBUi+IIf5EWJZwGHljbi3RLqbgYkwLd5hKKvHozNYM10f8 fCM7EWcEcvPJ6CViydb/VkcoyreOr5xAhjnT1Ao3HjMqETWtIz8XYObGt9bAU8qBjBCI Fiac7OGXRrQexwuzENLmv5T2zGPxfgVPuLTc0U7KNXEV5KKG65czA6CIfdwovaN2x9MA dFqQ== 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=hWPKAL7VcHZ83Yyg4q/gc+lgP9ejC9vw1JF+fldF7vg=; b=Wjj9OJmCWR56mxTHN9IY/rNIU8IYx0nrMxr7mYvy+5xEEIWPrXE2Ci6hK/LBZvsWyN AMBOVR9XyB8i5XfdPvqC5zk1Wv0z5bJja2rWYPLgtkPknRbJOJiDTYVasWkOajCa6Sli WPshW5JGmc5exOY0YZB/cPm3ApnW75DRcCe0TcO8rGjSkgP0EZ6c3pcIz8Nx/2lWJbrA GKm8Mc7sHy4t1TlGzLSTJDNKTIK76Wq4Rz1b1fzm5I5vYp8HFFbdl49FddhoHxhfGNPe yPPz5U+Vr5xfNGfghJ7jjuMfT9Puql2+UzLw8vMD+R2paHEwXWuwMnl/n3zC3+ruf6lm fS+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@crapouillou.net header.s=mail header.b=mSQz1x2z; 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 m24si6077260otk.239.2020.02.16.07.59.36; Sun, 16 Feb 2020 07:59:48 -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=mSQz1x2z; 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 S1728429AbgBPP6s (ORCPT + 99 others); Sun, 16 Feb 2020 10:58:48 -0500 Received: from outils.crapouillou.net ([89.234.176.41]:46088 "EHLO crapouillou.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728423AbgBPP6r (ORCPT ); Sun, 16 Feb 2020 10:58:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1581868716; 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=hWPKAL7VcHZ83Yyg4q/gc+lgP9ejC9vw1JF+fldF7vg=; b=mSQz1x2zNZR9tW3vDl2l/CW/QWQGhWT9kP0iAPvo5LjtrZkvO4BOzyIgyisyq4csCYqTFW fyEC600I1QLJQ+TUIElJEFv3ty6gXotRMGKPGBZZeOXAa6jm6ROwnNgyt8JuSzKT9BL9v7 gFbEK+iRhmRsTxEoZDeJnjVzNV4lZyw= From: Paul Cercueil To: David Airlie , Daniel Vetter Cc: od@zcrc.me, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH 3/3] gpu/drm: ingenic: Add option to mmap GEM buffers cached Date: Sun, 16 Feb 2020 12:58:11 -0300 Message-Id: <20200216155811.68463-3-paul@crapouillou.net> In-Reply-To: <20200216155811.68463-1-paul@crapouillou.net> References: <20200216155811.68463-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. Signed-off-by: Paul Cercueil --- drivers/gpu/drm/ingenic/ingenic-drm.c | 41 +++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ingenic/ingenic-drm.c b/drivers/gpu/drm/ingenic/ingenic-drm.c index 9aa88fabbd2a..31f0346b55f0 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -30,6 +31,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 @@ -378,16 +384,25 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane, struct ingenic_drm *priv = drm_plane_get_priv(plane); struct drm_plane_state *state = plane->state; unsigned int width, height, cpp; + unsigned long virt_addr; 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) { + virt_addr = (unsigned long)phys_to_virt(addr); + dma_cache_wback_inv(virt_addr, len); + } 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; } } @@ -533,6 +548,28 @@ 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) +{ + unsigned long start, off; + + if (!ingenic_drm_cached_gem_buf) + return drm_gem_cma_prime_mmap(obj, vma); + + off = vma->vm_pgoff << PAGE_SHIFT; + start = to_drm_gem_cma_obj(obj)->paddr; + + off += start; + + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); + pgprot_val(vma->vm_page_prot) &= ~_CACHE_MASK; + pgprot_val(vma->vm_page_prot) |= _CACHE_CACHABLE_NONCOHERENT; + + return io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT, + vma->vm_end - vma->vm_start, + vma->vm_page_prot); +} + static struct drm_driver ingenic_drm_driver_data = { .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .name = "ingenic-drm", @@ -554,7 +591,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