From patchwork Mon Oct 21 21:45:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 177135 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3977293ill; Mon, 21 Oct 2019 14:45:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqwiX+QtorOE6w8q/MXVp/oMBPC5vJYoeuBg5TpBcatPPQcByk+brwYCdJ4K85pix88258DU X-Received: by 2002:aa7:8b02:: with SMTP id f2mr241237pfd.31.1571694356752; Mon, 21 Oct 2019 14:45:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571694356; cv=none; d=google.com; s=arc-20160816; b=uPNjuIPSpX8SnR2/pVgFC+QddngBulku5mLNO8IcpSGi8fzDaGHA1yxCBu5d3NMn+9 TpFJjMIKIKCWBOGvkWD6L/vpV+FechjZP0P+W082b3aETxE22lDFl2dszOKfuJ7cn18s gpb3MeD/OK5NJUmARepb9xHx0LiIeJ6YeisP0fJAg37UExNzBalfPAkkrWGyyFkj1Yvr Zb0edGNYpCvimPA//zhilvbXDsfF/6UAykPLTkWkbil33jWhKDnRYVHnW0NZHEZ5y6Hk JhgNtMOWcWVLJIKHNS/x98rB+3jDZT8iUtQugDTpAaESDo4kV2tlMfShwvDgz3B/j6hw Ugmw== 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:message-id:date:subject:to:from :delivered-to; bh=PUuj+OAxVOC1LjoXkfD99C2BZx7A39utpcFfHAd7QqA=; b=p14t02UyFSaYY2lZ0tLneESDnDWK0j58QWqHM1SKriBWi0vV0yHHZUC5104fz7WKkf Lo7MXLEHFecw2Tv06uUyxPgA+fG62yKcRiQaPhQm2+1qr/yLBNmHTLH04BamDsEOSPcl EwEYJMNy6rlbQmKHeOHPUXhhWj+HZ12dqEyf/87X0ZbecG0ZPe7CyMtrmufJVfxzx8c2 6eIT0poC8bfQO1zK2QPICfMy8ly6rYTSkPF6yIpHPygoi6sOIA7KiCsnNAj+fdDt2ObD MM6zvJ/eAmDu9tPqo7y+3I91x0OBZaHY1tBuG9zH+9X5TvVlAihnfaaZiWEL6DvV5PRr pyVw== ARC-Authentication-Results: i=1; mx.google.com; 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=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id i12si15417269plt.389.2019.10.21.14.45.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Oct 2019 14:45:56 -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; 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=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D1CF489DBA; Mon, 21 Oct 2019 21:45:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ot1-f67.google.com (mail-ot1-f67.google.com [209.85.210.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id 633E089DBA for ; Mon, 21 Oct 2019 21:45:54 +0000 (UTC) Received: by mail-ot1-f67.google.com with SMTP id e11so12373449otl.5 for ; Mon, 21 Oct 2019 14:45:54 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=nqe5QILtIpNsEaGhkK4nGkXs8zLkefJgCA+oa+2s7ok=; b=YNSjsNu2CCWUm/jfFupocfFhnEQ9BqQzE92yd8ltW7LnNQU/biaNAjW6TkvadOUEXc g0M9qLPb8R1x94Fl7hUIkq3EcUz3RiBRbWiR+cJFh5y9Y15LUPzmZd0wD2/6hxCJT06S AP8pryQqy7b5iuYJqFBVUvn53nRyFR+1mBvv0336a75ghVe/dMCZoiuPOs0LU+cFgRuE B6lIUTy3PgQ/ptEKF/D7weklQHBuEHKyOiZuw/4lHuc2ge74SnC9S9iGz4Qt3/PPQamq ZTXon4H/CY8R2kFCQCPiqC0APh7YA0Vza7l6JhX5xczpFu4MdtXPWZ0kk1xTgDthZC9L mbTQ== X-Gm-Message-State: APjAAAU/HSryD6M1aSYhaQh09opESz/S8r5oi3J1MMK28MoiIVt2vBWh 0UFblHMM1p9muK/kwsv9iYhhPck= X-Received: by 2002:a9d:3df7:: with SMTP id l110mr40031otc.245.1571694353132; Mon, 21 Oct 2019 14:45:53 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id u130sm4122676oib.56.2019.10.21.14.45.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 14:45:52 -0700 (PDT) From: Rob Herring To: dri-devel@lists.freedesktop.org Subject: [PATCH 0/6] drm: Support CMA per allocation kernel mappings Date: Mon, 21 Oct 2019 16:45:44 -0500 Message-Id: <20191021214550.1461-1-robh@kernel.org> X-Mailer: git-send-email 2.20.1 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: Neil Armstrong , David Airlie , Liviu Dudau , Laurent Pinchart , Yannick Fertre , Kevin Hilman , Xinwei Kong , Xinliang Liu , linux-rockchip@lists.infradead.org, Chen-Yu Tsai , Kieran Bingham , "James \(Qian\) Wang" , Alexandre Torgue , Chen Feng , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Philippe Cornu , Vincent Abriou , Maxime Coquelin , Rongrong Zou Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This series adds support for CMA/DMA users to skip kernel mappings for GEM allocations. The DMA API only guarantees a kernel mapping at allocation time. Creating mappings with vmap() after allocation may or may not work as not all allocations have a struct page. As virtual memory space is limited on 32-bit systems some drivers will skip kernel mappings when possible. This prevents those drivers from using CMA helpers and the generic fbdev emulation which results in a lot of duplicated code. In order to distinguish between kernel and userspace allocations, a new flag, DRM_MODE_DUMB_KERNEL_MAP, for drm_mode_create_dumb() is introduced. This allows drivers to override the default behavior for CMA helpers of always creating a kernel mapping. Mediatek is converted to CMA helpers and Rockchip is converted to generic fbdev support. I also have patches to convert Rockchip to CMA and shmem helpers, but they need a bit more work. Exynos can also probably be converted to use CMA helpers. Compile tested only. I did test fbdev on Rockchip, but the h/w I have has an IOMMU, so the CMA code path doesn't get tested. Rob Rob Herring (6): drm/kirin: Use DRM_GEM_CMA_VMAP_DRIVER_OPS drm: Introduce DRM_MODE_DUMB_KERNEL_MAP flag drm/cma-helper: Use the dma_*_attr API variant drm/cma-helper: Support DRM_MODE_DUMB_KERNEL_MAP flag drm/mediatek: Convert to use CMA helpers drm/rockchip: Convert to use generic fbdev emulation .../gpu/drm/arm/display/komeda/komeda_kms.c | 1 + drivers/gpu/drm/arm/malidp_drv.c | 1 + drivers/gpu/drm/drm_client.c | 1 + drivers/gpu/drm/drm_dumb_buffers.c | 5 +- drivers/gpu/drm/drm_gem_cma_helper.c | 68 +++-- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 11 +- drivers/gpu/drm/mediatek/Makefile | 1 - drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 28 +- drivers/gpu/drm/mediatek/mtk_drm_fb.c | 1 - drivers/gpu/drm/mediatek/mtk_drm_gem.c | 289 ------------------ drivers/gpu/drm/mediatek/mtk_drm_gem.h | 51 ---- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 7 +- drivers/gpu/drm/meson/meson_drv.c | 1 + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 1 + drivers/gpu/drm/rockchip/Makefile | 1 - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 10 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 - drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 14 - drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 6 - drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 170 ----------- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h | 24 -- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 6 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 4 - drivers/gpu/drm/stm/drv.c | 1 + drivers/gpu/drm/sun4i/sun4i_drv.c | 1 + include/drm/drm_gem_cma_helper.h | 1 + include/uapi/drm/drm_mode.h | 2 + 28 files changed, 78 insertions(+), 632 deletions(-) delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.c delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.h delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c delete mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.h --- 2.20.1