From patchwork Wed May 2 13:47:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 134832 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp709410lji; Wed, 2 May 2018 06:47:30 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrxgbAOjkAju6Hd040y1wvC1jncjG2O7syjaKlEUrJjpRc60boL2eFOVD2+7NTj9NW5G7J+ X-Received: by 2002:a17:902:595e:: with SMTP id e30-v6mr20032567plj.233.1525268850378; Wed, 02 May 2018 06:47:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525268850; cv=none; d=google.com; s=arc-20160816; b=bkgaoRuRjsVu07s5XrMagln2uTsT3Wb6P9JGoS0LU+1DBKm48ef90MBRVjY8tEIAtu DSbvr7vNCA22oQCjbdGbSi63VJzJNgx3xnzJoLqY4rFf1CiT9VPHWXSUmnuUEQSSbaNi AZuqc6APZlKrgR8tnMKH0j4NGIb633VFyIoBd/GhJuNgvw+1xeIS/BXwepolUTeCu9zD 5TfDf6KrjvfjM14cJrWh7yzATajKwrnyszmFu9mKcpYiAha7qQySfLc6XvucCSXwDW8b DgPLxJw+PDiCTDA8/YMomxM7DAHi1k4upKdSr+0Vib7DX5HVxG6JYIXpiLnQyNn2TYD+ l6yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=JGn5F2+Dt76OFlpQk56WT2tW28X3EEWLapr1JZbLaCs=; b=Q8KInayRc2bo3fnAC83GSnfYMoJsncfspjgPxzX0j0iMWvJHkEZGP5njCOyvTgHaRR Jc6vaP0gGOA9oLpT1Mk6epRSjvVpIuvcFWRYg1Mmxf4hy6aLMi9X2LfyJoVG8yU3ITXp 5mCuJBeBjuSdxXQcO34mFpMnThhqTOjc4Y69HCSotfeW6+riyw2Td9jwrPgIv6/6JnB8 J27ZdT/w1R0kaFt/q9dqgatZJtqwdra0aVLTcQ4GoRKXgS7WKPqr33tsqHHlL7D0lw4d hE2jJyTsTaXu87DGDCNCJHo8kuNXACo8K4JoUXfTYg8HhA94zGPzd9czrdhzIGaeQUmk Nnwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kxlL9kLL; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id v123si11762118pfc.273.2018.05.02.06.47.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 May 2018 06:47:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=kxlL9kLL; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D0B16E451; Wed, 2 May 2018 13:47:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 85C5C6E429 for ; Wed, 2 May 2018 13:47:26 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id m18-v6so20960895lfb.0 for ; Wed, 02 May 2018 06:47:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k8+010IrqxlANpccBuVBN9HVgZDR762dViJe0zVEUs4=; b=kxlL9kLL7SRQ7GUvwXm2TjHWYIQ8RxlJVB+sFgKKToJXyGNUnfJ12sDRICh2LuTAhR vLY3Trs7OHLig0garj8fvxwhIrT57KwS5NaJJOpBLgqn/gMPquLczak0Bl8sL5k3KxTi iMNQsczHCsC4M+ViSK9yIwUkbgrLHmCCF0X0M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k8+010IrqxlANpccBuVBN9HVgZDR762dViJe0zVEUs4=; b=ntxw4YF6ou2SXyJSYS+YqU4IpbV/qkU+RrSJQO7YqFu3QaPon/IWHEuorzxDTzvEOw OuPi42s/0WXmFHvu3gxw9Ar0tNRztyU0moD1oi+sxtIGfm8msEO4i5XI5dBFZHpufjPY nph0zT8yQB4Dwt8IluwyTYg79VdhcfQopX1pbn9ZPAQdVH6mwZblU90u/C0DwBRJALFB 84Omuegf/pwr0SogmaHyMpVAp6FLDp3cgGjD8fTfoqKXz31fRKDus6ZhfV43WEhbiNvt M/yBrEwcyGeC2WwFUqdlUTY408OSpK6U1FE54JTNxLbj/Z9djU+qcLzo43bFxO3x3WRZ f2kA== X-Gm-Message-State: ALQs6tBqKnyTaUIoveaxTDNsBWdTwjfD7DnuegZGnPoOaGU9/rg6Oxrk 55uT+Bqqs3SxzDCUFYMmZZfEVA== X-Received: by 2002:a19:6a10:: with SMTP id u16-v6mr10586889lfu.77.1525268844900; Wed, 02 May 2018 06:47:24 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id p133-v6sm2408484lfd.44.2018.05.02.06.47.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 May 2018 06:47:24 -0700 (PDT) From: Linus Walleij To: Gustavo Padovan , Maarten Lankhorst , Sean Paul , Eric Anholt , Liviu Dudau Subject: [PATCH 2/2 v5] drm/pl111: Enable device-specific assigned memory Date: Wed, 2 May 2018 15:47:19 +0200 Message-Id: <20180502134719.8388-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180502134719.8388-1-linus.walleij@linaro.org> References: <20180502134719.8388-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mali DP Maintainers , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The Versatile Express has 8 MB of dedicated video RAM (VRAM) on the motherboard, which is what we should be using for the PL111 if available. On this platform, the memory backplane is constructed so that only this memory will work properly with the CLCD on the motherboard, using any other memory area just gives random snow on the display. The CA9 Versatile Express also has a PL111 instance on its core tile that can address all memory, and this does not have the restriction. The memory is assigned to the device using the memory-region device tree property and a "shared-dma-pool" reserved memory pool like this: reserved-memory { #address-cells = <1>; #size-cells = <1>; ranges; vram: vram@48000000 { compatible = "shared-dma-pool"; reg = <0x48000000 0x00800000>; no-map; }; }; clcd@1f000 { compatible = "arm,pl111", "arm,primecell"; (...) memory-region = <&vram>; }ยท; Cc: Liviu Dudau Cc: Mali DP Maintainers Reviewed-by: Eric Anholt Tested-by: Robin Murphy Signed-off-by: Linus Walleij --- ChangeLog v4->v5: - Collect Robin's Tested-by ChangeLog v4->v5: - Make the GEM sg import function static. ChangeLog v3->v4: - Collect Eric's review-tag. ChangeLog v2->v3: - Fix error path so we uref the memory properly. - Augment the GEM buffer import to return an error pointer if we try to import a buffer when using device-assigned memory: we can only scan out the special memory and the GEM buffers are not copied but referenced by pointer. ChangeLog v1->v2: - Make sure to also call of_reserved_mem_device_release() at remove() and errorpath. --- drivers/gpu/drm/pl111/pl111_drm.h | 1 + drivers/gpu/drm/pl111/pl111_drv.c | 34 +++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/pl111/pl111_drm.h b/drivers/gpu/drm/pl111/pl111_drm.h index 8639b2d4ddf7..ce4501d0ab48 100644 --- a/drivers/gpu/drm/pl111/pl111_drm.h +++ b/drivers/gpu/drm/pl111/pl111_drm.h @@ -79,6 +79,7 @@ struct pl111_drm_dev_private { const struct pl111_variant_data *variant; void (*variant_display_enable) (struct drm_device *drm, u32 format); void (*variant_display_disable) (struct drm_device *drm); + bool use_device_memory; }; int pl111_display_init(struct drm_device *dev); diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index 4621259d5387..454ff0804642 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -60,6 +60,7 @@ #include #include #include +#include #include #include @@ -207,6 +208,24 @@ static int pl111_modeset_init(struct drm_device *dev) return ret; } +static struct drm_gem_object * +pl111_gem_import_sg_table(struct drm_device *dev, + struct dma_buf_attachment *attach, + struct sg_table *sgt) +{ + struct pl111_drm_dev_private *priv = dev->dev_private; + + /* + * When using device-specific reserved memory we can't import + * DMA buffers: those are passed by reference in any global + * memory and we can only handle a specific range of memory. + */ + if (priv->use_device_memory) + return ERR_PTR(-EINVAL); + + return drm_gem_cma_prime_import_sg_table(dev, attach, sgt); +} + DEFINE_DRM_GEM_CMA_FOPS(drm_fops); static struct drm_driver pl111_drm_driver = { @@ -227,7 +246,7 @@ static struct drm_driver pl111_drm_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = drm_gem_prime_import, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, + .gem_prime_import_sg_table = pl111_gem_import_sg_table, .gem_prime_export = drm_gem_prime_export, .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, @@ -257,6 +276,12 @@ static int pl111_amba_probe(struct amba_device *amba_dev, drm->dev_private = priv; priv->variant = variant; + ret = of_reserved_mem_device_init(dev); + if (!ret) { + dev_info(dev, "using device-specific reserved memory\n"); + priv->use_device_memory = true; + } + if (of_property_read_u32(dev->of_node, "max-memory-bandwidth", &priv->memory_bw)) { dev_info(dev, "no max memory bandwidth specified, assume unlimited\n"); @@ -275,7 +300,8 @@ static int pl111_amba_probe(struct amba_device *amba_dev, priv->regs = devm_ioremap_resource(dev, &amba_dev->res); if (IS_ERR(priv->regs)) { dev_err(dev, "%s failed mmio\n", __func__); - return PTR_ERR(priv->regs); + ret = PTR_ERR(priv->regs); + goto dev_unref; } /* This may override some variant settings */ @@ -305,11 +331,14 @@ static int pl111_amba_probe(struct amba_device *amba_dev, dev_unref: drm_dev_unref(drm); + of_reserved_mem_device_release(dev); + return ret; } static int pl111_amba_remove(struct amba_device *amba_dev) { + struct device *dev = &amba_dev->dev; struct drm_device *drm = amba_get_drvdata(amba_dev); struct pl111_drm_dev_private *priv = drm->dev_private; @@ -319,6 +348,7 @@ static int pl111_amba_remove(struct amba_device *amba_dev) drm_panel_bridge_remove(priv->bridge); drm_mode_config_cleanup(drm); drm_dev_unref(drm); + of_reserved_mem_device_release(dev); return 0; }