* [PATCH 2/3] gpu/drm: ingenic: Switch emulated fbdev to 16bpp
2020-02-16 15:58 [PATCH 1/3] gpu/drm: ingenic: Add trick to support 16bpp on 24-bit panels Paul Cercueil
@ 2020-02-16 15:58 ` Paul Cercueil
2020-02-17 9:30 ` Daniel Vetter
2020-02-16 15:58 ` [PATCH 3/3] gpu/drm: ingenic: Add option to mmap GEM buffers cached Paul Cercueil
1 sibling, 1 reply; 4+ messages in thread
From: Paul Cercueil @ 2020-02-16 15:58 UTC (permalink / raw)
To: David Airlie, Daniel Vetter; +Cc: od, dri-devel, linux-kernel, Paul Cercueil
The fbdev emulation is only ever used on Ingenic SoCs to run old SDL1
based games at 16bpp (rgb565). Recent applications generally talk to
DRM directly, and can request their favourite pixel format; so we can
make everybody happy by switching the emulated fbdev to 16bpp.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/gpu/drm/ingenic/ingenic-drm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm.c b/drivers/gpu/drm/ingenic/ingenic-drm.c
index 034961a40e98..9aa88fabbd2a 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm.c
@@ -808,7 +808,7 @@ static int ingenic_drm_probe(struct platform_device *pdev)
goto err_devclk_disable;
}
- ret = drm_fbdev_generic_setup(drm, 32);
+ ret = drm_fbdev_generic_setup(drm, 16);
if (ret)
dev_warn(dev, "Unable to start fbdev emulation: %i", ret);
--
2.25.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/3] gpu/drm: ingenic: Add option to mmap GEM buffers cached
2020-02-16 15:58 [PATCH 1/3] gpu/drm: ingenic: Add trick to support 16bpp on 24-bit panels Paul Cercueil
2020-02-16 15:58 ` [PATCH 2/3] gpu/drm: ingenic: Switch emulated fbdev to 16bpp Paul Cercueil
@ 2020-02-16 15:58 ` Paul Cercueil
1 sibling, 0 replies; 4+ messages in thread
From: Paul Cercueil @ 2020-02-16 15:58 UTC (permalink / raw)
To: David Airlie, Daniel Vetter; +Cc: od, dri-devel, linux-kernel, Paul Cercueil
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 <paul@crapouillou.net>
---
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 <linux/clk.h>
#include <linux/dma-mapping.h>
+#include <linux/io.h>
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
@@ -30,6 +31,11 @@
#include <drm/drm_probe_helper.h>
#include <drm/drm_vblank.h>
+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
^ permalink raw reply [flat|nested] 4+ messages in thread