From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26461C19F2C for ; Tue, 2 Aug 2022 15:37:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229596AbiHBPhn (ORCPT ); Tue, 2 Aug 2022 11:37:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229460AbiHBPhh (ORCPT ); Tue, 2 Aug 2022 11:37:37 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 84A0C10FEA for ; Tue, 2 Aug 2022 08:37:33 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F05E81684 for ; Tue, 2 Aug 2022 08:37:33 -0700 (PDT) Received: from e110455-lin.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9D5373F70D for ; Tue, 2 Aug 2022 08:37:32 -0700 (PDT) Date: Tue, 2 Aug 2022 16:37:20 +0100 From: Liviu Dudau To: Danilo Krummrich Cc: daniel@ffwll.ch, laurent.pinchart@ideasonboard.com, airlied@linux.ie, tzimmermann@suse.de, mripard@kernel.org, sam@ravnborg.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH drm-misc-next v7 3/5] drm/gem: rename GEM CMA helpers to GEM DMA helpers Message-ID: References: <20220802000405.949236-1-dakr@redhat.com> <20220802000405.949236-4-dakr@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220802000405.949236-4-dakr@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 02, 2022 at 02:04:03AM +0200, Danilo Krummrich wrote: > Rename "GEM CMA" helpers to "GEM DMA" helpers - considering the > hierarchy of APIs (mm/cma -> dma -> gem dma) calling them "GEM > DMA" seems to be more applicable. > > Besides that, commit e57924d4ae80 ("drm/doc: Task to rename CMA helpers") > requests to rename the CMA helpers and implies that people seem to be > confused about the naming. > > In order to do this renaming the following script was used: > > ``` > #!/bin/bash > > DIRS="drivers/gpu include/drm Documentation/gpu" > > REGEX_SYM_UPPER="[0-9A-Z_\-]" > REGEX_SYM_LOWER="[0-9a-z_\-]" > > REGEX_GREP_UPPER="(${REGEX_SYM_UPPER}*)(GEM)_CMA_(${REGEX_SYM_UPPER}*)" > REGEX_GREP_LOWER="(${REGEX_SYM_LOWER}*)(gem)_cma_(${REGEX_SYM_LOWER}*)" > > REGEX_SED_UPPER="s/${REGEX_GREP_UPPER}/\1\2_DMA_\3/g" > REGEX_SED_LOWER="s/${REGEX_GREP_LOWER}/\1\2_dma_\3/g" > > # Find all upper case 'CMA' symbols and replace them with 'DMA'. > for ff in $(grep -REHl "${REGEX_GREP_UPPER}" $DIRS) > do > sed -i -E "$REGEX_SED_UPPER" $ff > done > > # Find all lower case 'cma' symbols and replace them with 'dma'. > for ff in $(grep -REHl "${REGEX_GREP_LOWER}" $DIRS) > do > sed -i -E "$REGEX_SED_LOWER" $ff > done > > # Replace all occurrences of 'CMA' / 'cma' in comments and > # documentation files with 'DMA' / 'dma'. > for ff in $(grep -RiHl " cma " $DIRS) > do > sed -i -E "s/ cma / dma /g" $ff > sed -i -E "s/ CMA / DMA /g" $ff > done > > # Rename all 'cma_obj's to 'dma_obj'. > for ff in $(grep -RiHl "cma_obj" $DIRS) > do > sed -i -E "s/cma_obj/dma_obj/g" $ff > done > ``` > > Only a few more manual modifications were needed, e.g. reverting the > following modifications in some DRM Kconfig files > > - select CMA if HAVE_DMA_CONTIGUOUS > + select DMA if HAVE_DMA_CONTIGUOUS > > as well as manually picking the occurrences of 'CMA'/'cma' in comments and > documentation which relate to "GEM CMA", but not "FB CMA". > > Also drivers/gpu/drm/Makefile was fixed up manually after renaming > drm_gem_cma_helper.c to drm_gem_dma_helper.c. > > This patch is compile-time tested building a x86_64 kernel with > `make allyesconfig && make drivers/gpu/drm`. > > Acked-by: Sam Ravnborg > Acked-by: Thomas Zimmermann > Reviewed-by: Laurent Pinchart > Signed-off-by: Danilo Krummrich > --- > Documentation/gpu/drm-mm.rst | 16 +- > drivers/gpu/drm/Kconfig | 4 +- > drivers/gpu/drm/Makefile | 6 +- > drivers/gpu/drm/arm/Kconfig | 4 +- > drivers/gpu/drm/arm/display/Kconfig | 2 +- > .../arm/display/komeda/komeda_framebuffer.c | 6 +- > .../gpu/drm/arm/display/komeda/komeda_kms.c | 10 +- > drivers/gpu/drm/arm/hdlcd_crtc.c | 2 +- > drivers/gpu/drm/arm/hdlcd_drv.c | 6 +- > drivers/gpu/drm/arm/malidp_drv.c | 8 +- > drivers/gpu/drm/arm/malidp_mw.c | 4 +- > drivers/gpu/drm/arm/malidp_planes.c | 16 +- > drivers/gpu/drm/armada/armada_gem.c | 6 +- > drivers/gpu/drm/aspeed/Kconfig | 2 +- > drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 4 +- > drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 6 +- > drivers/gpu/drm/atmel-hlcdc/Kconfig | 2 +- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 6 +- > .../gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 4 +- > drivers/gpu/drm/drm_fb_dma_helper.c | 20 +- > drivers/gpu/drm/drm_file.c | 2 +- > ..._gem_cma_helper.c => drm_gem_dma_helper.c} | 297 +++++++++--------- > drivers/gpu/drm/drm_mipi_dbi.c | 2 +- > drivers/gpu/drm/fsl-dcu/Kconfig | 2 +- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 6 +- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 4 +- > drivers/gpu/drm/hisilicon/kirin/Kconfig | 2 +- > .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 8 +- > .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- > drivers/gpu/drm/imx/Kconfig | 2 +- > drivers/gpu/drm/imx/dcss/Kconfig | 2 +- > drivers/gpu/drm/imx/dcss/dcss-kms.c | 6 +- > drivers/gpu/drm/imx/dcss/dcss-plane.c | 16 +- > drivers/gpu/drm/imx/imx-drm-core.c | 8 +- > drivers/gpu/drm/imx/imx-drm.h | 2 +- > drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- > drivers/gpu/drm/imx/ipuv3-plane.c | 26 +- > drivers/gpu/drm/ingenic/Kconfig | 2 +- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 8 +- > drivers/gpu/drm/ingenic/ingenic-ipu.c | 2 +- > drivers/gpu/drm/kmb/Kconfig | 2 +- > drivers/gpu/drm/kmb/kmb_drv.c | 6 +- > drivers/gpu/drm/kmb/kmb_plane.c | 2 +- > drivers/gpu/drm/logicvc/Kconfig | 2 +- > drivers/gpu/drm/logicvc/logicvc_crtc.c | 2 +- > drivers/gpu/drm/logicvc/logicvc_drm.c | 10 +- > drivers/gpu/drm/logicvc/logicvc_interface.c | 2 +- > drivers/gpu/drm/logicvc/logicvc_mode.c | 2 +- > drivers/gpu/drm/mcde/Kconfig | 2 +- > drivers/gpu/drm/mcde/mcde_display.c | 2 +- > drivers/gpu/drm/mcde/mcde_drv.c | 6 +- > drivers/gpu/drm/mediatek/Kconfig | 2 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- > drivers/gpu/drm/mediatek/mtk_drm_gem.c | 4 +- > drivers/gpu/drm/meson/Kconfig | 2 +- > drivers/gpu/drm/meson/meson_drv.c | 10 +- > drivers/gpu/drm/meson/meson_overlay.c | 4 +- > drivers/gpu/drm/meson/meson_plane.c | 4 +- > drivers/gpu/drm/msm/msm_drv.c | 2 +- > drivers/gpu/drm/mxsfb/Kconfig | 4 +- > drivers/gpu/drm/mxsfb/lcdif_drv.c | 6 +- > drivers/gpu/drm/mxsfb/lcdif_kms.c | 2 +- > drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +- > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 2 +- > drivers/gpu/drm/panel/Kconfig | 2 +- > drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 6 +- > drivers/gpu/drm/pl111/Kconfig | 2 +- > drivers/gpu/drm/pl111/pl111_display.c | 2 +- > drivers/gpu/drm/pl111/pl111_drv.c | 8 +- > drivers/gpu/drm/rcar-du/Kconfig | 2 +- > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 +- > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 4 +- > drivers/gpu/drm/rcar-du/rcar_du_kms.c | 36 +-- > drivers/gpu/drm/rcar-du/rcar_du_plane.c | 4 +- > drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 4 +- > drivers/gpu/drm/rockchip/Kconfig | 2 +- > drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 4 +- > drivers/gpu/drm/shmobile/Kconfig | 2 +- > drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 +- > drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +- > drivers/gpu/drm/shmobile/shmob_drm_kms.c | 2 +- > drivers/gpu/drm/shmobile/shmob_drm_kms.h | 2 +- > drivers/gpu/drm/shmobile/shmob_drm_plane.c | 4 +- > drivers/gpu/drm/sprd/Kconfig | 2 +- > drivers/gpu/drm/sprd/sprd_dpu.c | 8 +- > drivers/gpu/drm/sprd/sprd_drm.c | 6 +- > drivers/gpu/drm/sti/Kconfig | 2 +- > drivers/gpu/drm/sti/sti_cursor.c | 10 +- > drivers/gpu/drm/sti/sti_drv.c | 6 +- > drivers/gpu/drm/sti/sti_gdp.c | 14 +- > drivers/gpu/drm/sti/sti_hqvdp.c | 14 +- > drivers/gpu/drm/sti/sti_plane.c | 2 +- > drivers/gpu/drm/stm/Kconfig | 2 +- > drivers/gpu/drm/stm/drv.c | 10 +- > drivers/gpu/drm/stm/ltdc.c | 2 +- > drivers/gpu/drm/sun4i/Kconfig | 2 +- > drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- > drivers/gpu/drm/sun4i/sun4i_drv.c | 8 +- > drivers/gpu/drm/sun4i/sun4i_frontend.c | 2 +- > drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- > drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 4 +- > drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 4 +- > drivers/gpu/drm/tidss/Kconfig | 2 +- > drivers/gpu/drm/tidss/tidss_crtc.c | 2 +- > drivers/gpu/drm/tidss/tidss_dispc.c | 6 +- > drivers/gpu/drm/tidss/tidss_drv.c | 6 +- > drivers/gpu/drm/tilcdc/Kconfig | 2 +- > drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 4 +- > drivers/gpu/drm/tilcdc/tilcdc_drv.c | 6 +- > drivers/gpu/drm/tiny/Kconfig | 22 +- > drivers/gpu/drm/tiny/arcpgu.c | 8 +- > drivers/gpu/drm/tiny/hx8357d.c | 6 +- > drivers/gpu/drm/tiny/ili9163.c | 6 +- > drivers/gpu/drm/tiny/ili9225.c | 10 +- > drivers/gpu/drm/tiny/ili9341.c | 6 +- > drivers/gpu/drm/tiny/ili9486.c | 6 +- > drivers/gpu/drm/tiny/mi0283qt.c | 6 +- > drivers/gpu/drm/tiny/panel-mipi-dbi.c | 6 +- > drivers/gpu/drm/tiny/repaper.c | 10 +- > drivers/gpu/drm/tiny/st7586.c | 10 +- > drivers/gpu/drm/tiny/st7735r.c | 6 +- > drivers/gpu/drm/tve200/Kconfig | 2 +- > drivers/gpu/drm/tve200/tve200_display.c | 2 +- > drivers/gpu/drm/tve200/tve200_drv.c | 6 +- > drivers/gpu/drm/v3d/v3d_gem.c | 4 +- > drivers/gpu/drm/vc4/Kconfig | 2 +- > drivers/gpu/drm/vc4/vc4_bo.c | 44 +-- > drivers/gpu/drm/vc4/vc4_crtc.c | 14 +- > drivers/gpu/drm/vc4/vc4_drv.c | 6 +- > drivers/gpu/drm/vc4/vc4_drv.h | 18 +- > drivers/gpu/drm/vc4/vc4_gem.c | 4 +- > drivers/gpu/drm/vc4/vc4_plane.c | 4 +- > drivers/gpu/drm/vc4/vc4_render_cl.c | 26 +- > drivers/gpu/drm/vc4/vc4_txp.c | 2 +- > drivers/gpu/drm/vc4/vc4_v3d.c | 4 +- > drivers/gpu/drm/vc4/vc4_validate.c | 16 +- > drivers/gpu/drm/vc4/vc4_validate_shaders.c | 2 +- > drivers/gpu/drm/xlnx/Kconfig | 2 +- > drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 8 +- > include/drm/drm_fb_dma_helper.h | 2 +- > include/drm/drm_gem.h | 2 +- > ..._gem_cma_helper.h => drm_gem_dma_helper.h} | 156 ++++----- > 143 files changed, 639 insertions(+), 642 deletions(-) > rename drivers/gpu/drm/{drm_gem_cma_helper.c => drm_gem_dma_helper.c} (62%) > rename include/drm/{drm_gem_cma_helper.h => drm_gem_dma_helper.h} (53%) > > diff --git a/Documentation/gpu/drm-mm.rst b/Documentation/gpu/drm-mm.rst > index f32ccce5722d..a79fd3549ff8 100644 > --- a/Documentation/gpu/drm-mm.rst > +++ b/Documentation/gpu/drm-mm.rst > @@ -300,12 +300,12 @@ Drivers that want to map the GEM object upfront instead of handling page > faults can implement their own mmap file operation handler. > > For platforms without MMU the GEM core provides a helper method > -drm_gem_cma_get_unmapped_area(). The mmap() routines will call this to get a > +drm_gem_dma_get_unmapped_area(). The mmap() routines will call this to get a > proposed address for the mapping. > > -To use drm_gem_cma_get_unmapped_area(), drivers must fill the struct > +To use drm_gem_dma_get_unmapped_area(), drivers must fill the struct > :c:type:`struct file_operations ` get_unmapped_area field with > -a pointer on drm_gem_cma_get_unmapped_area(). > +a pointer on drm_gem_dma_get_unmapped_area(). > > More detailed information about get_unmapped_area can be found in > Documentation/admin-guide/mm/nommu-mmap.rst > @@ -355,16 +355,16 @@ GEM Function Reference > .. kernel-doc:: drivers/gpu/drm/drm_gem.c > :export: > > -GEM CMA Helper Functions Reference > +GEM DMA Helper Functions Reference > ---------------------------------- > > -.. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c > - :doc: cma helpers > +.. kernel-doc:: drivers/gpu/drm/drm_gem_dma_helper.c > + :doc: dma helpers > > -.. kernel-doc:: include/drm/drm_gem_cma_helper.h > +.. kernel-doc:: include/drm/drm_gem_dma_helper.h > :internal: > > -.. kernel-doc:: drivers/gpu/drm/drm_gem_cma_helper.c > +.. kernel-doc:: drivers/gpu/drm/drm_gem_dma_helper.c > :export: > > GEM SHMEM Helper Function Reference > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index 1c91e1e861a5..0b2ad7212ee6 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -200,11 +200,11 @@ config DRM_TTM_HELPER > help > Helpers for ttm-based gem objects > > -config DRM_GEM_CMA_HELPER > +config DRM_GEM_DMA_HELPER > tristate > depends on DRM > help > - Choose this if you need the GEM CMA helper functions > + Choose this if you need the GEM DMA helper functions > > config DRM_GEM_SHMEM_HELPER > tristate > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > index 1d6e4f672b59..25d0ba310509 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -40,9 +40,9 @@ obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o > > obj-$(CONFIG_DRM_BUDDY) += drm_buddy.o > > -drm_cma_helper-y := drm_gem_cma_helper.o > -drm_cma_helper-$(CONFIG_DRM_KMS_HELPER) += drm_fb_dma_helper.o > -obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o > +drm_dma_helper-y := drm_gem_dma_helper.o > +drm_dma_helper-$(CONFIG_DRM_KMS_HELPER) += drm_fb_dma_helper.o > +obj-$(CONFIG_DRM_GEM_DMA_HELPER) += drm_dma_helper.o > > drm_shmem_helper-y := drm_gem_shmem_helper.o > obj-$(CONFIG_DRM_GEM_SHMEM_HELPER) += drm_shmem_helper.o > diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig > index 6e3f1d600541..c1b89274d2a4 100644 > --- a/drivers/gpu/drm/arm/Kconfig > +++ b/drivers/gpu/drm/arm/Kconfig > @@ -6,7 +6,7 @@ config DRM_HDLCD > depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST) > depends on COMMON_CLK > select DRM_KMS_HELPER > - select DRM_GEM_CMA_HELPER > + select DRM_GEM_DMA_HELPER > help > Choose this option if you have an ARM High Definition Colour LCD > controller. > @@ -27,7 +27,7 @@ config DRM_MALI_DISPLAY > depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST) > depends on COMMON_CLK > select DRM_KMS_HELPER > - select DRM_GEM_CMA_HELPER > + select DRM_GEM_DMA_HELPER > select VIDEOMODE_HELPERS > help > Choose this option if you want to compile the ARM Mali Display > diff --git a/drivers/gpu/drm/arm/display/Kconfig b/drivers/gpu/drm/arm/display/Kconfig > index e91598b60781..4acc4285a4eb 100644 > --- a/drivers/gpu/drm/arm/display/Kconfig > +++ b/drivers/gpu/drm/arm/display/Kconfig > @@ -4,7 +4,7 @@ config DRM_KOMEDA > depends on DRM && OF > depends on COMMON_CLK > select DRM_KMS_HELPER > - select DRM_GEM_CMA_HELPER > + select DRM_GEM_DMA_HELPER > select VIDEOMODE_HELPERS > help > Choose this option if you want to compile the ARM Komeda display > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c > index ea45da663dfb..f1b27db5dad5 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c > @@ -7,7 +7,7 @@ > #include > #include > #include > -#include > +#include > #include > > #include "komeda_framebuffer.h" > @@ -137,7 +137,7 @@ komeda_fb_none_afbc_size_check(struct komeda_dev *mdev, struct komeda_fb *kfb, > } > > min_size = komeda_fb_get_pixel_addr(kfb, 0, fb->height, i) > - - to_drm_gem_cma_obj(obj)->paddr; > + - to_drm_gem_dma_obj(obj)->paddr; > if (obj->size < min_size) { > DRM_DEBUG_KMS("The fb->obj[%d] size: 0x%zx lower than the minimum requirement: 0x%llx.\n", > i, obj->size, min_size); > @@ -239,7 +239,7 @@ dma_addr_t > komeda_fb_get_pixel_addr(struct komeda_fb *kfb, int x, int y, int plane) > { > struct drm_framebuffer *fb = &kfb->base; > - const struct drm_gem_cma_object *obj; > + const struct drm_gem_dma_object *obj; > u32 offset, plane_x, plane_y, block_w, block_sz; > > if (plane >= fb->format->num_planes) { > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c > index 327051bba5b6..451746ebbe71 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c > @@ -11,7 +11,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -21,9 +21,9 @@ > #include "komeda_framebuffer.h" > #include "komeda_kms.h" > > -DEFINE_DRM_GEM_CMA_FOPS(komeda_cma_fops); > +DEFINE_DRM_GEM_DMA_FOPS(komeda_cma_fops); > > -static int komeda_gem_cma_dumb_create(struct drm_file *file, > +static int komeda_gem_dma_dumb_create(struct drm_file *file, > struct drm_device *dev, > struct drm_mode_create_dumb *args) > { > @@ -32,7 +32,7 @@ static int komeda_gem_cma_dumb_create(struct drm_file *file, > > args->pitch = ALIGN(pitch, mdev->chip.bus_width); > > - return drm_gem_cma_dumb_create_internal(file, dev, args); > + return drm_gem_dma_dumb_create_internal(file, dev, args); > } > > static irqreturn_t komeda_kms_irq_handler(int irq, void *data) > @@ -60,7 +60,7 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data) > static const struct drm_driver komeda_kms_driver = { > .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, > .lastclose = drm_fb_helper_lastclose, > - DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(komeda_gem_cma_dumb_create), > + DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATE(komeda_gem_dma_dumb_create), > .fops = &komeda_cma_fops, > .name = "komeda", > .desc = "Arm Komeda Display Processor driver", > diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c > index d3cf788c0fa9..7030339fa232 100644 > --- a/drivers/gpu/drm/arm/hdlcd_crtc.c > +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c > @@ -21,7 +21,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c > index b32168e3f9ae..a032003c340c 100644 > --- a/drivers/gpu/drm/arm/hdlcd_drv.c > +++ b/drivers/gpu/drm/arm/hdlcd_drv.c > @@ -27,7 +27,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -225,11 +225,11 @@ static void hdlcd_debugfs_init(struct drm_minor *minor) > } > #endif > > -DEFINE_DRM_GEM_CMA_FOPS(fops); > +DEFINE_DRM_GEM_DMA_FOPS(fops); > > static const struct drm_driver hdlcd_driver = { > .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, > - DRM_GEM_CMA_DRIVER_OPS, > + DRM_GEM_DMA_DRIVER_OPS, > #ifdef CONFIG_DEBUG_FS > .debugfs_init = hdlcd_debugfs_init, > #endif > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c > index fa6c1a4254dc..1d0b0c54ccc7 100644 > --- a/drivers/gpu/drm/arm/malidp_drv.c > +++ b/drivers/gpu/drm/arm/malidp_drv.c > @@ -21,7 +21,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -456,7 +456,7 @@ static int malidp_irq_init(struct platform_device *pdev) > return 0; > } > > -DEFINE_DRM_GEM_CMA_FOPS(fops); > +DEFINE_DRM_GEM_DMA_FOPS(fops); > > static int malidp_dumb_create(struct drm_file *file_priv, > struct drm_device *drm, > @@ -468,7 +468,7 @@ static int malidp_dumb_create(struct drm_file *file_priv, > > args->pitch = ALIGN(DIV_ROUND_UP(args->width * args->bpp, 8), alignment); > > - return drm_gem_cma_dumb_create_internal(file_priv, drm, args); > + return drm_gem_dma_dumb_create_internal(file_priv, drm, args); > } > > #ifdef CONFIG_DEBUG_FS > @@ -565,7 +565,7 @@ static void malidp_debugfs_init(struct drm_minor *minor) > > static const struct drm_driver malidp_driver = { > .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, > - DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(malidp_dumb_create), > + DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATE(malidp_dumb_create), > #ifdef CONFIG_DEBUG_FS > .debugfs_init = malidp_debugfs_init, > #endif > diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c > index 7a9c900626ec..cefae03f1bcc 100644 > --- a/drivers/gpu/drm/arm/malidp_mw.c > +++ b/drivers/gpu/drm/arm/malidp_mw.c > @@ -13,7 +13,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > > @@ -160,7 +160,7 @@ malidp_mw_encoder_atomic_check(struct drm_encoder *encoder, > > n_planes = fb->format->num_planes; > for (i = 0; i < n_planes; i++) { > - struct drm_gem_cma_object *obj = drm_fb_dma_get_gem_obj(fb, i); > + struct drm_gem_dma_object *obj = drm_fb_dma_get_gem_obj(fb, i); > /* memory write buffers are never rotated */ > u8 alignment = malidp_hw_get_pitch_align(malidp->dev, 0); > > diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c > index 72e0162735fa..b7948ca0060c 100644 > --- a/drivers/gpu/drm/arm/malidp_planes.c > +++ b/drivers/gpu/drm/arm/malidp_planes.c > @@ -16,7 +16,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > > @@ -333,15 +333,15 @@ static bool malidp_check_pages_threshold(struct malidp_plane_state *ms, > > for (i = 0; i < ms->n_planes; i++) { > struct drm_gem_object *obj; > - struct drm_gem_cma_object *cma_obj; > + struct drm_gem_dma_object *dma_obj; > struct sg_table *sgt; > struct scatterlist *sgl; > > obj = drm_gem_fb_get_obj(ms->base.fb, i); > - cma_obj = to_drm_gem_cma_obj(obj); > + dma_obj = to_drm_gem_dma_obj(obj); > > - if (cma_obj->sgt) > - sgt = cma_obj->sgt; > + if (dma_obj->sgt) > + sgt = dma_obj->sgt; > else > sgt = obj->funcs->get_sg_table(obj); > > @@ -352,14 +352,14 @@ static bool malidp_check_pages_threshold(struct malidp_plane_state *ms, > > while (sgl) { > if (sgl->length < pgsize) { > - if (!cma_obj->sgt) > + if (!dma_obj->sgt) > kfree(sgt); > return false; > } > > sgl = sg_next(sgl); > } > - if (!cma_obj->sgt) > + if (!dma_obj->sgt) > kfree(sgt); > } > > @@ -732,7 +732,7 @@ static void malidp_set_plane_base_addr(struct drm_framebuffer *fb, > paddr = drm_fb_dma_get_gem_addr(fb, plane->state, > plane_index); > } else { > - struct drm_gem_cma_object *obj; > + struct drm_gem_dma_object *obj; > > obj = drm_fb_dma_get_gem_obj(fb, plane_index); > For the drivers/gpu/drm/arm drivers: Reviewed-by: Liviu Dudau Best regards, Liviu > diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c > index 147abf1a3968..5430265ad458 100644 > --- a/drivers/gpu/drm/armada/armada_gem.c > +++ b/drivers/gpu/drm/armada/armada_gem.c > @@ -107,11 +107,11 @@ armada_gem_linear_back(struct drm_device *dev, struct armada_gem_object *obj) > } > > /* > - * We could grab something from CMA if it's enabled, but that > + * We could grab something from DMA if it's enabled, but that > * involves building in a problem: > * > - * CMA's interface uses dma_alloc_coherent(), which provides us > - * with an CPU virtual address and a device address. > + * GEM DMA helper interface uses dma_alloc_coherent(), which provides > + * us with an CPU virtual address and a device address. > * > * The CPU virtual address may be either an address in the kernel > * direct mapped region (for example, as it would be on x86) or > diff --git a/drivers/gpu/drm/aspeed/Kconfig b/drivers/gpu/drm/aspeed/Kconfig > index 024ccab14f88..8137c39b057b 100644 > --- a/drivers/gpu/drm/aspeed/Kconfig > +++ b/drivers/gpu/drm/aspeed/Kconfig > @@ -5,7 +5,7 @@ config DRM_ASPEED_GFX > depends on (COMPILE_TEST || ARCH_ASPEED) > depends on MMU > select DRM_KMS_HELPER > - select DRM_GEM_CMA_HELPER > + select DRM_GEM_DMA_HELPER > select DMA_CMA if HAVE_DMA_CONTIGUOUS > select CMA if HAVE_DMA_CONTIGUOUS > select MFD_SYSCON > diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c b/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c > index cc4d0fa6262c..996b03bac87f 100644 > --- a/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c > +++ b/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c > @@ -11,7 +11,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -168,7 +168,7 @@ static void aspeed_gfx_pipe_update(struct drm_simple_display_pipe *pipe, > struct drm_crtc *crtc = &pipe->crtc; > struct drm_framebuffer *fb = pipe->plane.state->fb; > struct drm_pending_vblank_event *event; > - struct drm_gem_cma_object *gem; > + struct drm_gem_dma_object *gem; > > spin_lock_irq(&crtc->dev->event_lock); > event = crtc->state->event; > diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c > index 54aa8af45829..a94f1a9e8f40 100644 > --- a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c > +++ b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c > @@ -17,7 +17,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -245,11 +245,11 @@ static void aspeed_gfx_unload(struct drm_device *drm) > drm_kms_helper_poll_fini(drm); > } > > -DEFINE_DRM_GEM_CMA_FOPS(fops); > +DEFINE_DRM_GEM_DMA_FOPS(fops); > > static const struct drm_driver aspeed_gfx_driver = { > .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, > - DRM_GEM_CMA_DRIVER_OPS, > + DRM_GEM_DMA_DRIVER_OPS, > .fops = &fops, > .name = "aspeed-gfx-drm", > .desc = "ASPEED GFX DRM", > diff --git a/drivers/gpu/drm/atmel-hlcdc/Kconfig b/drivers/gpu/drm/atmel-hlcdc/Kconfig > index 8ae679f1a518..3bdbab3a6333 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/Kconfig > +++ b/drivers/gpu/drm/atmel-hlcdc/Kconfig > @@ -2,7 +2,7 @@ > config DRM_ATMEL_HLCDC > tristate "DRM Support for ATMEL HLCDC Display Controller" > depends on DRM && OF && COMMON_CLK && MFD_ATMEL_HLCDC && ARM > - select DRM_GEM_CMA_HELPER > + select DRM_GEM_DMA_HELPER > select DRM_KMS_HELPER > select DRM_PANEL > help > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > index 651e3c109360..f7e7f4e919c7 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -20,7 +20,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -730,11 +730,11 @@ static void atmel_hlcdc_dc_unload(struct drm_device *dev) > clk_disable_unprepare(dc->hlcdc->periph_clk); > } > > -DEFINE_DRM_GEM_CMA_FOPS(fops); > +DEFINE_DRM_GEM_DMA_FOPS(fops); > > static const struct drm_driver atmel_hlcdc_dc_driver = { > .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, > - DRM_GEM_CMA_DRIVER_OPS, > + DRM_GEM_DMA_DRIVER_OPS, > .fops = &fops, > .name = "atmel-hlcdc", > .desc = "Atmel HLCD Controller DRM", > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > index ddcbfe7ea0c8..48481aa2731a 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > @@ -15,7 +15,7 @@ > #include > #include > #include > -#include > +#include > > #include "atmel_hlcdc_dc.h" > > @@ -448,7 +448,7 @@ static void atmel_hlcdc_plane_update_buffers(struct atmel_hlcdc_plane *plane, > sr = atmel_hlcdc_layer_read_reg(&plane->layer, ATMEL_HLCDC_LAYER_CHSR); > > for (i = 0; i < state->nplanes; i++) { > - struct drm_gem_cma_object *gem = drm_fb_dma_get_gem_obj(fb, i); > + struct drm_gem_dma_object *gem = drm_fb_dma_get_gem_obj(fb, i); > > state->dscrs[i]->addr = gem->paddr + state->offsets[i]; > > diff --git a/drivers/gpu/drm/drm_fb_dma_helper.c b/drivers/gpu/drm/drm_fb_dma_helper.c > index 85fd21cd9dda..b601073c22de 100644 > --- a/drivers/gpu/drm/drm_fb_dma_helper.c > +++ b/drivers/gpu/drm/drm_fb_dma_helper.c > @@ -13,7 +13,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -35,15 +35,15 @@ > */ > > /** > - * drm_fb_dma_get_gem_obj() - Get CMA GEM object for framebuffer > + * drm_fb_dma_get_gem_obj() - Get DMA GEM object for framebuffer > * @fb: The framebuffer > * @plane: Which plane > * > - * Return the CMA GEM object for given framebuffer. > + * Return the DMA GEM object for given framebuffer. > * > * This function will usually be called from the CRTC callback functions. > */ > -struct drm_gem_cma_object *drm_fb_dma_get_gem_obj(struct drm_framebuffer *fb, > +struct drm_gem_dma_object *drm_fb_dma_get_gem_obj(struct drm_framebuffer *fb, > unsigned int plane) > { > struct drm_gem_object *gem; > @@ -52,7 +52,7 @@ struct drm_gem_cma_object *drm_fb_dma_get_gem_obj(struct drm_framebuffer *fb, > if (!gem) > return NULL; > > - return to_drm_gem_cma_obj(gem); > + return to_drm_gem_dma_obj(gem); > } > EXPORT_SYMBOL_GPL(drm_fb_dma_get_gem_obj); > > @@ -71,7 +71,7 @@ dma_addr_t drm_fb_dma_get_gem_addr(struct drm_framebuffer *fb, > struct drm_plane_state *state, > unsigned int plane) > { > - struct drm_gem_cma_object *obj; > + struct drm_gem_dma_object *obj; > dma_addr_t paddr; > u8 h_div = 1, v_div = 1; > u32 block_w = drm_format_info_block_width(fb->format, plane); > @@ -113,7 +113,7 @@ EXPORT_SYMBOL_GPL(drm_fb_dma_get_gem_addr); > * @state: New plane state > * > * This function can be used by drivers that use damage clips and have > - * CMA GEM objects backed by non-coherent memory. Calling this function > + * DMA GEM objects backed by non-coherent memory. Calling this function > * in a plane's .atomic_update ensures that all the data in the backing > * memory have been written to RAM. > */ > @@ -123,15 +123,15 @@ void drm_fb_dma_sync_non_coherent(struct drm_device *drm, > { > const struct drm_format_info *finfo = state->fb->format; > struct drm_atomic_helper_damage_iter iter; > - const struct drm_gem_cma_object *cma_obj; > + const struct drm_gem_dma_object *dma_obj; > unsigned int offset, i; > struct drm_rect clip; > dma_addr_t daddr; > size_t nb_bytes; > > for (i = 0; i < finfo->num_planes; i++) { > - cma_obj = drm_fb_dma_get_gem_obj(state->fb, i); > - if (!cma_obj->map_noncoherent) > + dma_obj = drm_fb_dma_get_gem_obj(state->fb, i); > + if (!dma_obj->map_noncoherent) > continue; > > daddr = drm_fb_dma_get_gem_addr(state->fb, state, i); > diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c > index ed25168619fc..fa55c9a562f3 100644 > --- a/drivers/gpu/drm/drm_file.c > +++ b/drivers/gpu/drm/drm_file.c > @@ -131,7 +131,7 @@ bool drm_dev_needs_global_mutex(struct drm_device *dev) > * }; > * > * For plain GEM based drivers there is the DEFINE_DRM_GEM_FOPS() macro, and for > - * CMA based drivers there is the DEFINE_DRM_GEM_CMA_FOPS() macro to make this > + * DMA based drivers there is the DEFINE_DRM_GEM_DMA_FOPS() macro to make this > * simpler. > * > * The driver's &file_operations must be stored in &drm_driver.fops. > diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_dma_helper.c > similarity index 62% > rename from drivers/gpu/drm/drm_gem_cma_helper.c > rename to drivers/gpu/drm/drm_gem_dma_helper.c > index 42abee9a0f4f..f1780c01c928 100644 > --- a/drivers/gpu/drm/drm_gem_cma_helper.c > +++ b/drivers/gpu/drm/drm_gem_dma_helper.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0-or-later > /* > - * drm gem CMA (contiguous memory allocator) helper functions > + * drm gem DMA helper functions > * > * Copyright (C) 2012 Sascha Hauer, Pengutronix > * > @@ -20,20 +20,17 @@ > #include > #include > #include > -#include > +#include > #include > > /** > - * DOC: cma helpers > + * DOC: dma helpers > * > - * The DRM GEM/CMA helpers are a means to provide buffer objects that are > + * The DRM GEM/DMA helpers are a means to provide buffer objects that are > * presented to the device as a contiguous chunk of memory. This is useful > * for devices that do not support scatter-gather DMA (either directly or > * by using an intimately attached IOMMU). > * > - * Despite the name, the DRM GEM/CMA helpers are not hardwired to use the > - * Contiguous Memory Allocator (CMA). > - * > * For devices that access the memory bus through an (external) IOMMU then > * the buffer objects are allocated using a traditional page-based > * allocator and may be scattered through physical memory. However they > @@ -44,36 +41,36 @@ > * objects that are physically contiguous in memory. > * > * For GEM callback helpers in struct &drm_gem_object functions, see likewise > - * named functions with an _object_ infix (e.g., drm_gem_cma_object_vmap() wraps > - * drm_gem_cma_vmap()). These helpers perform the necessary type conversion. > + * named functions with an _object_ infix (e.g., drm_gem_dma_object_vmap() wraps > + * drm_gem_dma_vmap()). These helpers perform the necessary type conversion. > */ > > -static const struct drm_gem_object_funcs drm_gem_cma_default_funcs = { > - .free = drm_gem_cma_object_free, > - .print_info = drm_gem_cma_object_print_info, > - .get_sg_table = drm_gem_cma_object_get_sg_table, > - .vmap = drm_gem_cma_object_vmap, > - .mmap = drm_gem_cma_object_mmap, > - .vm_ops = &drm_gem_cma_vm_ops, > +static const struct drm_gem_object_funcs drm_gem_dma_default_funcs = { > + .free = drm_gem_dma_object_free, > + .print_info = drm_gem_dma_object_print_info, > + .get_sg_table = drm_gem_dma_object_get_sg_table, > + .vmap = drm_gem_dma_object_vmap, > + .mmap = drm_gem_dma_object_mmap, > + .vm_ops = &drm_gem_dma_vm_ops, > }; > > /** > - * __drm_gem_cma_create - Create a GEM CMA object without allocating memory > + * __drm_gem_dma_create - Create a GEM DMA object without allocating memory > * @drm: DRM device > * @size: size of the object to allocate > * @private: true if used for internal purposes > * > - * This function creates and initializes a GEM CMA object of the given size, > + * This function creates and initializes a GEM DMA object of the given size, > * but doesn't allocate any memory to back the object. > * > * Returns: > - * A struct drm_gem_cma_object * on success or an ERR_PTR()-encoded negative > + * A struct drm_gem_dma_object * on success or an ERR_PTR()-encoded negative > * error code on failure. > */ > -static struct drm_gem_cma_object * > -__drm_gem_cma_create(struct drm_device *drm, size_t size, bool private) > +static struct drm_gem_dma_object * > +__drm_gem_dma_create(struct drm_device *drm, size_t size, bool private) > { > - struct drm_gem_cma_object *cma_obj; > + struct drm_gem_dma_object *dma_obj; > struct drm_gem_object *gem_obj; > int ret = 0; > > @@ -81,22 +78,22 @@ __drm_gem_cma_create(struct drm_device *drm, size_t size, bool private) > gem_obj = drm->driver->gem_create_object(drm, size); > if (IS_ERR(gem_obj)) > return ERR_CAST(gem_obj); > - cma_obj = to_drm_gem_cma_obj(gem_obj); > + dma_obj = to_drm_gem_dma_obj(gem_obj); > } else { > - cma_obj = kzalloc(sizeof(*cma_obj), GFP_KERNEL); > - if (!cma_obj) > + dma_obj = kzalloc(sizeof(*dma_obj), GFP_KERNEL); > + if (!dma_obj) > return ERR_PTR(-ENOMEM); > - gem_obj = &cma_obj->base; > + gem_obj = &dma_obj->base; > } > > if (!gem_obj->funcs) > - gem_obj->funcs = &drm_gem_cma_default_funcs; > + gem_obj->funcs = &drm_gem_dma_default_funcs; > > if (private) { > drm_gem_private_object_init(drm, gem_obj, size); > > /* Always use writecombine for dma-buf mappings */ > - cma_obj->map_noncoherent = false; > + dma_obj->map_noncoherent = false; > } else { > ret = drm_gem_object_init(drm, gem_obj, size); > } > @@ -109,19 +106,19 @@ __drm_gem_cma_create(struct drm_device *drm, size_t size, bool private) > goto error; > } > > - return cma_obj; > + return dma_obj; > > error: > - kfree(cma_obj); > + kfree(dma_obj); > return ERR_PTR(ret); > } > > /** > - * drm_gem_cma_create - allocate an object with the given size > + * drm_gem_dma_create - allocate an object with the given size > * @drm: DRM device > * @size: size of the object to allocate > * > - * This function creates a CMA GEM object and allocates memory as backing store. > + * This function creates a DMA GEM object and allocates memory as backing store. > * The allocated memory will occupy a contiguous chunk of bus address space. > * > * For devices that are directly connected to the memory bus then the allocated > @@ -131,78 +128,78 @@ __drm_gem_cma_create(struct drm_device *drm, size_t size, bool private) > * requirements. > * > * Returns: > - * A struct drm_gem_cma_object * on success or an ERR_PTR()-encoded negative > + * A struct drm_gem_dma_object * on success or an ERR_PTR()-encoded negative > * error code on failure. > */ > -struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, > +struct drm_gem_dma_object *drm_gem_dma_create(struct drm_device *drm, > size_t size) > { > - struct drm_gem_cma_object *cma_obj; > + struct drm_gem_dma_object *dma_obj; > int ret; > > size = round_up(size, PAGE_SIZE); > > - cma_obj = __drm_gem_cma_create(drm, size, false); > - if (IS_ERR(cma_obj)) > - return cma_obj; > + dma_obj = __drm_gem_dma_create(drm, size, false); > + if (IS_ERR(dma_obj)) > + return dma_obj; > > - if (cma_obj->map_noncoherent) { > - cma_obj->vaddr = dma_alloc_noncoherent(drm->dev, size, > - &cma_obj->paddr, > + if (dma_obj->map_noncoherent) { > + dma_obj->vaddr = dma_alloc_noncoherent(drm->dev, size, > + &dma_obj->paddr, > DMA_TO_DEVICE, > GFP_KERNEL | __GFP_NOWARN); > } else { > - cma_obj->vaddr = dma_alloc_wc(drm->dev, size, &cma_obj->paddr, > + dma_obj->vaddr = dma_alloc_wc(drm->dev, size, &dma_obj->paddr, > GFP_KERNEL | __GFP_NOWARN); > } > - if (!cma_obj->vaddr) { > + if (!dma_obj->vaddr) { > drm_dbg(drm, "failed to allocate buffer with size %zu\n", > size); > ret = -ENOMEM; > goto error; > } > > - return cma_obj; > + return dma_obj; > > error: > - drm_gem_object_put(&cma_obj->base); > + drm_gem_object_put(&dma_obj->base); > return ERR_PTR(ret); > } > -EXPORT_SYMBOL_GPL(drm_gem_cma_create); > +EXPORT_SYMBOL_GPL(drm_gem_dma_create); > > /** > - * drm_gem_cma_create_with_handle - allocate an object with the given size and > + * drm_gem_dma_create_with_handle - allocate an object with the given size and > * return a GEM handle to it > * @file_priv: DRM file-private structure to register the handle for > * @drm: DRM device > * @size: size of the object to allocate > * @handle: return location for the GEM handle > * > - * This function creates a CMA GEM object, allocating a chunk of memory as > + * This function creates a DMA GEM object, allocating a chunk of memory as > * backing store. The GEM object is then added to the list of object associated > * with the given file and a handle to it is returned. > * > * The allocated memory will occupy a contiguous chunk of bus address space. > - * See drm_gem_cma_create() for more details. > + * See drm_gem_dma_create() for more details. > * > * Returns: > - * A struct drm_gem_cma_object * on success or an ERR_PTR()-encoded negative > + * A struct drm_gem_dma_object * on success or an ERR_PTR()-encoded negative > * error code on failure. > */ > -static struct drm_gem_cma_object * > -drm_gem_cma_create_with_handle(struct drm_file *file_priv, > +static struct drm_gem_dma_object * > +drm_gem_dma_create_with_handle(struct drm_file *file_priv, > struct drm_device *drm, size_t size, > uint32_t *handle) > { > - struct drm_gem_cma_object *cma_obj; > + struct drm_gem_dma_object *dma_obj; > struct drm_gem_object *gem_obj; > int ret; > > - cma_obj = drm_gem_cma_create(drm, size); > - if (IS_ERR(cma_obj)) > - return cma_obj; > + dma_obj = drm_gem_dma_create(drm, size); > + if (IS_ERR(dma_obj)) > + return dma_obj; > > - gem_obj = &cma_obj->base; > + gem_obj = &dma_obj->base; > > /* > * allocate a id of idr table where the obj is registered > @@ -214,44 +211,44 @@ drm_gem_cma_create_with_handle(struct drm_file *file_priv, > if (ret) > return ERR_PTR(ret); > > - return cma_obj; > + return dma_obj; > } > > /** > - * drm_gem_cma_free - free resources associated with a CMA GEM object > - * @cma_obj: CMA GEM object to free > + * drm_gem_dma_free - free resources associated with a DMA GEM object > + * @dma_obj: DMA GEM object to free > * > - * This function frees the backing memory of the CMA GEM object, cleans up the > + * This function frees the backing memory of the DMA GEM object, cleans up the > * GEM object state and frees the memory used to store the object itself. > * If the buffer is imported and the virtual address is set, it is released. > */ > -void drm_gem_cma_free(struct drm_gem_cma_object *cma_obj) > +void drm_gem_dma_free(struct drm_gem_dma_object *dma_obj) > { > - struct drm_gem_object *gem_obj = &cma_obj->base; > - struct iosys_map map = IOSYS_MAP_INIT_VADDR(cma_obj->vaddr); > + struct drm_gem_object *gem_obj = &dma_obj->base; > + struct iosys_map map = IOSYS_MAP_INIT_VADDR(dma_obj->vaddr); > > if (gem_obj->import_attach) { > - if (cma_obj->vaddr) > + if (dma_obj->vaddr) > dma_buf_vunmap(gem_obj->import_attach->dmabuf, &map); > - drm_prime_gem_destroy(gem_obj, cma_obj->sgt); > - } else if (cma_obj->vaddr) { > - if (cma_obj->map_noncoherent) > - dma_free_noncoherent(gem_obj->dev->dev, cma_obj->base.size, > - cma_obj->vaddr, cma_obj->paddr, > + drm_prime_gem_destroy(gem_obj, dma_obj->sgt); > + } else if (dma_obj->vaddr) { > + if (dma_obj->map_noncoherent) > + dma_free_noncoherent(gem_obj->dev->dev, dma_obj->base.size, > + dma_obj->vaddr, dma_obj->paddr, > DMA_TO_DEVICE); > else > - dma_free_wc(gem_obj->dev->dev, cma_obj->base.size, > - cma_obj->vaddr, cma_obj->paddr); > + dma_free_wc(gem_obj->dev->dev, dma_obj->base.size, > + dma_obj->vaddr, dma_obj->paddr); > } > > drm_gem_object_release(gem_obj); > > - kfree(cma_obj); > + kfree(dma_obj); > } > -EXPORT_SYMBOL_GPL(drm_gem_cma_free); > +EXPORT_SYMBOL_GPL(drm_gem_dma_free); > > /** > - * drm_gem_cma_dumb_create_internal - create a dumb buffer object > + * drm_gem_dma_dumb_create_internal - create a dumb buffer object > * @file_priv: DRM file-private structure to create the dumb buffer for > * @drm: DRM device > * @args: IOCTL data > @@ -264,12 +261,12 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_free); > * Returns: > * 0 on success or a negative error code on failure. > */ > -int drm_gem_cma_dumb_create_internal(struct drm_file *file_priv, > +int drm_gem_dma_dumb_create_internal(struct drm_file *file_priv, > struct drm_device *drm, > struct drm_mode_create_dumb *args) > { > unsigned int min_pitch = DIV_ROUND_UP(args->width * args->bpp, 8); > - struct drm_gem_cma_object *cma_obj; > + struct drm_gem_dma_object *dma_obj; > > if (args->pitch < min_pitch) > args->pitch = min_pitch; > @@ -277,14 +274,14 @@ int drm_gem_cma_dumb_create_internal(struct drm_file *file_priv, > if (args->size < args->pitch * args->height) > args->size = args->pitch * args->height; > > - cma_obj = drm_gem_cma_create_with_handle(file_priv, drm, args->size, > + dma_obj = drm_gem_dma_create_with_handle(file_priv, drm, args->size, > &args->handle); > - return PTR_ERR_OR_ZERO(cma_obj); > + return PTR_ERR_OR_ZERO(dma_obj); > } > -EXPORT_SYMBOL_GPL(drm_gem_cma_dumb_create_internal); > +EXPORT_SYMBOL_GPL(drm_gem_dma_dumb_create_internal); > > /** > - * drm_gem_cma_dumb_create - create a dumb buffer object > + * drm_gem_dma_dumb_create - create a dumb buffer object > * @file_priv: DRM file-private structure to create the dumb buffer for > * @drm: DRM device > * @args: IOCTL data > @@ -296,35 +293,35 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_dumb_create_internal); > * > * For hardware with additional restrictions, drivers can adjust the fields > * set up by userspace and pass the IOCTL data along to the > - * drm_gem_cma_dumb_create_internal() function. > + * drm_gem_dma_dumb_create_internal() function. > * > * Returns: > * 0 on success or a negative error code on failure. > */ > -int drm_gem_cma_dumb_create(struct drm_file *file_priv, > +int drm_gem_dma_dumb_create(struct drm_file *file_priv, > struct drm_device *drm, > struct drm_mode_create_dumb *args) > { > - struct drm_gem_cma_object *cma_obj; > + struct drm_gem_dma_object *dma_obj; > > args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8); > args->size = args->pitch * args->height; > > - cma_obj = drm_gem_cma_create_with_handle(file_priv, drm, args->size, > + dma_obj = drm_gem_dma_create_with_handle(file_priv, drm, args->size, > &args->handle); > - return PTR_ERR_OR_ZERO(cma_obj); > + return PTR_ERR_OR_ZERO(dma_obj); > } > -EXPORT_SYMBOL_GPL(drm_gem_cma_dumb_create); > +EXPORT_SYMBOL_GPL(drm_gem_dma_dumb_create); > > -const struct vm_operations_struct drm_gem_cma_vm_ops = { > +const struct vm_operations_struct drm_gem_dma_vm_ops = { > .open = drm_gem_vm_open, > .close = drm_gem_vm_close, > }; > -EXPORT_SYMBOL_GPL(drm_gem_cma_vm_ops); > +EXPORT_SYMBOL_GPL(drm_gem_dma_vm_ops); > > #ifndef CONFIG_MMU > /** > - * drm_gem_cma_get_unmapped_area - propose address for mapping in noMMU cases > + * drm_gem_dma_get_unmapped_area - propose address for mapping in noMMU cases > * @filp: file object > * @addr: memory address > * @len: buffer size > @@ -339,13 +336,13 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_vm_ops); > * Returns: > * mapping address on success or a negative error code on failure. > */ > -unsigned long drm_gem_cma_get_unmapped_area(struct file *filp, > +unsigned long drm_gem_dma_get_unmapped_area(struct file *filp, > unsigned long addr, > unsigned long len, > unsigned long pgoff, > unsigned long flags) > { > - struct drm_gem_cma_object *cma_obj; > + struct drm_gem_dma_object *dma_obj; > struct drm_gem_object *obj = NULL; > struct drm_file *priv = filp->private_data; > struct drm_device *dev = priv->minor->dev; > @@ -384,35 +381,35 @@ unsigned long drm_gem_cma_get_unmapped_area(struct file *filp, > return -EACCES; > } > > - cma_obj = to_drm_gem_cma_obj(obj); > + dma_obj = to_drm_gem_dma_obj(obj); > > drm_gem_object_put(obj); > > - return cma_obj->vaddr ? (unsigned long)cma_obj->vaddr : -EINVAL; > + return dma_obj->vaddr ? (unsigned long)dma_obj->vaddr : -EINVAL; > } > -EXPORT_SYMBOL_GPL(drm_gem_cma_get_unmapped_area); > +EXPORT_SYMBOL_GPL(drm_gem_dma_get_unmapped_area); > #endif > > /** > - * drm_gem_cma_print_info() - Print &drm_gem_cma_object info for debugfs > - * @cma_obj: CMA GEM object > + * drm_gem_dma_print_info() - Print &drm_gem_dma_object info for debugfs > + * @dma_obj: DMA GEM object > * @p: DRM printer > * @indent: Tab indentation level > * > * This function prints paddr and vaddr for use in e.g. debugfs output. > */ > -void drm_gem_cma_print_info(const struct drm_gem_cma_object *cma_obj, > +void drm_gem_dma_print_info(const struct drm_gem_dma_object *dma_obj, > struct drm_printer *p, unsigned int indent) > { > - drm_printf_indent(p, indent, "paddr=%pad\n", &cma_obj->paddr); > - drm_printf_indent(p, indent, "vaddr=%p\n", cma_obj->vaddr); > + drm_printf_indent(p, indent, "paddr=%pad\n", &dma_obj->paddr); > + drm_printf_indent(p, indent, "vaddr=%p\n", dma_obj->vaddr); > } > -EXPORT_SYMBOL(drm_gem_cma_print_info); > +EXPORT_SYMBOL(drm_gem_dma_print_info); > > /** > - * drm_gem_cma_get_sg_table - provide a scatter/gather table of pinned > - * pages for a CMA GEM object > - * @cma_obj: CMA GEM object > + * drm_gem_dma_get_sg_table - provide a scatter/gather table of pinned > + * pages for a DMA GEM object > + * @dma_obj: DMA GEM object > * > * This function exports a scatter/gather table by calling the standard > * DMA mapping API. > @@ -420,9 +417,9 @@ EXPORT_SYMBOL(drm_gem_cma_print_info); > * Returns: > * A pointer to the scatter/gather table of pinned pages or NULL on failure. > */ > -struct sg_table *drm_gem_cma_get_sg_table(struct drm_gem_cma_object *cma_obj) > +struct sg_table *drm_gem_dma_get_sg_table(struct drm_gem_dma_object *dma_obj) > { > - struct drm_gem_object *obj = &cma_obj->base; > + struct drm_gem_object *obj = &dma_obj->base; > struct sg_table *sgt; > int ret; > > @@ -430,8 +427,8 @@ struct sg_table *drm_gem_cma_get_sg_table(struct drm_gem_cma_object *cma_obj) > if (!sgt) > return ERR_PTR(-ENOMEM); > > - ret = dma_get_sgtable(obj->dev->dev, sgt, cma_obj->vaddr, > - cma_obj->paddr, obj->size); > + ret = dma_get_sgtable(obj->dev->dev, sgt, dma_obj->vaddr, > + dma_obj->paddr, obj->size); > if (ret < 0) > goto out; > > @@ -441,10 +438,10 @@ struct sg_table *drm_gem_cma_get_sg_table(struct drm_gem_cma_object *cma_obj) > kfree(sgt); > return ERR_PTR(ret); > } > -EXPORT_SYMBOL_GPL(drm_gem_cma_get_sg_table); > +EXPORT_SYMBOL_GPL(drm_gem_dma_get_sg_table); > > /** > - * drm_gem_cma_prime_import_sg_table - produce a CMA GEM object from another > + * drm_gem_dma_prime_import_sg_table - produce a DMA GEM object from another > * driver's scatter/gather table of pinned pages > * @dev: device to import into > * @attach: DMA-BUF attachment > @@ -453,7 +450,7 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_get_sg_table); > * This function imports a scatter/gather table exported via DMA-BUF by > * another driver. Imported buffers must be physically contiguous in memory > * (i.e. the scatter/gather table must contain a single entry). Drivers that > - * use the CMA helpers should set this as their > + * use the DMA helpers should set this as their > * &drm_driver.gem_prime_import_sg_table callback. > * > * Returns: > @@ -461,56 +458,56 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_get_sg_table); > * error code on failure. > */ > struct drm_gem_object * > -drm_gem_cma_prime_import_sg_table(struct drm_device *dev, > +drm_gem_dma_prime_import_sg_table(struct drm_device *dev, > struct dma_buf_attachment *attach, > struct sg_table *sgt) > { > - struct drm_gem_cma_object *cma_obj; > + struct drm_gem_dma_object *dma_obj; > > /* check if the entries in the sg_table are contiguous */ > if (drm_prime_get_contiguous_size(sgt) < attach->dmabuf->size) > return ERR_PTR(-EINVAL); > > - /* Create a CMA GEM buffer. */ > - cma_obj = __drm_gem_cma_create(dev, attach->dmabuf->size, true); > - if (IS_ERR(cma_obj)) > - return ERR_CAST(cma_obj); > + /* Create a DMA GEM buffer. */ > + dma_obj = __drm_gem_dma_create(dev, attach->dmabuf->size, true); > + if (IS_ERR(dma_obj)) > + return ERR_CAST(dma_obj); > > - cma_obj->paddr = sg_dma_address(sgt->sgl); > - cma_obj->sgt = sgt; > + dma_obj->paddr = sg_dma_address(sgt->sgl); > + dma_obj->sgt = sgt; > > - DRM_DEBUG_PRIME("dma_addr = %pad, size = %zu\n", &cma_obj->paddr, attach->dmabuf->size); > + DRM_DEBUG_PRIME("dma_addr = %pad, size = %zu\n", &dma_obj->paddr, attach->dmabuf->size); > > - return &cma_obj->base; > + return &dma_obj->base; > } > -EXPORT_SYMBOL_GPL(drm_gem_cma_prime_import_sg_table); > +EXPORT_SYMBOL_GPL(drm_gem_dma_prime_import_sg_table); > > /** > - * drm_gem_cma_vmap - map a CMA GEM object into the kernel's virtual > + * drm_gem_dma_vmap - map a DMA GEM object into the kernel's virtual > * address space > - * @cma_obj: CMA GEM object > - * @map: Returns the kernel virtual address of the CMA GEM object's backing > + * @dma_obj: DMA GEM object > + * @map: Returns the kernel virtual address of the DMA GEM object's backing > * store. > * > * This function maps a buffer into the kernel's virtual address space. > - * Since the CMA buffers are already mapped into the kernel virtual address > + * Since the DMA buffers are already mapped into the kernel virtual address > * space this simply returns the cached virtual address. > * > * Returns: > * 0 on success, or a negative error code otherwise. > */ > -int drm_gem_cma_vmap(struct drm_gem_cma_object *cma_obj, > +int drm_gem_dma_vmap(struct drm_gem_dma_object *dma_obj, > struct iosys_map *map) > { > - iosys_map_set_vaddr(map, cma_obj->vaddr); > + iosys_map_set_vaddr(map, dma_obj->vaddr); > > return 0; > } > -EXPORT_SYMBOL_GPL(drm_gem_cma_vmap); > +EXPORT_SYMBOL_GPL(drm_gem_dma_vmap); > > /** > - * drm_gem_cma_mmap - memory-map an exported CMA GEM object > - * @cma_obj: CMA GEM object > + * drm_gem_dma_mmap - memory-map an exported DMA GEM object > + * @dma_obj: DMA GEM object > * @vma: VMA for the area to be mapped > * > * This function maps a buffer into a userspace process's address space. > @@ -520,9 +517,9 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_vmap); > * Returns: > * 0 on success or a negative error code on failure. > */ > -int drm_gem_cma_mmap(struct drm_gem_cma_object *cma_obj, struct vm_area_struct *vma) > +int drm_gem_dma_mmap(struct drm_gem_dma_object *dma_obj, struct vm_area_struct *vma) > { > - struct drm_gem_object *obj = &cma_obj->base; > + struct drm_gem_object *obj = &dma_obj->base; > int ret; > > /* > @@ -534,37 +531,37 @@ int drm_gem_cma_mmap(struct drm_gem_cma_object *cma_obj, struct vm_area_struct * > vma->vm_flags &= ~VM_PFNMAP; > vma->vm_flags |= VM_DONTEXPAND; > > - if (cma_obj->map_noncoherent) { > + if (dma_obj->map_noncoherent) { > vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); > > - ret = dma_mmap_pages(cma_obj->base.dev->dev, > + ret = dma_mmap_pages(dma_obj->base.dev->dev, > vma, vma->vm_end - vma->vm_start, > - virt_to_page(cma_obj->vaddr)); > + virt_to_page(dma_obj->vaddr)); > } else { > - ret = dma_mmap_wc(cma_obj->base.dev->dev, vma, cma_obj->vaddr, > - cma_obj->paddr, vma->vm_end - vma->vm_start); > + ret = dma_mmap_wc(dma_obj->base.dev->dev, vma, dma_obj->vaddr, > + dma_obj->paddr, vma->vm_end - vma->vm_start); > } > if (ret) > drm_gem_vm_close(vma); > > return ret; > } > -EXPORT_SYMBOL_GPL(drm_gem_cma_mmap); > +EXPORT_SYMBOL_GPL(drm_gem_dma_mmap); > > /** > - * drm_gem_cma_prime_import_sg_table_vmap - PRIME import another driver's > + * drm_gem_dma_prime_import_sg_table_vmap - PRIME import another driver's > * scatter/gather table and get the virtual address of the buffer > * @dev: DRM device > * @attach: DMA-BUF attachment > * @sgt: Scatter/gather table of pinned pages > * > * This function imports a scatter/gather table using > - * drm_gem_cma_prime_import_sg_table() and uses dma_buf_vmap() to get the kernel > - * virtual address. This ensures that a CMA GEM object always has its virtual > + * drm_gem_dma_prime_import_sg_table() and uses dma_buf_vmap() to get the kernel > + * virtual address. This ensures that a DMA GEM object always has its virtual > * address set. This address is released when the object is freed. > * > * This function can be used as the &drm_driver.gem_prime_import_sg_table > - * callback. The &DRM_GEM_CMA_DRIVER_OPS_VMAP macro provides a shortcut to set > + * callback. The &DRM_GEM_DMA_DRIVER_OPS_VMAP macro provides a shortcut to set > * the necessary DRM driver operations. > * > * Returns: > @@ -572,11 +569,11 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_mmap); > * error code on failure. > */ > struct drm_gem_object * > -drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *dev, > +drm_gem_dma_prime_import_sg_table_vmap(struct drm_device *dev, > struct dma_buf_attachment *attach, > struct sg_table *sgt) > { > - struct drm_gem_cma_object *cma_obj; > + struct drm_gem_dma_object *dma_obj; > struct drm_gem_object *obj; > struct iosys_map map; > int ret; > @@ -587,19 +584,19 @@ drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *dev, > return ERR_PTR(ret); > } > > - obj = drm_gem_cma_prime_import_sg_table(dev, attach, sgt); > + obj = drm_gem_dma_prime_import_sg_table(dev, attach, sgt); > if (IS_ERR(obj)) { > dma_buf_vunmap(attach->dmabuf, &map); > return obj; > } > > - cma_obj = to_drm_gem_cma_obj(obj); > - cma_obj->vaddr = map.vaddr; > + dma_obj = to_drm_gem_dma_obj(obj); > + dma_obj->vaddr = map.vaddr; > > return obj; > } > -EXPORT_SYMBOL(drm_gem_cma_prime_import_sg_table_vmap); > +EXPORT_SYMBOL(drm_gem_dma_prime_import_sg_table_vmap); > > -MODULE_DESCRIPTION("DRM CMA memory-management helpers"); > +MODULE_DESCRIPTION("DRM DMA memory-management helpers"); > MODULE_IMPORT_NS(DMA_BUF); > MODULE_LICENSE("GPL"); > diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c > index 2f61f53d472f..2ecaf3cb7afb 100644 > --- a/drivers/gpu/drm/drm_mipi_dbi.c > +++ b/drivers/gpu/drm/drm_mipi_dbi.c > @@ -1136,7 +1136,7 @@ int mipi_dbi_spi_init(struct spi_device *spi, struct mipi_dbi *dbi, > /* > * Even though it's not the SPI device that does DMA (the master does), > * the dma mask is necessary for the dma_alloc_wc() in the GEM code > - * (e.g., drm_gem_cma_create()). The dma_addr returned will be a physical > + * (e.g., drm_gem_dma_create()). The dma_addr returned will be a physical > * address which might be different from the bus address, but this is > * not a problem since the address will not be used. > * The virtual address is used in the transfer and the SPI core > diff --git a/drivers/gpu/drm/fsl-dcu/Kconfig b/drivers/gpu/drm/fsl-dcu/Kconfig > index e95e96c565ba..5ca71ef87325 100644 > --- a/drivers/gpu/drm/fsl-dcu/Kconfig > +++ b/drivers/gpu/drm/fsl-dcu/Kconfig > @@ -3,7 +3,7 @@ config DRM_FSL_DCU > tristate "DRM Support for Freescale DCU" > depends on DRM && OF && ARM && COMMON_CLK > select BACKLIGHT_CLASS_DEVICE > - select DRM_GEM_CMA_HELPER > + select DRM_GEM_DMA_HELPER > select DRM_KMS_HELPER > select DRM_PANEL > select REGMAP_MMIO > diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > index 4baa4977e473..b4acc3422ba4 100644 > --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > @@ -21,7 +21,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -149,13 +149,13 @@ static void fsl_dcu_unload(struct drm_device *dev) > dev->dev_private = NULL; > } > > -DEFINE_DRM_GEM_CMA_FOPS(fsl_dcu_drm_fops); > +DEFINE_DRM_GEM_DMA_FOPS(fsl_dcu_drm_fops); > > static const struct drm_driver fsl_dcu_drm_driver = { > .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, > .load = fsl_dcu_load, > .unload = fsl_dcu_unload, > - DRM_GEM_CMA_DRIVER_OPS, > + DRM_GEM_DMA_DRIVER_OPS, > .fops = &fsl_dcu_drm_fops, > .name = "fsl-dcu-drm", > .desc = "Freescale DCU DRM", > diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c > index aba2b714e8a6..48c98331a3c0 100644 > --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c > +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c > @@ -13,7 +13,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > > @@ -84,7 +84,7 @@ static void fsl_dcu_drm_plane_atomic_update(struct drm_plane *plane, > struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state, > plane); > struct drm_framebuffer *fb = plane->state->fb; > - struct drm_gem_cma_object *gem; > + struct drm_gem_dma_object *gem; > unsigned int alpha = DCU_LAYER_AB_NONE, bpp; > int index; > > diff --git a/drivers/gpu/drm/hisilicon/kirin/Kconfig b/drivers/gpu/drm/hisilicon/kirin/Kconfig > index b770f7662830..c5265675bf0c 100644 > --- a/drivers/gpu/drm/hisilicon/kirin/Kconfig > +++ b/drivers/gpu/drm/hisilicon/kirin/Kconfig > @@ -3,7 +3,7 @@ config DRM_HISI_KIRIN > tristate "DRM Support for Hisilicon Kirin series SoCs Platform" > depends on DRM && OF && ARM64 > select DRM_KMS_HELPER > - select DRM_GEM_CMA_HELPER > + select DRM_GEM_DMA_HELPER > select DRM_MIPI_DSI > help > Choose this option if you have a hisilicon Kirin chipsets(hi6220). > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > index c5d304826c3b..9666d71a83cc 100644 > --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > @@ -27,7 +27,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -548,7 +548,7 @@ static const struct drm_crtc_funcs ade_crtc_funcs = { > static void ade_rdma_set(void __iomem *base, struct drm_framebuffer *fb, > u32 ch, u32 y, u32 in_h, u32 fmt) > { > - struct drm_gem_cma_object *obj = drm_fb_dma_get_gem_obj(fb, 0); > + struct drm_gem_dma_object *obj = drm_fb_dma_get_gem_obj(fb, 0); > u32 reg_ctrl, reg_addr, reg_size, reg_stride, reg_space, reg_en; > u32 stride = fb->pitches[0]; > u32 addr = (u32)obj->paddr + y * stride; > @@ -919,12 +919,12 @@ static const struct drm_mode_config_funcs ade_mode_config_funcs = { > > }; > > -DEFINE_DRM_GEM_CMA_FOPS(ade_fops); > +DEFINE_DRM_GEM_DMA_FOPS(ade_fops); > > static const struct drm_driver ade_driver = { > .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, > .fops = &ade_fops, > - DRM_GEM_CMA_DRIVER_OPS, > + DRM_GEM_DMA_DRIVER_OPS, > .name = "kirin", > .desc = "Hisilicon Kirin620 SoC DRM Driver", > .date = "20150718", > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c > index e8b0fe970969..73ee7f25f734 100644 > --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c > @@ -20,7 +20,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig > index bb9738c7c825..975de4ff7313 100644 > --- a/drivers/gpu/drm/imx/Kconfig > +++ b/drivers/gpu/drm/imx/Kconfig > @@ -3,7 +3,7 @@ config DRM_IMX > tristate "DRM Support for Freescale i.MX" > select DRM_KMS_HELPER > select VIDEOMODE_HELPERS > - select DRM_GEM_CMA_HELPER > + select DRM_GEM_DMA_HELPER > select DRM_KMS_HELPER > depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM || COMPILE_TEST) > depends on IMX_IPUV3_CORE > diff --git a/drivers/gpu/drm/imx/dcss/Kconfig b/drivers/gpu/drm/imx/dcss/Kconfig > index 5c2b2277afbf..3ffc061d392b 100644 > --- a/drivers/gpu/drm/imx/dcss/Kconfig > +++ b/drivers/gpu/drm/imx/dcss/Kconfig > @@ -2,7 +2,7 @@ config DRM_IMX_DCSS > tristate "i.MX8MQ DCSS" > select IMX_IRQSTEER > select DRM_KMS_HELPER > - select DRM_GEM_CMA_HELPER > + select DRM_GEM_DMA_HELPER > select VIDEOMODE_HELPERS > depends on DRM && ARCH_MXC && ARM64 > help > diff --git a/drivers/gpu/drm/imx/dcss/dcss-kms.c b/drivers/gpu/drm/imx/dcss/dcss-kms.c > index 9b84df34a6a1..f50814e9d549 100644 > --- a/drivers/gpu/drm/imx/dcss/dcss-kms.c > +++ b/drivers/gpu/drm/imx/dcss/dcss-kms.c > @@ -8,7 +8,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -17,7 +17,7 @@ > #include "dcss-dev.h" > #include "dcss-kms.h" > > -DEFINE_DRM_GEM_CMA_FOPS(dcss_cma_fops); > +DEFINE_DRM_GEM_DMA_FOPS(dcss_cma_fops); > > static const struct drm_mode_config_funcs dcss_drm_mode_config_funcs = { > .fb_create = drm_gem_fb_create, > @@ -28,7 +28,7 @@ static const struct drm_mode_config_funcs dcss_drm_mode_config_funcs = { > > static const struct drm_driver dcss_kms_driver = { > .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, > - DRM_GEM_CMA_DRIVER_OPS, > + DRM_GEM_DMA_DRIVER_OPS, > .fops = &dcss_cma_fops, > .name = "imx-dcss", > .desc = "i.MX8MQ Display Subsystem", > diff --git a/drivers/gpu/drm/imx/dcss/dcss-plane.c b/drivers/gpu/drm/imx/dcss/dcss-plane.c > index a333c13c9ebc..4c41c93ac900 100644 > --- a/drivers/gpu/drm/imx/dcss/dcss-plane.c > +++ b/drivers/gpu/drm/imx/dcss/dcss-plane.c > @@ -9,7 +9,7 @@ > #include > #include > #include > -#include > +#include > > #include "dcss-dev.h" > #include "dcss-kms.h" > @@ -147,7 +147,7 @@ static int dcss_plane_atomic_check(struct drm_plane *plane, > struct dcss_dev *dcss = plane->dev->dev_private; > struct drm_framebuffer *fb = new_plane_state->fb; > bool is_primary_plane = plane->type == DRM_PLANE_TYPE_PRIMARY; > - struct drm_gem_cma_object *cma_obj; > + struct drm_gem_dma_object *dma_obj; > struct drm_crtc_state *crtc_state; > int hdisplay, vdisplay; > int min, max; > @@ -156,8 +156,8 @@ static int dcss_plane_atomic_check(struct drm_plane *plane, > if (!fb || !new_plane_state->crtc) > return 0; > > - cma_obj = drm_fb_dma_get_gem_obj(fb, 0); > - WARN_ON(!cma_obj); > + dma_obj = drm_fb_dma_get_gem_obj(fb, 0); > + WARN_ON(!dma_obj); > > crtc_state = drm_atomic_get_existing_crtc_state(state, > new_plane_state->crtc); > @@ -218,26 +218,26 @@ static void dcss_plane_atomic_set_base(struct dcss_plane *dcss_plane) > struct dcss_dev *dcss = plane->dev->dev_private; > struct drm_framebuffer *fb = state->fb; > const struct drm_format_info *format = fb->format; > - struct drm_gem_cma_object *cma_obj = drm_fb_dma_get_gem_obj(fb, 0); > + struct drm_gem_dma_object *dma_obj = drm_fb_dma_get_gem_obj(fb, 0); > unsigned long p1_ba = 0, p2_ba = 0; > > if (!format->is_yuv || > format->format == DRM_FORMAT_NV12 || > format->format == DRM_FORMAT_NV21) > - p1_ba = cma_obj->paddr + fb->offsets[0] + > + p1_ba = dma_obj->paddr + fb->offsets[0] + > fb->pitches[0] * (state->src.y1 >> 16) + > format->char_per_block[0] * (state->src.x1 >> 16); > else if (format->format == DRM_FORMAT_UYVY || > format->format == DRM_FORMAT_VYUY || > format->format == DRM_FORMAT_YUYV || > format->format == DRM_FORMAT_YVYU) > - p1_ba = cma_obj->paddr + fb->offsets[0] + > + p1_ba = dma_obj->paddr + fb->offsets[0] + > fb->pitches[0] * (state->src.y1 >> 16) + > 2 * format->char_per_block[0] * (state->src.x1 >> 17); > > if (format->format == DRM_FORMAT_NV12 || > format->format == DRM_FORMAT_NV21) > - p2_ba = cma_obj->paddr + fb->offsets[1] + > + p2_ba = dma_obj->paddr + fb->offsets[1] + > (((fb->pitches[1] >> 1) * (state->src.y1 >> 17) + > (state->src.x1 >> 17)) << 1); > > diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c > index e43345bd1346..8dd8b0f912af 100644 > --- a/drivers/gpu/drm/imx/imx-drm-core.c > +++ b/drivers/gpu/drm/imx/imx-drm-core.c > @@ -17,7 +17,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -32,7 +32,7 @@ > static int legacyfb_depth = 16; > module_param(legacyfb_depth, int, 0444); > > -DEFINE_DRM_GEM_CMA_FOPS(imx_drm_driver_fops); > +DEFINE_DRM_GEM_DMA_FOPS(imx_drm_driver_fops); > > void imx_drm_connector_destroy(struct drm_connector *connector) > { > @@ -152,7 +152,7 @@ static int imx_drm_dumb_create(struct drm_file *file_priv, > > args->width = ALIGN(width, 8); > > - ret = drm_gem_cma_dumb_create(file_priv, drm, args); > + ret = drm_gem_dma_dumb_create(file_priv, drm, args); > if (ret) > return ret; > > @@ -162,7 +162,7 @@ static int imx_drm_dumb_create(struct drm_file *file_priv, > > static const struct drm_driver imx_drm_driver = { > .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, > - DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(imx_drm_dumb_create), > + DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATE(imx_drm_dumb_create), > .ioctls = imx_drm_ioctls, > .num_ioctls = ARRAY_SIZE(imx_drm_ioctls), > .fops = &imx_drm_driver_fops, > diff --git a/drivers/gpu/drm/imx/imx-drm.h b/drivers/gpu/drm/imx/imx-drm.h > index c3e1a3f14d30..e721bebda2bd 100644 > --- a/drivers/gpu/drm/imx/imx-drm.h > +++ b/drivers/gpu/drm/imx/imx-drm.h > @@ -32,7 +32,7 @@ extern struct platform_driver ipu_drm_driver; > > void imx_drm_mode_config_init(struct drm_device *drm); > > -struct drm_gem_cma_object *imx_drm_fb_get_obj(struct drm_framebuffer *fb); > +struct drm_gem_dma_object *imx_drm_fb_get_obj(struct drm_framebuffer *fb); > > int imx_drm_encoder_parse_of(struct drm_device *drm, > struct drm_encoder *encoder, struct device_node *np); > diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c > index d9f832f952c2..5f26090b0c98 100644 > --- a/drivers/gpu/drm/imx/ipuv3-crtc.c > +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c > @@ -18,7 +18,7 @@ > > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c > index 27bd16418002..07c0b9def383 100644 > --- a/drivers/gpu/drm/imx/ipuv3-plane.c > +++ b/drivers/gpu/drm/imx/ipuv3-plane.c > @@ -12,7 +12,7 @@ > #include > #include > #include > -#include > +#include > #include > > #include