* [PATCH 06/59] drm/prime: Actually remove DRIVER_PRIME everywhere [not found] ` <20190614203615.12639-1-daniel.vetter-/w4YWyX8dFk@public.gmane.org> @ 2019-06-14 20:35 ` Daniel Vetter [not found] ` <20190614203615.12639-7-daniel.vetter-/w4YWyX8dFk@public.gmane.org> 2019-06-17 17:56 ` [PATCH 06/59] " Emil Velikov 2019-06-14 20:35 ` [PATCH 09/59] drm/prime: Align gem_prime_export with obj_funcs.export Daniel Vetter 1 sibling, 2 replies; 18+ messages in thread From: Daniel Vetter @ 2019-06-14 20:35 UTC (permalink / raw) To: DRI Development Cc: linux-aspeed-uLR06cmDAlY/bJ5BZ2RsiQ, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Daniel Vetter, linux-stm32-XDFAJ8BFU24N7RejjzZ/Li2xQDfSxrLKVpNB7YpNyf8, linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA, lima-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, VMware Graphics, NXP Linux Team, Daniel Vetter, spice-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, Intel Graphics Development, etnaviv-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b, linux-tegra-u79uwXL29TY76Z2rM5mHXA, linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Split out to make the functional changes stick out more. v2: amdgpu gained DRIVER_SYNCOBJ_TIMELINE. v3: amdgpu lost DRIVER_SYNCOBJ_TIMELINE. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: amd-gfx@lists.freedesktop.org Cc: etnaviv@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Cc: lima@lists.freedesktop.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-arm-msm@vger.kernel.org Cc: linux-aspeed@lists.ozlabs.org Cc: linux-renesas-soc@vger.kernel.org Cc: linux-rockchip@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-tegra@vger.kernel.org Cc: nouveau@lists.freedesktop.org Cc: NXP Linux Team <linux-imx@nxp.com> Cc: spice-devel@lists.freedesktop.org Cc: virtualization@lists.linux-foundation.org Cc: VMware Graphics <linux-graphics-maintainer@vmware.com> Cc: xen-devel@lists.xenproject.org --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/arc/arcpgu_drv.c | 3 +-- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- drivers/gpu/drm/arm/hdlcd_drv.c | 4 +--- drivers/gpu/drm/arm/malidp_drv.c | 3 +-- drivers/gpu/drm/armada/armada_drv.c | 3 +-- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +-- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 +--- drivers/gpu/drm/bochs/bochs_drv.c | 3 +-- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +--- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 +-- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 3 +-- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/imx/imx-drm-core.c | 3 +-- drivers/gpu/drm/lima/lima_drv.c | 2 +- drivers/gpu/drm/mcde/mcde_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +-- drivers/gpu/drm/meson/meson_drv.c | 4 +--- drivers/gpu/drm/msm/msm_drv.c | 1 - drivers/gpu/drm/mxsfb/mxsfb_drv.c | 3 +-- drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 3 +-- drivers/gpu/drm/pl111/pl111_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_drv.c | 3 +-- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 3 +-- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 +-- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 3 +-- drivers/gpu/drm/sti/sti_drv.c | 3 +-- drivers/gpu/drm/stm/drv.c | 3 +-- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +-- drivers/gpu/drm/tinydrm/hx8357d.c | 2 +- drivers/gpu/drm/tinydrm/ili9225.c | 3 +-- drivers/gpu/drm/tinydrm/ili9341.c | 2 +- drivers/gpu/drm/tinydrm/mi0283qt.c | 3 +-- drivers/gpu/drm/tinydrm/repaper.c | 3 +-- drivers/gpu/drm/tinydrm/st7586.c | 3 +-- drivers/gpu/drm/tinydrm/st7735r.c | 3 +-- drivers/gpu/drm/tve200/tve200_drv.c | 3 +-- drivers/gpu/drm/udl/udl_drv.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 1 - drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_drv.c | 1 - drivers/gpu/drm/vgem/vgem_drv.c | 3 +-- drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- drivers/gpu/drm/xen/xen_drm_front.c | 3 +-- drivers/gpu/drm/zte/zx_drm_drv.c | 3 +-- include/drm/drm_drv.h | 6 ------ 54 files changed, 50 insertions(+), 94 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 0a577a389024..8e1b269351e8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1309,7 +1309,7 @@ static struct drm_driver kms_driver = { .driver_features = DRIVER_USE_AGP | DRIVER_ATOMIC | DRIVER_GEM | - DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ, + DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ, .load = amdgpu_driver_load_kms, .open = amdgpu_driver_open_kms, .postclose = amdgpu_driver_postclose_kms, diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c index af60c6d7a5f4..74240cc1c300 100644 --- a/drivers/gpu/drm/arc/arcpgu_drv.c +++ b/drivers/gpu/drm/arc/arcpgu_drv.c @@ -135,8 +135,7 @@ static int arcpgu_debugfs_init(struct drm_minor *minor) #endif static struct drm_driver arcpgu_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .name = "arcpgu", .desc = "ARC PGU Controller", .date = "20160219", diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c index 86f6542afb40..0c6396dc323f 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c @@ -56,7 +56,7 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data) static struct drm_driver komeda_kms_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | - DRIVER_PRIME | DRIVER_HAVE_IRQ, + DRIVER_HAVE_IRQ, .lastclose = drm_fb_helper_lastclose, .irq_handler = komeda_kms_irq_handler, .gem_free_object_unlocked = drm_gem_cma_free_object, diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index 8fc0b884c428..b126555895d8 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -229,9 +229,7 @@ static int hdlcd_debugfs_init(struct drm_minor *minor) DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver hdlcd_driver = { - .driver_features = DRIVER_GEM | - DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .irq_handler = hdlcd_irq, .irq_preinstall = hdlcd_irq_preinstall, .irq_postinstall = hdlcd_irq_postinstall, diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index af1992f06a1d..5dccc7130739 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -568,8 +568,7 @@ static int malidp_debugfs_init(struct drm_minor *minor) #endif //CONFIG_DEBUG_FS static struct drm_driver malidp_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | - DRIVER_PRIME, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = malidp_dumb_create, diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index e660c5ca52ae..78c8ad73ae1e 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -43,8 +43,7 @@ static struct drm_driver armada_drm_driver = { .name = "armada-drm", .desc = "Armada SoC DRM", .date = "20120730", - .driver_features = DRIVER_GEM | DRIVER_MODESET | - DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .ioctls = armada_ioctls, .fops = &armada_drm_fops, }; diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c index eeb22eccd1fc..ada2f6aca906 100644 --- a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +++ b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c @@ -194,8 +194,7 @@ static void aspeed_gfx_unload(struct drm_device *drm) DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver aspeed_gfx_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | - DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .gem_create_object = drm_cma_gem_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index fb2e7646daeb..274fdf18cde8 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -834,9 +834,7 @@ static void atmel_hlcdc_dc_irq_uninstall(struct drm_device *dev) DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver atmel_hlcdc_dc_driver = { - .driver_features = DRIVER_GEM | - DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .irq_handler = atmel_hlcdc_dc_irq_handler, .irq_preinstall = atmel_hlcdc_dc_irq_uninstall, .irq_postinstall = atmel_hlcdc_dc_irq_postinstall, diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index 8f3a5bda9d03..78ad6c98861d 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c @@ -65,8 +65,7 @@ static const struct file_operations bochs_fops = { }; static struct drm_driver bochs_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | - DRIVER_PRIME, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &bochs_fops, .name = "bochs-drm", .desc = "bochs dispi vga interface (qemu stdvga)", diff --git a/drivers/gpu/drm/cirrus/cirrus.c b/drivers/gpu/drm/cirrus/cirrus.c index be4ea370ba31..36a69aec8a4b 100644 --- a/drivers/gpu/drm/cirrus/cirrus.c +++ b/drivers/gpu/drm/cirrus/cirrus.c @@ -513,7 +513,7 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus) DEFINE_DRM_GEM_SHMEM_FOPS(cirrus_fops); static struct drm_driver cirrus_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC | DRIVER_PRIME, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .name = DRIVER_NAME, .desc = DRIVER_DESC, diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index 7eb7cf9c3fa8..db3b00031fcf 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -462,9 +462,7 @@ static const struct file_operations fops = { }; static struct drm_driver etnaviv_drm_driver = { - .driver_features = DRIVER_GEM | - DRIVER_PRIME | - DRIVER_RENDER, + .driver_features = DRIVER_GEM | DRIVER_RENDER, .open = etnaviv_open, .postclose = etnaviv_postclose, .gem_free_object_unlocked = etnaviv_gem_free_object, diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index ba8932af9b43..e43640fc42d3 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -114,7 +114,7 @@ static const struct file_operations exynos_drm_driver_fops = { }; static struct drm_driver exynos_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC | DRIVER_RENDER, .open = exynos_drm_open, .lastclose = drm_fb_helper_lastclose, 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 e81daaaa5965..d18ff729d7f6 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -133,8 +133,7 @@ static irqreturn_t fsl_dcu_drm_irq(int irq, void *arg) DEFINE_DRM_GEM_CMA_FOPS(fsl_dcu_drm_fops); static struct drm_driver fsl_dcu_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET - | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .load = fsl_dcu_load, .unload = fsl_dcu_unload, .irq_handler = fsl_dcu_drm_irq, diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 7cb7c042b93f..73f2b53f32cc 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -117,8 +117,7 @@ static int kirin_gem_cma_dumb_create(struct drm_file *file, } static struct drm_driver kirin_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &kirin_drm_fops, .gem_free_object_unlocked = drm_gem_cma_free_object, diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 65d599065709..4fd09a9ad67a 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -3193,7 +3193,7 @@ static struct drm_driver driver = { * deal with them for Intel hardware. */ .driver_features = - DRIVER_GEM | DRIVER_PRIME | + DRIVER_GEM | DRIVER_RENDER | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_SYNCOBJ, .release = i915_driver_release, .open = i915_driver_open, diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 3e8bece620df..384db6d86da0 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -147,8 +147,7 @@ static const struct drm_ioctl_desc imx_drm_ioctls[] = { }; static struct drm_driver imx_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = drm_gem_cma_dumb_create, diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c index b29c26cd13b2..beb10bc1a7f3 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -252,7 +252,7 @@ static const struct file_operations lima_drm_driver_fops = { }; static struct drm_driver lima_drm_driver = { - .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_PRIME | DRIVER_SYNCOBJ, + .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ, .open = lima_drm_driver_open, .postclose = lima_drm_driver_postclose, .ioctls = lima_drm_driver_ioctls, diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c index baf63fb6850a..f731d689d52f 100644 --- a/drivers/gpu/drm/mcde/mcde_drv.c +++ b/drivers/gpu/drm/mcde/mcde_drv.c @@ -237,7 +237,7 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops); static struct drm_driver mcde_drm_driver = { .driver_features = - DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, + DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .release = mcde_release, .lastclose = drm_fb_helper_lastclose, .ioctls = NULL, diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 95fdbd0fbcac..1f8b8943b0c6 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -321,8 +321,7 @@ static const struct file_operations mtk_drm_fops = { }; static struct drm_driver mtk_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .gem_free_object_unlocked = mtk_drm_gem_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 2310c96fff46..140363f93575 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -93,9 +93,7 @@ static int meson_dumb_create(struct drm_file *file, struct drm_device *dev, DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver meson_driver = { - .driver_features = DRIVER_GEM | - DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, /* IRQ */ .irq_handler = meson_irq, diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 31deb87abfc6..87f92d3906ab 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1016,7 +1016,6 @@ static const struct file_operations fops = { static struct drm_driver msm_driver = { .driver_features = DRIVER_GEM | - DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC | DRIVER_MODESET, diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c index 6fafc90da4ec..b5bcaf4036bd 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c @@ -313,8 +313,7 @@ static irqreturn_t mxsfb_irq_handler(int irq, void *data) DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver mxsfb_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | - DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .irq_handler = mxsfb_irq_handler, .irq_preinstall = mxsfb_irq_preinstall, .irq_uninstall = mxsfb_irq_preinstall, diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 7c2fcaba42d6..8cb174f95448 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -1105,7 +1105,7 @@ nouveau_driver_fops = { static struct drm_driver driver_stub = { .driver_features = - DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER + DRIVER_GEM | DRIVER_MODESET | DRIVER_RENDER #if defined(CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT) | DRIVER_KMS_LEGACY_CONTEXT #endif diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 672e0f8ad11c..5929f8688e5a 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -524,7 +524,7 @@ static const struct file_operations omapdriver_fops = { }; static struct drm_driver omap_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC | DRIVER_RENDER, .open = dev_open, .lastclose = drm_fb_helper_lastclose, diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index d11e2281dde6..ed2e29826f62 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -342,8 +342,7 @@ static const struct drm_ioctl_desc panfrost_drm_driver_ioctls[] = { DEFINE_DRM_GEM_SHMEM_FOPS(panfrost_drm_driver_fops); static struct drm_driver panfrost_drm_driver = { - .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_PRIME | - DRIVER_SYNCOBJ, + .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ, .open = panfrost_open, .postclose = panfrost_postclose, .ioctls = panfrost_drm_driver_ioctls, diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index 01f8462aa2db..dd4aaa380250 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -224,7 +224,7 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops); static struct drm_driver pl111_drm_driver = { .driver_features = - DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, + DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .ioctls = NULL, .fops = &drm_fops, .name = "pl111", diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index f33e349c4ec5..61e1ce16fc25 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -247,8 +247,7 @@ static struct pci_driver qxl_pci_driver = { }; static struct drm_driver qxl_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .dumb_create = qxl_mode_dumb_create, .dumb_map_offset = qxl_mode_dumb_mmap, diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index a6cbe11f79c6..3b07aa6e551d 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -539,7 +539,7 @@ radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, static struct drm_driver kms_driver = { .driver_features = - DRIVER_USE_AGP | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER, + DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER, .load = radeon_driver_load_kms, .open = radeon_driver_open_kms, .postclose = radeon_driver_postclose_kms, diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 6df37c2a9678..83685250319d 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -441,8 +441,7 @@ MODULE_DEVICE_TABLE(of, rcar_du_of_table); DEFINE_DRM_GEM_CMA_FOPS(rcar_du_fops); static struct drm_driver rcar_du_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME - | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 53d2c5bd61dc..59091b6241ec 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -212,8 +212,7 @@ static const struct file_operations rockchip_drm_driver_fops = { }; static struct drm_driver rockchip_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | - DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .lastclose = drm_fb_helper_lastclose, .gem_vm_ops = &drm_gem_cma_vm_ops, .gem_free_object_unlocked = rockchip_gem_free_object, diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c index cb821adfc321..9047a49ff35e 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c @@ -127,8 +127,7 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg) DEFINE_DRM_GEM_CMA_FOPS(shmob_drm_fops); static struct drm_driver shmob_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET - | DRIVER_PRIME, + .driver_features = DRIVER_GEM | DRIVER_MODESET, .irq_handler = shmob_drm_irq, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c index bb6ae6dd66c9..d9f63c9f287b 100644 --- a/drivers/gpu/drm/sti/sti_drv.c +++ b/drivers/gpu/drm/sti/sti_drv.c @@ -141,8 +141,7 @@ static void sti_mode_config_init(struct drm_device *dev) DEFINE_DRM_GEM_CMA_FOPS(sti_driver_fops); static struct drm_driver sti_driver = { - .driver_features = DRIVER_MODESET | - DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = drm_gem_cma_dumb_create, diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c index 5659572151a8..4026c33ccc39 100644 --- a/drivers/gpu/drm/stm/drv.c +++ b/drivers/gpu/drm/stm/drv.c @@ -54,8 +54,7 @@ static int stm_gem_cma_dumb_create(struct drm_file *file, DEFINE_DRM_GEM_CMA_FOPS(drv_driver_fops); static struct drm_driver drv_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .name = "stm", .desc = "STMicroelectronics SoC DRM", .date = "20170330", diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 1a1b52e6f73e..d0fda2bf8224 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -38,7 +38,7 @@ static int drm_sun4i_gem_dumb_create(struct drm_file *file_priv, DEFINE_DRM_GEM_CMA_FOPS(sun4i_drv_fops); static struct drm_driver sun4i_drv_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, /* Generic Operations */ .fops = &sun4i_drv_fops, diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 0c5f1e6a0446..87a1443406ab 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1007,7 +1007,7 @@ static int tegra_debugfs_init(struct drm_minor *minor) #endif static struct drm_driver tegra_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC | DRIVER_RENDER, .load = tegra_drm_load, .unload = tegra_drm_unload, diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index 3030af9e7b35..92307959435a 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c @@ -512,8 +512,7 @@ static int tilcdc_debugfs_init(struct drm_minor *minor) DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver tilcdc_driver = { - .driver_features = (DRIVER_GEM | DRIVER_MODESET | - DRIVER_PRIME | DRIVER_ATOMIC), + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .irq_handler = tilcdc_irq, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_print_info = drm_gem_cma_print_info, diff --git a/drivers/gpu/drm/tinydrm/hx8357d.c b/drivers/gpu/drm/tinydrm/hx8357d.c index 5773d0fb6ca1..be197c5c3211 100644 --- a/drivers/gpu/drm/tinydrm/hx8357d.c +++ b/drivers/gpu/drm/tinydrm/hx8357d.c @@ -193,7 +193,7 @@ static const struct drm_display_mode yx350hv15_mode = { DEFINE_DRM_GEM_CMA_FOPS(hx8357d_fops); static struct drm_driver hx8357d_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &hx8357d_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/ili9225.c b/drivers/gpu/drm/tinydrm/ili9225.c index ea69019f2f33..7a8e1b4a37ee 100644 --- a/drivers/gpu/drm/tinydrm/ili9225.c +++ b/drivers/gpu/drm/tinydrm/ili9225.c @@ -350,8 +350,7 @@ static const struct drm_display_mode ili9225_mode = { DEFINE_DRM_GEM_CMA_FOPS(ili9225_fops); static struct drm_driver ili9225_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &ili9225_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/ili9341.c b/drivers/gpu/drm/tinydrm/ili9341.c index 4ade9e4b924f..00f28b8e4345 100644 --- a/drivers/gpu/drm/tinydrm/ili9341.c +++ b/drivers/gpu/drm/tinydrm/ili9341.c @@ -149,7 +149,7 @@ static const struct drm_display_mode yx240qv29_mode = { DEFINE_DRM_GEM_CMA_FOPS(ili9341_fops); static struct drm_driver ili9341_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &ili9341_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c index fdefa53455d4..7a14d6b355f2 100644 --- a/drivers/gpu/drm/tinydrm/mi0283qt.c +++ b/drivers/gpu/drm/tinydrm/mi0283qt.c @@ -153,8 +153,7 @@ static const struct drm_display_mode mi0283qt_mode = { DEFINE_DRM_GEM_CMA_FOPS(mi0283qt_fops); static struct drm_driver mi0283qt_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &mi0283qt_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/repaper.c b/drivers/gpu/drm/tinydrm/repaper.c index 97a874b40394..85acfccefcdb 100644 --- a/drivers/gpu/drm/tinydrm/repaper.c +++ b/drivers/gpu/drm/tinydrm/repaper.c @@ -925,8 +925,7 @@ static const u8 repaper_e2271cs021_cs[] = { 0x00, 0x00, 0x00, 0x7f, DEFINE_DRM_GEM_CMA_FOPS(repaper_fops); static struct drm_driver repaper_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &repaper_fops, .release = repaper_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/st7586.c b/drivers/gpu/drm/tinydrm/st7586.c index 9ac626265152..204face7b311 100644 --- a/drivers/gpu/drm/tinydrm/st7586.c +++ b/drivers/gpu/drm/tinydrm/st7586.c @@ -296,8 +296,7 @@ static const struct drm_display_mode st7586_mode = { DEFINE_DRM_GEM_CMA_FOPS(st7586_fops); static struct drm_driver st7586_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &st7586_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/st7735r.c b/drivers/gpu/drm/tinydrm/st7735r.c index ce9109e613e0..b23899788f5b 100644 --- a/drivers/gpu/drm/tinydrm/st7735r.c +++ b/drivers/gpu/drm/tinydrm/st7735r.c @@ -123,8 +123,7 @@ static const struct drm_display_mode jd_t18003_t01_mode = { DEFINE_DRM_GEM_CMA_FOPS(st7735r_fops); static struct drm_driver st7735r_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &st7735r_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c index 6e695fbeb6bc..a1f614e21fcc 100644 --- a/drivers/gpu/drm/tve200/tve200_drv.c +++ b/drivers/gpu/drm/tve200/tve200_drv.c @@ -137,8 +137,7 @@ static int tve200_modeset_init(struct drm_device *dev) DEFINE_DRM_GEM_CMA_FOPS(drm_fops); static struct drm_driver tve200_drm_driver = { - .driver_features = - DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .ioctls = NULL, .fops = &drm_fops, .name = "tve200", diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c index 4a49facb608d..ae53bf75c1d6 100644 --- a/drivers/gpu/drm/udl/udl_drv.c +++ b/drivers/gpu/drm/udl/udl_drv.c @@ -54,7 +54,7 @@ static void udl_driver_release(struct drm_device *dev) } static struct drm_driver driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME, + .driver_features = DRIVER_MODESET | DRIVER_GEM, .release = udl_driver_release, /* gem hooks */ diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index fea597f4db8a..a1604705faee 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -188,7 +188,6 @@ static const struct drm_ioctl_desc v3d_drm_ioctls[] = { static struct drm_driver v3d_drm_driver = { .driver_features = (DRIVER_GEM | DRIVER_RENDER | - DRIVER_PRIME | DRIVER_SYNCOBJ), .open = v3d_open, diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c index 02537ab9cc08..a7fd194c81a9 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_drv.c +++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c @@ -196,7 +196,7 @@ static const struct file_operations vbox_fops = { static struct drm_driver driver = { .driver_features = - DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, + DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .lastclose = drm_fb_helper_lastclose, diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 0f99ad03614e..ed4fe7ed9e64 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -180,7 +180,6 @@ static struct drm_driver vc4_drm_driver = { DRIVER_ATOMIC | DRIVER_GEM | DRIVER_RENDER | - DRIVER_PRIME | DRIVER_SYNCOBJ), .open = vc4_open, .postclose = vc4_close, diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index 11a8f99ba18c..68c340cfde51 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -427,8 +427,7 @@ static void vgem_release(struct drm_device *dev) } static struct drm_driver vgem_driver = { - .driver_features = DRIVER_GEM | DRIVER_PRIME | - DRIVER_RENDER, + .driver_features = DRIVER_GEM | DRIVER_RENDER, .release = vgem_release, .open = vgem_open, .postclose = vgem_postclose, diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index c50868753132..0afdf51fdcfd 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c @@ -195,7 +195,7 @@ static const struct file_operations virtio_gpu_driver_fops = { }; static struct drm_driver driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_RENDER | DRIVER_ATOMIC, .open = virtio_gpu_driver_open, .postclose = virtio_gpu_driver_postclose, diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 4ff11a0077e1..89b8eb047583 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -1548,7 +1548,7 @@ static const struct file_operations vmwgfx_driver_fops = { static struct drm_driver driver = { .driver_features = - DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC, + DRIVER_MODESET | DRIVER_RENDER | DRIVER_ATOMIC, .load = vmw_driver_load, .unload = vmw_driver_unload, .lastclose = vmw_lastclose, diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 84aa4d61dc42..aeffec82a5ce 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -485,8 +485,7 @@ static const struct vm_operations_struct xen_drm_drv_vm_ops = { }; static struct drm_driver xen_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | - DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .release = xen_drm_drv_release, .gem_vm_ops = &xen_drm_drv_vm_ops, .gem_free_object_unlocked = xen_drm_drv_free_object_unlocked, diff --git a/drivers/gpu/drm/zte/zx_drm_drv.c b/drivers/gpu/drm/zte/zx_drm_drv.c index 28e8d6072910..060ad5266bc7 100644 --- a/drivers/gpu/drm/zte/zx_drm_drv.c +++ b/drivers/gpu/drm/zte/zx_drm_drv.c @@ -38,8 +38,7 @@ static const struct drm_mode_config_funcs zx_drm_mode_config_funcs = { DEFINE_DRM_GEM_CMA_FOPS(zx_drm_fops); static struct drm_driver zx_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = drm_gem_cma_dumb_create, diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 5e1ba16d19c6..7bc4795319c4 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -61,12 +61,6 @@ enum drm_driver_feature { * Driver supports mode setting interfaces (KMS). */ DRIVER_MODESET = BIT(1), - /** - * @DRIVER_PRIME: - * - * Driver implements DRM PRIME buffer sharing. - */ - DRIVER_PRIME = BIT(2), /** * @DRIVER_RENDER: * -- 2.20.1 _______________________________________________ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno ^ permalink raw reply related [flat|nested] 18+ messages in thread
[parent not found: <20190614203615.12639-7-daniel.vetter-/w4YWyX8dFk@public.gmane.org>]
* Re: [PATCH 06/59] drm/prime: Actually remove DRIVER_PRIME everywhere [not found] ` <20190614203615.12639-7-daniel.vetter-/w4YWyX8dFk@public.gmane.org> @ 2019-06-14 21:36 ` Sam Ravnborg 2019-06-17 15:39 ` [PATCH] " Daniel Vetter 1 sibling, 0 replies; 18+ messages in thread From: Sam Ravnborg @ 2019-06-14 21:36 UTC (permalink / raw) To: Daniel Vetter Cc: linux-aspeed-uLR06cmDAlY/bJ5BZ2RsiQ, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, DRI Development, virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Daniel Vetter, linux-stm32-XDFAJ8BFU24N7RejjzZ/Li2xQDfSxrLKVpNB7YpNyf8, linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA, lima-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, VMware Graphics, NXP Linux Team, xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, Intel Graphics Development, etnaviv-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, spice-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-tegra-u79uwXL29TY76Z2rM5mHXA, linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Hi Daniel. Minor nitpick.. > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 65d599065709..4fd09a9ad67a 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -3193,7 +3193,7 @@ static struct drm_driver driver = { > * deal with them for Intel hardware. > */ > .driver_features = > - DRIVER_GEM | DRIVER_PRIME | > + DRIVER_GEM | > DRIVER_RENDER | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_SYNCOBJ, Adds a whitespace. Sam _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] drm/prime: Actually remove DRIVER_PRIME everywhere [not found] ` <20190614203615.12639-7-daniel.vetter-/w4YWyX8dFk@public.gmane.org> 2019-06-14 21:36 ` Sam Ravnborg @ 2019-06-17 15:39 ` Daniel Vetter 1 sibling, 0 replies; 18+ messages in thread From: Daniel Vetter @ 2019-06-17 15:39 UTC (permalink / raw) To: DRI Development Cc: linux-aspeed-uLR06cmDAlY/bJ5BZ2RsiQ, Daniel Vetter, virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, Eric Anholt, Daniel Vetter, Sam Ravnborg, linux-stm32-XDFAJ8BFU24N7RejjzZ/Li2xQDfSxrLKVpNB7YpNyf8, linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA, lima-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, VMware Graphics, NXP Linux Team, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, spice-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, Intel Graphics Development, etnaviv-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b, linux-tegra-u79uwXL29TY76Z2rM5mHXA, linux-amlogic-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW Split out to make the functional changes stick out more. v2: amdgpu gained DRIVER_SYNCOBJ_TIMELINE. v3: amdgpu lost DRIVER_SYNCOBJ_TIMELINE. v4: Don't add a space in i915_drv.c (Sam) Cc: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: amd-gfx@lists.freedesktop.org Cc: etnaviv@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Cc: lima@lists.freedesktop.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-arm-msm@vger.kernel.org Cc: linux-aspeed@lists.ozlabs.org Cc: linux-renesas-soc@vger.kernel.org Cc: linux-rockchip@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-tegra@vger.kernel.org Cc: nouveau@lists.freedesktop.org Cc: NXP Linux Team <linux-imx@nxp.com> Cc: spice-devel@lists.freedesktop.org Cc: virtualization@lists.linux-foundation.org Cc: VMware Graphics <linux-graphics-maintainer@vmware.com> Cc: xen-devel@lists.xenproject.org --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/arc/arcpgu_drv.c | 3 +-- drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 2 +- drivers/gpu/drm/arm/hdlcd_drv.c | 4 +--- drivers/gpu/drm/arm/malidp_drv.c | 3 +-- drivers/gpu/drm/armada/armada_drv.c | 3 +-- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +-- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 +--- drivers/gpu/drm/bochs/bochs_drv.c | 3 +-- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +--- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 +-- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 3 +-- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/imx/imx-drm-core.c | 3 +-- drivers/gpu/drm/lima/lima_drv.c | 2 +- drivers/gpu/drm/mcde/mcde_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +-- drivers/gpu/drm/meson/meson_drv.c | 4 +--- drivers/gpu/drm/msm/msm_drv.c | 1 - drivers/gpu/drm/mxsfb/mxsfb_drv.c | 3 +-- drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 3 +-- drivers/gpu/drm/pl111/pl111_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_drv.c | 3 +-- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 3 +-- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 +-- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 3 +-- drivers/gpu/drm/sti/sti_drv.c | 3 +-- drivers/gpu/drm/stm/drv.c | 3 +-- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +-- drivers/gpu/drm/tinydrm/hx8357d.c | 2 +- drivers/gpu/drm/tinydrm/ili9225.c | 3 +-- drivers/gpu/drm/tinydrm/ili9341.c | 2 +- drivers/gpu/drm/tinydrm/mi0283qt.c | 3 +-- drivers/gpu/drm/tinydrm/repaper.c | 3 +-- drivers/gpu/drm/tinydrm/st7586.c | 3 +-- drivers/gpu/drm/tinydrm/st7735r.c | 3 +-- drivers/gpu/drm/tve200/tve200_drv.c | 3 +-- drivers/gpu/drm/udl/udl_drv.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 1 - drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_drv.c | 1 - drivers/gpu/drm/vgem/vgem_drv.c | 3 +-- drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- drivers/gpu/drm/xen/xen_drm_front.c | 3 +-- drivers/gpu/drm/zte/zx_drm_drv.c | 3 +-- include/drm/drm_drv.h | 6 ------ 54 files changed, 50 insertions(+), 94 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 0a577a389024..8e1b269351e8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1309,7 +1309,7 @@ static struct drm_driver kms_driver = { .driver_features = DRIVER_USE_AGP | DRIVER_ATOMIC | DRIVER_GEM | - DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ, + DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ, .load = amdgpu_driver_load_kms, .open = amdgpu_driver_open_kms, .postclose = amdgpu_driver_postclose_kms, diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c index af60c6d7a5f4..74240cc1c300 100644 --- a/drivers/gpu/drm/arc/arcpgu_drv.c +++ b/drivers/gpu/drm/arc/arcpgu_drv.c @@ -135,8 +135,7 @@ static int arcpgu_debugfs_init(struct drm_minor *minor) #endif static struct drm_driver arcpgu_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .name = "arcpgu", .desc = "ARC PGU Controller", .date = "20160219", diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c index 86f6542afb40..0c6396dc323f 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c @@ -56,7 +56,7 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data) static struct drm_driver komeda_kms_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | - DRIVER_PRIME | DRIVER_HAVE_IRQ, + DRIVER_HAVE_IRQ, .lastclose = drm_fb_helper_lastclose, .irq_handler = komeda_kms_irq_handler, .gem_free_object_unlocked = drm_gem_cma_free_object, diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index 8fc0b884c428..b126555895d8 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -229,9 +229,7 @@ static int hdlcd_debugfs_init(struct drm_minor *minor) DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver hdlcd_driver = { - .driver_features = DRIVER_GEM | - DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .irq_handler = hdlcd_irq, .irq_preinstall = hdlcd_irq_preinstall, .irq_postinstall = hdlcd_irq_postinstall, diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index af1992f06a1d..5dccc7130739 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -568,8 +568,7 @@ static int malidp_debugfs_init(struct drm_minor *minor) #endif //CONFIG_DEBUG_FS static struct drm_driver malidp_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | - DRIVER_PRIME, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = malidp_dumb_create, diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index e660c5ca52ae..78c8ad73ae1e 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -43,8 +43,7 @@ static struct drm_driver armada_drm_driver = { .name = "armada-drm", .desc = "Armada SoC DRM", .date = "20120730", - .driver_features = DRIVER_GEM | DRIVER_MODESET | - DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .ioctls = armada_ioctls, .fops = &armada_drm_fops, }; diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c index eeb22eccd1fc..ada2f6aca906 100644 --- a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +++ b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c @@ -194,8 +194,7 @@ static void aspeed_gfx_unload(struct drm_device *drm) DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver aspeed_gfx_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | - DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .gem_create_object = drm_cma_gem_create_object_default_funcs, .dumb_create = drm_gem_cma_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index fb2e7646daeb..274fdf18cde8 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -834,9 +834,7 @@ static void atmel_hlcdc_dc_irq_uninstall(struct drm_device *dev) DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver atmel_hlcdc_dc_driver = { - .driver_features = DRIVER_GEM | - DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .irq_handler = atmel_hlcdc_dc_irq_handler, .irq_preinstall = atmel_hlcdc_dc_irq_uninstall, .irq_postinstall = atmel_hlcdc_dc_irq_postinstall, diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index 8f3a5bda9d03..78ad6c98861d 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c @@ -65,8 +65,7 @@ static const struct file_operations bochs_fops = { }; static struct drm_driver bochs_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | - DRIVER_PRIME, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &bochs_fops, .name = "bochs-drm", .desc = "bochs dispi vga interface (qemu stdvga)", diff --git a/drivers/gpu/drm/cirrus/cirrus.c b/drivers/gpu/drm/cirrus/cirrus.c index be4ea370ba31..36a69aec8a4b 100644 --- a/drivers/gpu/drm/cirrus/cirrus.c +++ b/drivers/gpu/drm/cirrus/cirrus.c @@ -513,7 +513,7 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus) DEFINE_DRM_GEM_SHMEM_FOPS(cirrus_fops); static struct drm_driver cirrus_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC | DRIVER_PRIME, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .name = DRIVER_NAME, .desc = DRIVER_DESC, diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index 7eb7cf9c3fa8..db3b00031fcf 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -462,9 +462,7 @@ static const struct file_operations fops = { }; static struct drm_driver etnaviv_drm_driver = { - .driver_features = DRIVER_GEM | - DRIVER_PRIME | - DRIVER_RENDER, + .driver_features = DRIVER_GEM | DRIVER_RENDER, .open = etnaviv_open, .postclose = etnaviv_postclose, .gem_free_object_unlocked = etnaviv_gem_free_object, diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index ba8932af9b43..e43640fc42d3 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -114,7 +114,7 @@ static const struct file_operations exynos_drm_driver_fops = { }; static struct drm_driver exynos_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC | DRIVER_RENDER, .open = exynos_drm_open, .lastclose = drm_fb_helper_lastclose, 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 e81daaaa5965..d18ff729d7f6 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -133,8 +133,7 @@ static irqreturn_t fsl_dcu_drm_irq(int irq, void *arg) DEFINE_DRM_GEM_CMA_FOPS(fsl_dcu_drm_fops); static struct drm_driver fsl_dcu_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET - | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .load = fsl_dcu_load, .unload = fsl_dcu_unload, .irq_handler = fsl_dcu_drm_irq, diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 7cb7c042b93f..73f2b53f32cc 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -117,8 +117,7 @@ static int kirin_gem_cma_dumb_create(struct drm_file *file, } static struct drm_driver kirin_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &kirin_drm_fops, .gem_free_object_unlocked = drm_gem_cma_free_object, diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 535b9be4fc58..446cad529a24 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -3194,7 +3194,7 @@ static struct drm_driver driver = { * deal with them for Intel hardware. */ .driver_features = - DRIVER_GEM | DRIVER_PRIME | + DRIVER_GEM | DRIVER_RENDER | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_SYNCOBJ, .release = i915_driver_release, .open = i915_driver_open, diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 3e8bece620df..384db6d86da0 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -147,8 +147,7 @@ static const struct drm_ioctl_desc imx_drm_ioctls[] = { }; static struct drm_driver imx_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = drm_gem_cma_dumb_create, diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_drv.c index b29c26cd13b2..beb10bc1a7f3 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -252,7 +252,7 @@ static const struct file_operations lima_drm_driver_fops = { }; static struct drm_driver lima_drm_driver = { - .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_PRIME | DRIVER_SYNCOBJ, + .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ, .open = lima_drm_driver_open, .postclose = lima_drm_driver_postclose, .ioctls = lima_drm_driver_ioctls, diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c index baf63fb6850a..f731d689d52f 100644 --- a/drivers/gpu/drm/mcde/mcde_drv.c +++ b/drivers/gpu/drm/mcde/mcde_drv.c @@ -237,7 +237,7 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops); static struct drm_driver mcde_drm_driver = { .driver_features = - DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, + DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .release = mcde_release, .lastclose = drm_fb_helper_lastclose, .ioctls = NULL, diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 95fdbd0fbcac..1f8b8943b0c6 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -321,8 +321,7 @@ static const struct file_operations mtk_drm_fops = { }; static struct drm_driver mtk_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .gem_free_object_unlocked = mtk_drm_gem_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 2310c96fff46..140363f93575 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -93,9 +93,7 @@ static int meson_dumb_create(struct drm_file *file, struct drm_device *dev, DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver meson_driver = { - .driver_features = DRIVER_GEM | - DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, /* IRQ */ .irq_handler = meson_irq, diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 31deb87abfc6..87f92d3906ab 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1016,7 +1016,6 @@ static const struct file_operations fops = { static struct drm_driver msm_driver = { .driver_features = DRIVER_GEM | - DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC | DRIVER_MODESET, diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c index 6fafc90da4ec..b5bcaf4036bd 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c @@ -313,8 +313,7 @@ static irqreturn_t mxsfb_irq_handler(int irq, void *data) DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver mxsfb_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | - DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .irq_handler = mxsfb_irq_handler, .irq_preinstall = mxsfb_irq_preinstall, .irq_uninstall = mxsfb_irq_preinstall, diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 7c2fcaba42d6..8cb174f95448 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -1105,7 +1105,7 @@ nouveau_driver_fops = { static struct drm_driver driver_stub = { .driver_features = - DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER + DRIVER_GEM | DRIVER_MODESET | DRIVER_RENDER #if defined(CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT) | DRIVER_KMS_LEGACY_CONTEXT #endif diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 672e0f8ad11c..5929f8688e5a 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -524,7 +524,7 @@ static const struct file_operations omapdriver_fops = { }; static struct drm_driver omap_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC | DRIVER_RENDER, .open = dev_open, .lastclose = drm_fb_helper_lastclose, diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index d11e2281dde6..ed2e29826f62 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -342,8 +342,7 @@ static const struct drm_ioctl_desc panfrost_drm_driver_ioctls[] = { DEFINE_DRM_GEM_SHMEM_FOPS(panfrost_drm_driver_fops); static struct drm_driver panfrost_drm_driver = { - .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_PRIME | - DRIVER_SYNCOBJ, + .driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ, .open = panfrost_open, .postclose = panfrost_postclose, .ioctls = panfrost_drm_driver_ioctls, diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index 01f8462aa2db..dd4aaa380250 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -224,7 +224,7 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops); static struct drm_driver pl111_drm_driver = { .driver_features = - DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, + DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .ioctls = NULL, .fops = &drm_fops, .name = "pl111", diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index f33e349c4ec5..61e1ce16fc25 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -247,8 +247,7 @@ static struct pci_driver qxl_pci_driver = { }; static struct drm_driver qxl_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .dumb_create = qxl_mode_dumb_create, .dumb_map_offset = qxl_mode_dumb_mmap, diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index a6cbe11f79c6..3b07aa6e551d 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -539,7 +539,7 @@ radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, static struct drm_driver kms_driver = { .driver_features = - DRIVER_USE_AGP | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER, + DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER, .load = radeon_driver_load_kms, .open = radeon_driver_open_kms, .postclose = radeon_driver_postclose_kms, diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 6df37c2a9678..83685250319d 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -441,8 +441,7 @@ MODULE_DEVICE_TABLE(of, rcar_du_of_table); DEFINE_DRM_GEM_CMA_FOPS(rcar_du_fops); static struct drm_driver rcar_du_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME - | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 53d2c5bd61dc..59091b6241ec 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -212,8 +212,7 @@ static const struct file_operations rockchip_drm_driver_fops = { }; static struct drm_driver rockchip_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | - DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .lastclose = drm_fb_helper_lastclose, .gem_vm_ops = &drm_gem_cma_vm_ops, .gem_free_object_unlocked = rockchip_gem_free_object, diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c index cb821adfc321..9047a49ff35e 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c @@ -127,8 +127,7 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg) DEFINE_DRM_GEM_CMA_FOPS(shmob_drm_fops); static struct drm_driver shmob_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET - | DRIVER_PRIME, + .driver_features = DRIVER_GEM | DRIVER_MODESET, .irq_handler = shmob_drm_irq, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c index bb6ae6dd66c9..d9f63c9f287b 100644 --- a/drivers/gpu/drm/sti/sti_drv.c +++ b/drivers/gpu/drm/sti/sti_drv.c @@ -141,8 +141,7 @@ static void sti_mode_config_init(struct drm_device *dev) DEFINE_DRM_GEM_CMA_FOPS(sti_driver_fops); static struct drm_driver sti_driver = { - .driver_features = DRIVER_MODESET | - DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = drm_gem_cma_dumb_create, diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c index 5659572151a8..4026c33ccc39 100644 --- a/drivers/gpu/drm/stm/drv.c +++ b/drivers/gpu/drm/stm/drv.c @@ -54,8 +54,7 @@ static int stm_gem_cma_dumb_create(struct drm_file *file, DEFINE_DRM_GEM_CMA_FOPS(drv_driver_fops); static struct drm_driver drv_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .name = "stm", .desc = "STMicroelectronics SoC DRM", .date = "20170330", diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 1a1b52e6f73e..d0fda2bf8224 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -38,7 +38,7 @@ static int drm_sun4i_gem_dumb_create(struct drm_file *file_priv, DEFINE_DRM_GEM_CMA_FOPS(sun4i_drv_fops); static struct drm_driver sun4i_drv_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, /* Generic Operations */ .fops = &sun4i_drv_fops, diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 0c5f1e6a0446..87a1443406ab 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -1007,7 +1007,7 @@ static int tegra_debugfs_init(struct drm_minor *minor) #endif static struct drm_driver tegra_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC | DRIVER_RENDER, .load = tegra_drm_load, .unload = tegra_drm_unload, diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index 3030af9e7b35..92307959435a 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c @@ -512,8 +512,7 @@ static int tilcdc_debugfs_init(struct drm_minor *minor) DEFINE_DRM_GEM_CMA_FOPS(fops); static struct drm_driver tilcdc_driver = { - .driver_features = (DRIVER_GEM | DRIVER_MODESET | - DRIVER_PRIME | DRIVER_ATOMIC), + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .irq_handler = tilcdc_irq, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_print_info = drm_gem_cma_print_info, diff --git a/drivers/gpu/drm/tinydrm/hx8357d.c b/drivers/gpu/drm/tinydrm/hx8357d.c index 5773d0fb6ca1..be197c5c3211 100644 --- a/drivers/gpu/drm/tinydrm/hx8357d.c +++ b/drivers/gpu/drm/tinydrm/hx8357d.c @@ -193,7 +193,7 @@ static const struct drm_display_mode yx350hv15_mode = { DEFINE_DRM_GEM_CMA_FOPS(hx8357d_fops); static struct drm_driver hx8357d_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &hx8357d_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/ili9225.c b/drivers/gpu/drm/tinydrm/ili9225.c index ea69019f2f33..7a8e1b4a37ee 100644 --- a/drivers/gpu/drm/tinydrm/ili9225.c +++ b/drivers/gpu/drm/tinydrm/ili9225.c @@ -350,8 +350,7 @@ static const struct drm_display_mode ili9225_mode = { DEFINE_DRM_GEM_CMA_FOPS(ili9225_fops); static struct drm_driver ili9225_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &ili9225_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/ili9341.c b/drivers/gpu/drm/tinydrm/ili9341.c index 4ade9e4b924f..00f28b8e4345 100644 --- a/drivers/gpu/drm/tinydrm/ili9341.c +++ b/drivers/gpu/drm/tinydrm/ili9341.c @@ -149,7 +149,7 @@ static const struct drm_display_mode yx240qv29_mode = { DEFINE_DRM_GEM_CMA_FOPS(ili9341_fops); static struct drm_driver ili9341_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &ili9341_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c index fdefa53455d4..7a14d6b355f2 100644 --- a/drivers/gpu/drm/tinydrm/mi0283qt.c +++ b/drivers/gpu/drm/tinydrm/mi0283qt.c @@ -153,8 +153,7 @@ static const struct drm_display_mode mi0283qt_mode = { DEFINE_DRM_GEM_CMA_FOPS(mi0283qt_fops); static struct drm_driver mi0283qt_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &mi0283qt_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/repaper.c b/drivers/gpu/drm/tinydrm/repaper.c index 97a874b40394..85acfccefcdb 100644 --- a/drivers/gpu/drm/tinydrm/repaper.c +++ b/drivers/gpu/drm/tinydrm/repaper.c @@ -925,8 +925,7 @@ static const u8 repaper_e2271cs021_cs[] = { 0x00, 0x00, 0x00, 0x7f, DEFINE_DRM_GEM_CMA_FOPS(repaper_fops); static struct drm_driver repaper_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &repaper_fops, .release = repaper_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/st7586.c b/drivers/gpu/drm/tinydrm/st7586.c index 9ac626265152..204face7b311 100644 --- a/drivers/gpu/drm/tinydrm/st7586.c +++ b/drivers/gpu/drm/tinydrm/st7586.c @@ -296,8 +296,7 @@ static const struct drm_display_mode st7586_mode = { DEFINE_DRM_GEM_CMA_FOPS(st7586_fops); static struct drm_driver st7586_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &st7586_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tinydrm/st7735r.c b/drivers/gpu/drm/tinydrm/st7735r.c index ce9109e613e0..b23899788f5b 100644 --- a/drivers/gpu/drm/tinydrm/st7735r.c +++ b/drivers/gpu/drm/tinydrm/st7735r.c @@ -123,8 +123,7 @@ static const struct drm_display_mode jd_t18003_t01_mode = { DEFINE_DRM_GEM_CMA_FOPS(st7735r_fops); static struct drm_driver st7735r_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .fops = &st7735r_fops, .release = mipi_dbi_release, DRM_GEM_CMA_VMAP_DRIVER_OPS, diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c index 6e695fbeb6bc..a1f614e21fcc 100644 --- a/drivers/gpu/drm/tve200/tve200_drv.c +++ b/drivers/gpu/drm/tve200/tve200_drv.c @@ -137,8 +137,7 @@ static int tve200_modeset_init(struct drm_device *dev) DEFINE_DRM_GEM_CMA_FOPS(drm_fops); static struct drm_driver tve200_drm_driver = { - .driver_features = - DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .ioctls = NULL, .fops = &drm_fops, .name = "tve200", diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c index 4a49facb608d..ae53bf75c1d6 100644 --- a/drivers/gpu/drm/udl/udl_drv.c +++ b/drivers/gpu/drm/udl/udl_drv.c @@ -54,7 +54,7 @@ static void udl_driver_release(struct drm_device *dev) } static struct drm_driver driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME, + .driver_features = DRIVER_MODESET | DRIVER_GEM, .release = udl_driver_release, /* gem hooks */ diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index fea597f4db8a..a1604705faee 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -188,7 +188,6 @@ static const struct drm_ioctl_desc v3d_drm_ioctls[] = { static struct drm_driver v3d_drm_driver = { .driver_features = (DRIVER_GEM | DRIVER_RENDER | - DRIVER_PRIME | DRIVER_SYNCOBJ), .open = v3d_open, diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c index 02537ab9cc08..a7fd194c81a9 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_drv.c +++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c @@ -196,7 +196,7 @@ static const struct file_operations vbox_fops = { static struct drm_driver driver = { .driver_features = - DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, + DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, .lastclose = drm_fb_helper_lastclose, diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 0f99ad03614e..ed4fe7ed9e64 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -180,7 +180,6 @@ static struct drm_driver vc4_drm_driver = { DRIVER_ATOMIC | DRIVER_GEM | DRIVER_RENDER | - DRIVER_PRIME | DRIVER_SYNCOBJ), .open = vc4_open, .postclose = vc4_close, diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index 11a8f99ba18c..68c340cfde51 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -427,8 +427,7 @@ static void vgem_release(struct drm_device *dev) } static struct drm_driver vgem_driver = { - .driver_features = DRIVER_GEM | DRIVER_PRIME | - DRIVER_RENDER, + .driver_features = DRIVER_GEM | DRIVER_RENDER, .release = vgem_release, .open = vgem_open, .postclose = vgem_postclose, diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index c50868753132..0afdf51fdcfd 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c @@ -195,7 +195,7 @@ static const struct file_operations virtio_gpu_driver_fops = { }; static struct drm_driver driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_RENDER | DRIVER_ATOMIC, .open = virtio_gpu_driver_open, .postclose = virtio_gpu_driver_postclose, diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 4ff11a0077e1..89b8eb047583 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -1548,7 +1548,7 @@ static const struct file_operations vmwgfx_driver_fops = { static struct drm_driver driver = { .driver_features = - DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC, + DRIVER_MODESET | DRIVER_RENDER | DRIVER_ATOMIC, .load = vmw_driver_load, .unload = vmw_driver_unload, .lastclose = vmw_lastclose, diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 84aa4d61dc42..aeffec82a5ce 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -485,8 +485,7 @@ static const struct vm_operations_struct xen_drm_drv_vm_ops = { }; static struct drm_driver xen_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | - DRIVER_PRIME | DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .release = xen_drm_drv_release, .gem_vm_ops = &xen_drm_drv_vm_ops, .gem_free_object_unlocked = xen_drm_drv_free_object_unlocked, diff --git a/drivers/gpu/drm/zte/zx_drm_drv.c b/drivers/gpu/drm/zte/zx_drm_drv.c index 28e8d6072910..060ad5266bc7 100644 --- a/drivers/gpu/drm/zte/zx_drm_drv.c +++ b/drivers/gpu/drm/zte/zx_drm_drv.c @@ -38,8 +38,7 @@ static const struct drm_mode_config_funcs zx_drm_mode_config_funcs = { DEFINE_DRM_GEM_CMA_FOPS(zx_drm_fops); static struct drm_driver zx_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | - DRIVER_ATOMIC, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = drm_gem_cma_dumb_create, diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 5e1ba16d19c6..7bc4795319c4 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -61,12 +61,6 @@ enum drm_driver_feature { * Driver supports mode setting interfaces (KMS). */ DRIVER_MODESET = BIT(1), - /** - * @DRIVER_PRIME: - * - * Driver implements DRM PRIME buffer sharing. - */ - DRIVER_PRIME = BIT(2), /** * @DRIVER_RENDER: * -- 2.20.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 06/59] drm/prime: Actually remove DRIVER_PRIME everywhere 2019-06-14 20:35 ` [PATCH 06/59] drm/prime: Actually remove DRIVER_PRIME everywhere Daniel Vetter [not found] ` <20190614203615.12639-7-daniel.vetter-/w4YWyX8dFk@public.gmane.org> @ 2019-06-17 17:56 ` Emil Velikov 1 sibling, 0 replies; 18+ messages in thread From: Emil Velikov @ 2019-06-17 17:56 UTC (permalink / raw) To: Daniel Vetter Cc: linux-aspeed, nouveau, DRI Development, virtualization, Daniel Vetter, linux-stm32, linux-samsung-soc, lima, amd-gfx, linux-rockchip, VMware Graphics, NXP Linux Team, spice-devel, linux-arm-msm, Intel Graphics Development, etnaviv, xen-devel, linux-tegra, linux-amlogic, linux-arm-kernel, linux-renesas-soc, freedreno On 2019/06/14, Daniel Vetter wrote: > Split out to make the functional changes stick out more. > Since this patch flew-by, as standalone one (intentionally or not) I'd add, anything vaguely like: "Core users of DRIVER_PRIME were removed from core with prior patches." HTH Emil ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 09/59] drm/prime: Align gem_prime_export with obj_funcs.export [not found] ` <20190614203615.12639-1-daniel.vetter-/w4YWyX8dFk@public.gmane.org> 2019-06-14 20:35 ` [PATCH 06/59] drm/prime: Actually remove DRIVER_PRIME everywhere Daniel Vetter @ 2019-06-14 20:35 ` Daniel Vetter [not found] ` <20190614203615.12639-10-daniel.vetter-/w4YWyX8dFk@public.gmane.org> 1 sibling, 1 reply; 18+ messages in thread From: Daniel Vetter @ 2019-06-14 20:35 UTC (permalink / raw) To: DRI Development Cc: Kate Stewart, Maxime Ripard, Daniel Vetter, Joonas Lahtinen, Chris Wilson, Eric Anholt, Thomas Zimmermann, Thierry Reding, Jilayne Lovejoy, Daniel Vetter, Sumit Semwal, David (ChunMing) Zhou, Mika Kuoppala, Russell King, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Jonathan Hunter, David Airlie, Tomi Valkeinen, Matthew Auld, Feifei Xu, Dave Airlie, Zhi Wang The idea is that gem_prime_export is deprecated in favor of obj_funcs.export. That's much easier to do if both have matching function signatures. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <maxime.ripard@bootlin.com> Cc: Sean Paul <sean@poorly.run> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Zhenyu Wang <zhenyuw@linux.intel.com> Cc: Zhi Wang <zhi.a.wang@intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Jonathan Hunter <jonathanh@nvidia.com> Cc: Dave Airlie <airlied@redhat.com> Cc: Eric Anholt <eric@anholt.net> Cc: "Michel Dänzer" <michel.daenzer@amd.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Huang Rui <ray.huang@amd.com> Cc: Felix Kuehling <Felix.Kuehling@amd.com> Cc: Hawking Zhang <Hawking.Zhang@amd.com> Cc: Feifei Xu <Feifei.Xu@amd.com> Cc: Jim Qu <Jim.Qu@amd.com> Cc: Evan Quan <evan.quan@amd.com> Cc: Matthew Auld <matthew.auld@intel.com> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Cc: Thomas Zimmermann <tdz@users.sourceforge.net> Cc: Kate Stewart <kstewart@linuxfoundation.org> Cc: Sumit Semwal <sumit.semwal@linaro.org> Cc: Jilayne Lovejoy <opensource@jilayne.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Mikulas Patocka <mpatocka@redhat.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Junwei Zhang <Jerry.Zhang@amd.com> Cc: intel-gvt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org Cc: linux-tegra@vger.kernel.org --- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 7 +++---- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 3 +-- drivers/gpu/drm/armada/armada_gem.c | 5 ++--- drivers/gpu/drm/armada/armada_gem.h | 3 +-- drivers/gpu/drm/drm_prime.c | 9 ++++----- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 5 ++--- drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 8 ++++---- drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 3 +-- drivers/gpu/drm/omapdrm/omap_gem.h | 3 +-- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 5 ++--- drivers/gpu/drm/radeon/radeon_drv.c | 3 +-- drivers/gpu/drm/radeon/radeon_prime.c | 5 ++--- drivers/gpu/drm/tegra/gem.c | 7 +++---- drivers/gpu/drm/tegra/gem.h | 3 +-- drivers/gpu/drm/udl/udl_dmabuf.c | 5 ++--- drivers/gpu/drm/udl/udl_drv.h | 3 +-- drivers/gpu/drm/vc4/vc4_bo.c | 5 ++--- drivers/gpu/drm/vc4/vc4_drv.h | 3 +-- drivers/gpu/drm/vgem/vgem_fence.c | 2 +- include/drm/drm_drv.h | 4 ++-- include/drm/drm_prime.h | 3 +-- 22 files changed, 39 insertions(+), 57 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c index 489041df1f45..4809d4a5d72a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c @@ -345,8 +345,7 @@ const struct dma_buf_ops amdgpu_dmabuf_ops = { * Returns: * Shared DMA buffer representing the GEM BO from the given device. */ -struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *gobj, +struct dma_buf *amdgpu_gem_prime_export(struct drm_gem_object *gobj, int flags) { struct amdgpu_bo *bo = gem_to_amdgpu_bo(gobj); @@ -356,9 +355,9 @@ struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, bo->flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID) return ERR_PTR(-EPERM); - buf = drm_gem_prime_export(dev, gobj, flags); + buf = drm_gem_prime_export(gobj, flags); if (!IS_ERR(buf)) { - buf->file->f_mapping = dev->anon_inode->i_mapping; + buf->file->f_mapping = gobj->dev->anon_inode->i_mapping; buf->ops = &amdgpu_dmabuf_ops; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h index c7056cbe8685..7f73a4f94204 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h @@ -30,8 +30,7 @@ struct drm_gem_object * amdgpu_gem_prime_import_sg_table(struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sg); -struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *gobj, +struct dma_buf *amdgpu_gem_prime_export(struct drm_gem_object *gobj, int flags); struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev, struct dma_buf *dma_buf); diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 642d0e70d0f8..7e7fcc3f1f7f 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -485,8 +485,7 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = { }; struct dma_buf * -armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, - int flags) +armada_gem_prime_export(struct drm_gem_object *obj, int flags) { DEFINE_DMA_BUF_EXPORT_INFO(exp_info); @@ -495,7 +494,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, exp_info.flags = O_RDWR; exp_info.priv = obj; - return drm_gem_dmabuf_export(dev, &exp_info); + return drm_gem_dmabuf_export(obj->dev, &exp_info); } struct drm_gem_object * diff --git a/drivers/gpu/drm/armada/armada_gem.h b/drivers/gpu/drm/armada/armada_gem.h index 1ac90792b166..c619381eeeff 100644 --- a/drivers/gpu/drm/armada/armada_gem.h +++ b/drivers/gpu/drm/armada/armada_gem.h @@ -35,8 +35,7 @@ struct armada_gem_object *armada_gem_alloc_private_object(struct drm_device *, size_t); int armada_gem_dumb_create(struct drm_file *, struct drm_device *, struct drm_mode_create_dumb *); -struct dma_buf *armada_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, int flags); +struct dma_buf *armada_gem_prime_export(struct drm_gem_object *obj, int flags); struct drm_gem_object *armada_gem_prime_import(struct drm_device *, struct dma_buf *); int armada_gem_map_import(struct armada_gem_object *); diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 78f6f10b2060..d545e681cb41 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -382,9 +382,9 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev, if (obj->funcs && obj->funcs->export) dmabuf = obj->funcs->export(obj, flags); else if (dev->driver->gem_prime_export) - dmabuf = dev->driver->gem_prime_export(dev, obj, flags); + dmabuf = dev->driver->gem_prime_export(obj, flags); else - dmabuf = drm_gem_prime_export(dev, obj, flags); + dmabuf = drm_gem_prime_export(obj, flags); if (IS_ERR(dmabuf)) { /* normally the created dma-buf takes ownership of the ref, * but if that fails then drop the ref @@ -812,17 +812,16 @@ EXPORT_SYMBOL(drm_prime_pages_to_sg); /** * drm_gem_prime_export - helper library implementation of the export callback - * @dev: drm_device to export from * @obj: GEM object to export * @flags: flags like DRM_CLOEXEC and DRM_RDWR * * This is the implementation of the &drm_gem_object_funcs.export functions for GEM drivers * using the PRIME helpers. */ -struct dma_buf *drm_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, +struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj, int flags) { + struct drm_device *dev = obj->dev; struct dma_buf_export_info exp_info = { .exp_name = KBUILD_MODNAME, /* white lie for debug */ .owner = dev->driver->fops->owner, diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index a93e233cfaa9..50b1b73c303a 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@ -204,8 +204,7 @@ static const struct dma_buf_ops i915_dmabuf_ops = { .end_cpu_access = i915_gem_end_cpu_access, }; -struct dma_buf *i915_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *gem_obj, int flags) +struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags) { struct drm_i915_gem_object *obj = to_intel_bo(gem_obj); DEFINE_DMA_BUF_EXPORT_INFO(exp_info); @@ -222,7 +221,7 @@ struct dma_buf *i915_gem_prime_export(struct drm_device *dev, return ERR_PTR(ret); } - return drm_gem_dmabuf_export(dev, &exp_info); + return drm_gem_dmabuf_export(gem_obj->dev, &exp_info); } static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj) diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c index e3a64edef918..d85d1ce273ca 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c @@ -20,7 +20,7 @@ static int igt_dmabuf_export(void *arg) if (IS_ERR(obj)) return PTR_ERR(obj); - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); + dmabuf = i915_gem_prime_export(&obj->base, 0); i915_gem_object_put(obj); if (IS_ERR(dmabuf)) { pr_err("i915_gem_prime_export failed with err=%d\n", @@ -44,7 +44,7 @@ static int igt_dmabuf_import_self(void *arg) if (IS_ERR(obj)) return PTR_ERR(obj); - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); + dmabuf = i915_gem_prime_export(&obj->base, 0); if (IS_ERR(dmabuf)) { pr_err("i915_gem_prime_export failed with err=%d\n", (int)PTR_ERR(dmabuf)); @@ -219,7 +219,7 @@ static int igt_dmabuf_export_vmap(void *arg) if (IS_ERR(obj)) return PTR_ERR(obj); - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); + dmabuf = i915_gem_prime_export(&obj->base, 0); if (IS_ERR(dmabuf)) { pr_err("i915_gem_prime_export failed with err=%d\n", (int)PTR_ERR(dmabuf)); @@ -266,7 +266,7 @@ static int igt_dmabuf_export_kmap(void *arg) if (IS_ERR(obj)) return PTR_ERR(obj); - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); + dmabuf = i915_gem_prime_export(&obj->base, 0); i915_gem_object_put(obj); if (IS_ERR(dmabuf)) { err = PTR_ERR(dmabuf); diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/dmabuf.c index 41c8ebc60c63..13044c027f27 100644 --- a/drivers/gpu/drm/i915/gvt/dmabuf.c +++ b/drivers/gpu/drm/i915/gvt/dmabuf.c @@ -491,7 +491,7 @@ int intel_vgpu_get_dmabuf(struct intel_vgpu *vgpu, unsigned int dmabuf_id) obj->gvt_info = dmabuf_obj->info; - dmabuf = i915_gem_prime_export(dev, &obj->base, DRM_CLOEXEC | DRM_RDWR); + dmabuf = i915_gem_prime_export(&obj->base, DRM_CLOEXEC | DRM_RDWR); if (IS_ERR(dmabuf)) { gvt_vgpu_err("export dma-buf failed\n"); ret = PTR_ERR(dmabuf); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 9dce1c71bb9d..a8af77162567 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2587,8 +2587,7 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj, struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, struct dma_buf *dma_buf); -struct dma_buf *i915_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *gem_obj, int flags); +struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags); static inline struct i915_gem_context * __i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id) diff --git a/drivers/gpu/drm/omapdrm/omap_gem.h b/drivers/gpu/drm/omapdrm/omap_gem.h index c1c45fbde155..ee0f217cf59d 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.h +++ b/drivers/gpu/drm/omapdrm/omap_gem.h @@ -76,8 +76,7 @@ u64 omap_gem_mmap_offset(struct drm_gem_object *obj); size_t omap_gem_mmap_size(struct drm_gem_object *obj); /* PRIME Interface */ -struct dma_buf *omap_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, int flags); +struct dma_buf *omap_gem_prime_export(struct drm_gem_object *obj, int flags); struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev, struct dma_buf *buffer); diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c index 0f8b597ccd10..7e7ad275e3cf 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c @@ -136,8 +136,7 @@ static const struct dma_buf_ops omap_dmabuf_ops = { .mmap = omap_gem_dmabuf_mmap, }; -struct dma_buf *omap_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, int flags) +struct dma_buf *omap_gem_prime_export(struct drm_gem_object *obj, int flags) { DEFINE_DMA_BUF_EXPORT_INFO(exp_info); @@ -146,7 +145,7 @@ struct dma_buf *omap_gem_prime_export(struct drm_device *dev, exp_info.flags = flags; exp_info.priv = obj; - return drm_gem_dmabuf_export(dev, &exp_info); + return drm_gem_dmabuf_export(obj->dev, &exp_info); } /* ----------------------------------------------------------------------------- diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 3b07aa6e551d..4a6acaa3f843 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -130,8 +130,7 @@ int radeon_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_priv); void radeon_gem_object_close(struct drm_gem_object *obj, struct drm_file *file_priv); -struct dma_buf *radeon_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *gobj, +struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, int flags); extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int crtc, unsigned int flags, int *vpos, int *hpos, diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c index d3a5bea9a2c5..deaffce50a2e 100644 --- a/drivers/gpu/drm/radeon/radeon_prime.c +++ b/drivers/gpu/drm/radeon/radeon_prime.c @@ -124,12 +124,11 @@ struct reservation_object *radeon_gem_prime_res_obj(struct drm_gem_object *obj) return bo->tbo.resv; } -struct dma_buf *radeon_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *gobj, +struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, int flags) { struct radeon_bo *bo = gem_to_radeon_bo(gobj); if (radeon_ttm_tt_has_userptr(bo->tbo.ttm)) return ERR_PTR(-EPERM); - return drm_gem_prime_export(dev, gobj, flags); + return drm_gem_prime_export(gobj, flags); } diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index 4cce11fd8836..fd5e9c3a2789 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -629,20 +629,19 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = { .vunmap = tegra_gem_prime_vunmap, }; -struct dma_buf *tegra_gem_prime_export(struct drm_device *drm, - struct drm_gem_object *gem, +struct dma_buf *tegra_gem_prime_export(struct drm_gem_object *gem, int flags) { DEFINE_DMA_BUF_EXPORT_INFO(exp_info); exp_info.exp_name = KBUILD_MODNAME; - exp_info.owner = drm->driver->fops->owner; + exp_info.owner = gem->dev->driver->fops->owner; exp_info.ops = &tegra_gem_prime_dmabuf_ops; exp_info.size = gem->size; exp_info.flags = flags; exp_info.priv = gem; - return drm_gem_dmabuf_export(drm, &exp_info); + return drm_gem_dmabuf_export(gem->dev, &exp_info); } struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm, diff --git a/drivers/gpu/drm/tegra/gem.h b/drivers/gpu/drm/tegra/gem.h index 6bd7dd7e55b4..85ebf83c7e43 100644 --- a/drivers/gpu/drm/tegra/gem.h +++ b/drivers/gpu/drm/tegra/gem.h @@ -73,8 +73,7 @@ extern const struct vm_operations_struct tegra_bo_vm_ops; int __tegra_gem_mmap(struct drm_gem_object *gem, struct vm_area_struct *vma); int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma); -struct dma_buf *tegra_gem_prime_export(struct drm_device *drm, - struct drm_gem_object *gem, +struct dma_buf *tegra_gem_prime_export(struct drm_gem_object *gem, int flags); struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm, struct dma_buf *buf); diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c index a28892146f7c..10a60e7e93d6 100644 --- a/drivers/gpu/drm/udl/udl_dmabuf.c +++ b/drivers/gpu/drm/udl/udl_dmabuf.c @@ -170,8 +170,7 @@ static const struct dma_buf_ops udl_dmabuf_ops = { .release = drm_gem_dmabuf_release, }; -struct dma_buf *udl_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, int flags) +struct dma_buf *udl_gem_prime_export(struct drm_gem_object *obj, int flags) { DEFINE_DMA_BUF_EXPORT_INFO(exp_info); @@ -180,7 +179,7 @@ struct dma_buf *udl_gem_prime_export(struct drm_device *dev, exp_info.flags = flags; exp_info.priv = obj; - return drm_gem_dmabuf_export(dev, &exp_info); + return drm_gem_dmabuf_export(obj->dev, &exp_info); } static int udl_prime_create(struct drm_device *dev, diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h index a928801026c1..9d0790be544f 100644 --- a/drivers/gpu/drm/udl/udl_drv.h +++ b/drivers/gpu/drm/udl/udl_drv.h @@ -126,8 +126,7 @@ int udl_gem_mmap(struct drm_file *file_priv, struct drm_device *dev, void udl_gem_free_object(struct drm_gem_object *gem_obj); struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev, size_t size); -struct dma_buf *udl_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, int flags); +struct dma_buf *udl_gem_prime_export(struct drm_gem_object *obj, int flags); struct drm_gem_object *udl_gem_prime_import(struct drm_device *dev, struct dma_buf *dma_buf); diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c index 1434bb829267..b0f9eb6632a2 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c @@ -658,8 +658,7 @@ static void vc4_bo_cache_time_timer(struct timer_list *t) schedule_work(&vc4->bo_cache.time_work); } -struct dma_buf * -vc4_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags) +struct dma_buf * vc4_prime_export(struct drm_gem_object *obj, int flags) { struct vc4_bo *bo = to_vc4_bo(obj); struct dma_buf *dmabuf; @@ -681,7 +680,7 @@ vc4_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags) return ERR_PTR(ret); } - dmabuf = drm_gem_prime_export(dev, obj, flags); + dmabuf = drm_gem_prime_export(obj, flags); if (IS_ERR(dmabuf)) vc4_bo_dec_usecnt(bo); diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h index 9170a24ec5f5..efd1ec3430f5 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -708,8 +708,7 @@ struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t size, int vc4_dumb_create(struct drm_file *file_priv, struct drm_device *dev, struct drm_mode_create_dumb *args); -struct dma_buf *vc4_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, int flags); +struct dma_buf *vc4_prime_export(struct drm_gem_object *obj, int flags); int vc4_create_bo_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); int vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data, diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c index eb17c0cd3727..72d43d5ec5ab 100644 --- a/drivers/gpu/drm/vgem/vgem_fence.c +++ b/drivers/gpu/drm/vgem/vgem_fence.c @@ -108,7 +108,7 @@ static int attach_dmabuf(struct drm_device *dev, if (obj->dma_buf) return 0; - dmabuf = dev->driver->gem_prime_export(dev, obj, 0); + dmabuf = dev->driver->gem_prime_export(obj, 0); if (IS_ERR(dmabuf)) return PTR_ERR(dmabuf); diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 7bc4795319c4..ec1c638927b0 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -584,8 +584,8 @@ struct drm_driver { * Export hook for GEM drivers. Deprecated in favour of * &drm_gem_object_funcs.export. */ - struct dma_buf * (*gem_prime_export)(struct drm_device *dev, - struct drm_gem_object *obj, int flags); + struct dma_buf * (*gem_prime_export)(struct drm_gem_object *obj, + int flags); /** * @gem_prime_import: * diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h index ee32b07f3eb0..d89311b822d5 100644 --- a/include/drm/drm_prime.h +++ b/include/drm/drm_prime.h @@ -91,8 +91,7 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma); struct sg_table *drm_prime_pages_to_sg(struct page **pages, unsigned int nr_pages); -struct dma_buf *drm_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, +struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj, int flags); /* helper functions for importing */ -- 2.20.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 18+ messages in thread
[parent not found: <20190614203615.12639-10-daniel.vetter-/w4YWyX8dFk@public.gmane.org>]
* Re: [PATCH 09/59] drm/prime: Align gem_prime_export with obj_funcs.export [not found] ` <20190614203615.12639-10-daniel.vetter-/w4YWyX8dFk@public.gmane.org> @ 2019-06-17 9:32 ` Koenig, Christian 2019-06-17 9:53 ` Thierry Reding 2019-06-21 10:37 ` Daniel Vetter 2 siblings, 0 replies; 18+ messages in thread From: Koenig, Christian @ 2019-06-17 9:32 UTC (permalink / raw) To: Daniel Vetter, DRI Development Cc: Kate Stewart, Maxime Ripard, Xu, Feifei, Joonas Lahtinen, Chris Wilson, Eric Anholt, Thomas Zimmermann, Thierry Reding, Jilayne Lovejoy, Daniel Vetter, Sumit Semwal, Zhou, David(ChunMing), Mika Kuoppala, Russell King, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Jonathan Hunter, David Airlie, Tomi Valkeinen, Matthew Auld, Dave Airlie, Zhi Wang Am 14.06.19 um 22:35 schrieb Daniel Vetter: > The idea is that gem_prime_export is deprecated in favor of > obj_funcs.export. That's much easier to do if both have matching > function signatures. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Russell King <linux@armlinux.org.uk> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Maxime Ripard <maxime.ripard@bootlin.com> > Cc: Sean Paul <sean@poorly.run> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Zhenyu Wang <zhenyuw@linux.intel.com> > Cc: Zhi Wang <zhi.a.wang@intel.com> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > Cc: Alex Deucher <alexander.deucher@amd.com> > Cc: "Christian König" <christian.koenig@amd.com> > Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Jonathan Hunter <jonathanh@nvidia.com> > Cc: Dave Airlie <airlied@redhat.com> > Cc: Eric Anholt <eric@anholt.net> > Cc: "Michel Dänzer" <michel.daenzer@amd.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Huang Rui <ray.huang@amd.com> > Cc: Felix Kuehling <Felix.Kuehling@amd.com> > Cc: Hawking Zhang <Hawking.Zhang@amd.com> > Cc: Feifei Xu <Feifei.Xu@amd.com> > Cc: Jim Qu <Jim.Qu@amd.com> > Cc: Evan Quan <evan.quan@amd.com> > Cc: Matthew Auld <matthew.auld@intel.com> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > Cc: Thomas Zimmermann <tdz@users.sourceforge.net> > Cc: Kate Stewart <kstewart@linuxfoundation.org> > Cc: Sumit Semwal <sumit.semwal@linaro.org> > Cc: Jilayne Lovejoy <opensource@jilayne.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Mikulas Patocka <mpatocka@redhat.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Junwei Zhang <Jerry.Zhang@amd.com> > Cc: intel-gvt-dev@lists.freedesktop.org > Cc: intel-gfx@lists.freedesktop.org > Cc: amd-gfx@lists.freedesktop.org > Cc: linux-tegra@vger.kernel.org Acked-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 7 +++---- > drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 3 +-- > drivers/gpu/drm/armada/armada_gem.c | 5 ++--- > drivers/gpu/drm/armada/armada_gem.h | 3 +-- > drivers/gpu/drm/drm_prime.c | 9 ++++----- > drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 5 ++--- > drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 8 ++++---- > drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- > drivers/gpu/drm/i915/i915_drv.h | 3 +-- > drivers/gpu/drm/omapdrm/omap_gem.h | 3 +-- > drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 5 ++--- > drivers/gpu/drm/radeon/radeon_drv.c | 3 +-- > drivers/gpu/drm/radeon/radeon_prime.c | 5 ++--- > drivers/gpu/drm/tegra/gem.c | 7 +++---- > drivers/gpu/drm/tegra/gem.h | 3 +-- > drivers/gpu/drm/udl/udl_dmabuf.c | 5 ++--- > drivers/gpu/drm/udl/udl_drv.h | 3 +-- > drivers/gpu/drm/vc4/vc4_bo.c | 5 ++--- > drivers/gpu/drm/vc4/vc4_drv.h | 3 +-- > drivers/gpu/drm/vgem/vgem_fence.c | 2 +- > include/drm/drm_drv.h | 4 ++-- > include/drm/drm_prime.h | 3 +-- > 22 files changed, 39 insertions(+), 57 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c > index 489041df1f45..4809d4a5d72a 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c > @@ -345,8 +345,7 @@ const struct dma_buf_ops amdgpu_dmabuf_ops = { > * Returns: > * Shared DMA buffer representing the GEM BO from the given device. > */ > -struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gobj, > +struct dma_buf *amdgpu_gem_prime_export(struct drm_gem_object *gobj, > int flags) > { > struct amdgpu_bo *bo = gem_to_amdgpu_bo(gobj); > @@ -356,9 +355,9 @@ struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, > bo->flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID) > return ERR_PTR(-EPERM); > > - buf = drm_gem_prime_export(dev, gobj, flags); > + buf = drm_gem_prime_export(gobj, flags); > if (!IS_ERR(buf)) { > - buf->file->f_mapping = dev->anon_inode->i_mapping; > + buf->file->f_mapping = gobj->dev->anon_inode->i_mapping; > buf->ops = &amdgpu_dmabuf_ops; > } > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h > index c7056cbe8685..7f73a4f94204 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h > @@ -30,8 +30,7 @@ struct drm_gem_object * > amdgpu_gem_prime_import_sg_table(struct drm_device *dev, > struct dma_buf_attachment *attach, > struct sg_table *sg); > -struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gobj, > +struct dma_buf *amdgpu_gem_prime_export(struct drm_gem_object *gobj, > int flags); > struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev, > struct dma_buf *dma_buf); > diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c > index 642d0e70d0f8..7e7fcc3f1f7f 100644 > --- a/drivers/gpu/drm/armada/armada_gem.c > +++ b/drivers/gpu/drm/armada/armada_gem.c > @@ -485,8 +485,7 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = { > }; > > struct dma_buf * > -armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, > - int flags) > +armada_gem_prime_export(struct drm_gem_object *obj, int flags) > { > DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > > @@ -495,7 +494,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, > exp_info.flags = O_RDWR; > exp_info.priv = obj; > > - return drm_gem_dmabuf_export(dev, &exp_info); > + return drm_gem_dmabuf_export(obj->dev, &exp_info); > } > > struct drm_gem_object * > diff --git a/drivers/gpu/drm/armada/armada_gem.h b/drivers/gpu/drm/armada/armada_gem.h > index 1ac90792b166..c619381eeeff 100644 > --- a/drivers/gpu/drm/armada/armada_gem.h > +++ b/drivers/gpu/drm/armada/armada_gem.h > @@ -35,8 +35,7 @@ struct armada_gem_object *armada_gem_alloc_private_object(struct drm_device *, > size_t); > int armada_gem_dumb_create(struct drm_file *, struct drm_device *, > struct drm_mode_create_dumb *); > -struct dma_buf *armada_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags); > +struct dma_buf *armada_gem_prime_export(struct drm_gem_object *obj, int flags); > struct drm_gem_object *armada_gem_prime_import(struct drm_device *, > struct dma_buf *); > int armada_gem_map_import(struct armada_gem_object *); > diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c > index 78f6f10b2060..d545e681cb41 100644 > --- a/drivers/gpu/drm/drm_prime.c > +++ b/drivers/gpu/drm/drm_prime.c > @@ -382,9 +382,9 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev, > if (obj->funcs && obj->funcs->export) > dmabuf = obj->funcs->export(obj, flags); > else if (dev->driver->gem_prime_export) > - dmabuf = dev->driver->gem_prime_export(dev, obj, flags); > + dmabuf = dev->driver->gem_prime_export(obj, flags); > else > - dmabuf = drm_gem_prime_export(dev, obj, flags); > + dmabuf = drm_gem_prime_export(obj, flags); > if (IS_ERR(dmabuf)) { > /* normally the created dma-buf takes ownership of the ref, > * but if that fails then drop the ref > @@ -812,17 +812,16 @@ EXPORT_SYMBOL(drm_prime_pages_to_sg); > > /** > * drm_gem_prime_export - helper library implementation of the export callback > - * @dev: drm_device to export from > * @obj: GEM object to export > * @flags: flags like DRM_CLOEXEC and DRM_RDWR > * > * This is the implementation of the &drm_gem_object_funcs.export functions for GEM drivers > * using the PRIME helpers. > */ > -struct dma_buf *drm_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, > +struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj, > int flags) > { > + struct drm_device *dev = obj->dev; > struct dma_buf_export_info exp_info = { > .exp_name = KBUILD_MODNAME, /* white lie for debug */ > .owner = dev->driver->fops->owner, > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > index a93e233cfaa9..50b1b73c303a 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > @@ -204,8 +204,7 @@ static const struct dma_buf_ops i915_dmabuf_ops = { > .end_cpu_access = i915_gem_end_cpu_access, > }; > > -struct dma_buf *i915_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gem_obj, int flags) > +struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags) > { > struct drm_i915_gem_object *obj = to_intel_bo(gem_obj); > DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > @@ -222,7 +221,7 @@ struct dma_buf *i915_gem_prime_export(struct drm_device *dev, > return ERR_PTR(ret); > } > > - return drm_gem_dmabuf_export(dev, &exp_info); > + return drm_gem_dmabuf_export(gem_obj->dev, &exp_info); > } > > static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj) > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c > index e3a64edef918..d85d1ce273ca 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c > @@ -20,7 +20,7 @@ static int igt_dmabuf_export(void *arg) > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); > + dmabuf = i915_gem_prime_export(&obj->base, 0); > i915_gem_object_put(obj); > if (IS_ERR(dmabuf)) { > pr_err("i915_gem_prime_export failed with err=%d\n", > @@ -44,7 +44,7 @@ static int igt_dmabuf_import_self(void *arg) > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); > + dmabuf = i915_gem_prime_export(&obj->base, 0); > if (IS_ERR(dmabuf)) { > pr_err("i915_gem_prime_export failed with err=%d\n", > (int)PTR_ERR(dmabuf)); > @@ -219,7 +219,7 @@ static int igt_dmabuf_export_vmap(void *arg) > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); > + dmabuf = i915_gem_prime_export(&obj->base, 0); > if (IS_ERR(dmabuf)) { > pr_err("i915_gem_prime_export failed with err=%d\n", > (int)PTR_ERR(dmabuf)); > @@ -266,7 +266,7 @@ static int igt_dmabuf_export_kmap(void *arg) > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); > + dmabuf = i915_gem_prime_export(&obj->base, 0); > i915_gem_object_put(obj); > if (IS_ERR(dmabuf)) { > err = PTR_ERR(dmabuf); > diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/dmabuf.c > index 41c8ebc60c63..13044c027f27 100644 > --- a/drivers/gpu/drm/i915/gvt/dmabuf.c > +++ b/drivers/gpu/drm/i915/gvt/dmabuf.c > @@ -491,7 +491,7 @@ int intel_vgpu_get_dmabuf(struct intel_vgpu *vgpu, unsigned int dmabuf_id) > > obj->gvt_info = dmabuf_obj->info; > > - dmabuf = i915_gem_prime_export(dev, &obj->base, DRM_CLOEXEC | DRM_RDWR); > + dmabuf = i915_gem_prime_export(&obj->base, DRM_CLOEXEC | DRM_RDWR); > if (IS_ERR(dmabuf)) { > gvt_vgpu_err("export dma-buf failed\n"); > ret = PTR_ERR(dmabuf); > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 9dce1c71bb9d..a8af77162567 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -2587,8 +2587,7 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj, > struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, > struct dma_buf *dma_buf); > > -struct dma_buf *i915_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gem_obj, int flags); > +struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags); > > static inline struct i915_gem_context * > __i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id) > diff --git a/drivers/gpu/drm/omapdrm/omap_gem.h b/drivers/gpu/drm/omapdrm/omap_gem.h > index c1c45fbde155..ee0f217cf59d 100644 > --- a/drivers/gpu/drm/omapdrm/omap_gem.h > +++ b/drivers/gpu/drm/omapdrm/omap_gem.h > @@ -76,8 +76,7 @@ u64 omap_gem_mmap_offset(struct drm_gem_object *obj); > size_t omap_gem_mmap_size(struct drm_gem_object *obj); > > /* PRIME Interface */ > -struct dma_buf *omap_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags); > +struct dma_buf *omap_gem_prime_export(struct drm_gem_object *obj, int flags); > struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev, > struct dma_buf *buffer); > > diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c > index 0f8b597ccd10..7e7ad275e3cf 100644 > --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c > +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c > @@ -136,8 +136,7 @@ static const struct dma_buf_ops omap_dmabuf_ops = { > .mmap = omap_gem_dmabuf_mmap, > }; > > -struct dma_buf *omap_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags) > +struct dma_buf *omap_gem_prime_export(struct drm_gem_object *obj, int flags) > { > DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > > @@ -146,7 +145,7 @@ struct dma_buf *omap_gem_prime_export(struct drm_device *dev, > exp_info.flags = flags; > exp_info.priv = obj; > > - return drm_gem_dmabuf_export(dev, &exp_info); > + return drm_gem_dmabuf_export(obj->dev, &exp_info); > } > > /* ----------------------------------------------------------------------------- > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c > index 3b07aa6e551d..4a6acaa3f843 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -130,8 +130,7 @@ int radeon_gem_object_open(struct drm_gem_object *obj, > struct drm_file *file_priv); > void radeon_gem_object_close(struct drm_gem_object *obj, > struct drm_file *file_priv); > -struct dma_buf *radeon_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gobj, > +struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, > int flags); > extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int crtc, > unsigned int flags, int *vpos, int *hpos, > diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c > index d3a5bea9a2c5..deaffce50a2e 100644 > --- a/drivers/gpu/drm/radeon/radeon_prime.c > +++ b/drivers/gpu/drm/radeon/radeon_prime.c > @@ -124,12 +124,11 @@ struct reservation_object *radeon_gem_prime_res_obj(struct drm_gem_object *obj) > return bo->tbo.resv; > } > > -struct dma_buf *radeon_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gobj, > +struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, > int flags) > { > struct radeon_bo *bo = gem_to_radeon_bo(gobj); > if (radeon_ttm_tt_has_userptr(bo->tbo.ttm)) > return ERR_PTR(-EPERM); > - return drm_gem_prime_export(dev, gobj, flags); > + return drm_gem_prime_export(gobj, flags); > } > diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c > index 4cce11fd8836..fd5e9c3a2789 100644 > --- a/drivers/gpu/drm/tegra/gem.c > +++ b/drivers/gpu/drm/tegra/gem.c > @@ -629,20 +629,19 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = { > .vunmap = tegra_gem_prime_vunmap, > }; > > -struct dma_buf *tegra_gem_prime_export(struct drm_device *drm, > - struct drm_gem_object *gem, > +struct dma_buf *tegra_gem_prime_export(struct drm_gem_object *gem, > int flags) > { > DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > > exp_info.exp_name = KBUILD_MODNAME; > - exp_info.owner = drm->driver->fops->owner; > + exp_info.owner = gem->dev->driver->fops->owner; > exp_info.ops = &tegra_gem_prime_dmabuf_ops; > exp_info.size = gem->size; > exp_info.flags = flags; > exp_info.priv = gem; > > - return drm_gem_dmabuf_export(drm, &exp_info); > + return drm_gem_dmabuf_export(gem->dev, &exp_info); > } > > struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm, > diff --git a/drivers/gpu/drm/tegra/gem.h b/drivers/gpu/drm/tegra/gem.h > index 6bd7dd7e55b4..85ebf83c7e43 100644 > --- a/drivers/gpu/drm/tegra/gem.h > +++ b/drivers/gpu/drm/tegra/gem.h > @@ -73,8 +73,7 @@ extern const struct vm_operations_struct tegra_bo_vm_ops; > int __tegra_gem_mmap(struct drm_gem_object *gem, struct vm_area_struct *vma); > int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma); > > -struct dma_buf *tegra_gem_prime_export(struct drm_device *drm, > - struct drm_gem_object *gem, > +struct dma_buf *tegra_gem_prime_export(struct drm_gem_object *gem, > int flags); > struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm, > struct dma_buf *buf); > diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c > index a28892146f7c..10a60e7e93d6 100644 > --- a/drivers/gpu/drm/udl/udl_dmabuf.c > +++ b/drivers/gpu/drm/udl/udl_dmabuf.c > @@ -170,8 +170,7 @@ static const struct dma_buf_ops udl_dmabuf_ops = { > .release = drm_gem_dmabuf_release, > }; > > -struct dma_buf *udl_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags) > +struct dma_buf *udl_gem_prime_export(struct drm_gem_object *obj, int flags) > { > DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > > @@ -180,7 +179,7 @@ struct dma_buf *udl_gem_prime_export(struct drm_device *dev, > exp_info.flags = flags; > exp_info.priv = obj; > > - return drm_gem_dmabuf_export(dev, &exp_info); > + return drm_gem_dmabuf_export(obj->dev, &exp_info); > } > > static int udl_prime_create(struct drm_device *dev, > diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h > index a928801026c1..9d0790be544f 100644 > --- a/drivers/gpu/drm/udl/udl_drv.h > +++ b/drivers/gpu/drm/udl/udl_drv.h > @@ -126,8 +126,7 @@ int udl_gem_mmap(struct drm_file *file_priv, struct drm_device *dev, > void udl_gem_free_object(struct drm_gem_object *gem_obj); > struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev, > size_t size); > -struct dma_buf *udl_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags); > +struct dma_buf *udl_gem_prime_export(struct drm_gem_object *obj, int flags); > struct drm_gem_object *udl_gem_prime_import(struct drm_device *dev, > struct dma_buf *dma_buf); > > diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c > index 1434bb829267..b0f9eb6632a2 100644 > --- a/drivers/gpu/drm/vc4/vc4_bo.c > +++ b/drivers/gpu/drm/vc4/vc4_bo.c > @@ -658,8 +658,7 @@ static void vc4_bo_cache_time_timer(struct timer_list *t) > schedule_work(&vc4->bo_cache.time_work); > } > > -struct dma_buf * > -vc4_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags) > +struct dma_buf * vc4_prime_export(struct drm_gem_object *obj, int flags) > { > struct vc4_bo *bo = to_vc4_bo(obj); > struct dma_buf *dmabuf; > @@ -681,7 +680,7 @@ vc4_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags) > return ERR_PTR(ret); > } > > - dmabuf = drm_gem_prime_export(dev, obj, flags); > + dmabuf = drm_gem_prime_export(obj, flags); > if (IS_ERR(dmabuf)) > vc4_bo_dec_usecnt(bo); > > diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h > index 9170a24ec5f5..efd1ec3430f5 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.h > +++ b/drivers/gpu/drm/vc4/vc4_drv.h > @@ -708,8 +708,7 @@ struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t size, > int vc4_dumb_create(struct drm_file *file_priv, > struct drm_device *dev, > struct drm_mode_create_dumb *args); > -struct dma_buf *vc4_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags); > +struct dma_buf *vc4_prime_export(struct drm_gem_object *obj, int flags); > int vc4_create_bo_ioctl(struct drm_device *dev, void *data, > struct drm_file *file_priv); > int vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data, > diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c > index eb17c0cd3727..72d43d5ec5ab 100644 > --- a/drivers/gpu/drm/vgem/vgem_fence.c > +++ b/drivers/gpu/drm/vgem/vgem_fence.c > @@ -108,7 +108,7 @@ static int attach_dmabuf(struct drm_device *dev, > if (obj->dma_buf) > return 0; > > - dmabuf = dev->driver->gem_prime_export(dev, obj, 0); > + dmabuf = dev->driver->gem_prime_export(obj, 0); > if (IS_ERR(dmabuf)) > return PTR_ERR(dmabuf); > > diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h > index 7bc4795319c4..ec1c638927b0 100644 > --- a/include/drm/drm_drv.h > +++ b/include/drm/drm_drv.h > @@ -584,8 +584,8 @@ struct drm_driver { > * Export hook for GEM drivers. Deprecated in favour of > * &drm_gem_object_funcs.export. > */ > - struct dma_buf * (*gem_prime_export)(struct drm_device *dev, > - struct drm_gem_object *obj, int flags); > + struct dma_buf * (*gem_prime_export)(struct drm_gem_object *obj, > + int flags); > /** > * @gem_prime_import: > * > diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h > index ee32b07f3eb0..d89311b822d5 100644 > --- a/include/drm/drm_prime.h > +++ b/include/drm/drm_prime.h > @@ -91,8 +91,7 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); > int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma); > > struct sg_table *drm_prime_pages_to_sg(struct page **pages, unsigned int nr_pages); > -struct dma_buf *drm_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, > +struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj, > int flags); > > /* helper functions for importing */ _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 09/59] drm/prime: Align gem_prime_export with obj_funcs.export [not found] ` <20190614203615.12639-10-daniel.vetter-/w4YWyX8dFk@public.gmane.org> 2019-06-17 9:32 ` Koenig, Christian @ 2019-06-17 9:53 ` Thierry Reding 2019-06-21 10:37 ` Daniel Vetter 2 siblings, 0 replies; 18+ messages in thread From: Thierry Reding @ 2019-06-17 9:53 UTC (permalink / raw) To: Daniel Vetter Cc: Kate Stewart, Maxime Ripard, Feifei Xu, Joonas Lahtinen, DRI Development, Chris Wilson, Eric Anholt, Thomas Zimmermann, Huang Rui, Jilayne Lovejoy, Daniel Vetter, Sumit Semwal, David (ChunMing) Zhou, Mika Kuoppala, Russell King, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Jonathan Hunter, David Airlie, Tomi Valkeinen, Matthew Auld, Dave Airlie, Zhi Wang [-- Attachment #1.1: Type: text/plain, Size: 4792 bytes --] On Fri, Jun 14, 2019 at 10:35:25PM +0200, Daniel Vetter wrote: > The idea is that gem_prime_export is deprecated in favor of > obj_funcs.export. That's much easier to do if both have matching > function signatures. > > Signed-off-by: Daniel Vetter <daniel.vetter-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > Cc: Russell King <linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> > Cc: Maarten Lankhorst <maarten.lankhorst-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > Cc: Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org> > Cc: Sean Paul <sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org> > Cc: David Airlie <airlied-cv59FeDIM0c@public.gmane.org> > Cc: Daniel Vetter <daniel-/w4YWyX8dFk@public.gmane.org> > Cc: Zhenyu Wang <zhenyuw-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > Cc: Zhi Wang <zhi.a.wang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > Cc: Jani Nikula <jani.nikula-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > Cc: Joonas Lahtinen <joonas.lahtinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > Cc: Rodrigo Vivi <rodrigo.vivi-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > Cc: Tomi Valkeinen <tomi.valkeinen-l0cyMroinI0@public.gmane.org> > Cc: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org> > Cc: "Christian König" <christian.koenig-5C7GfCeVMHo@public.gmane.org> > Cc: "David (ChunMing) Zhou" <David1.Zhou-5C7GfCeVMHo@public.gmane.org> > Cc: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > Cc: Jonathan Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> > Cc: Dave Airlie <airlied-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > Cc: Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org> > Cc: "Michel Dänzer" <michel.daenzer-5C7GfCeVMHo@public.gmane.org> > Cc: Chris Wilson <chris-Y6uKTt2uX1cEflXRtASbqLVCufUGDwFn@public.gmane.org> > Cc: Huang Rui <ray.huang-5C7GfCeVMHo@public.gmane.org> > Cc: Felix Kuehling <Felix.Kuehling-5C7GfCeVMHo@public.gmane.org> > Cc: Hawking Zhang <Hawking.Zhang-5C7GfCeVMHo@public.gmane.org> > Cc: Feifei Xu <Feifei.Xu-5C7GfCeVMHo@public.gmane.org> > Cc: Jim Qu <Jim.Qu-5C7GfCeVMHo@public.gmane.org> > Cc: Evan Quan <evan.quan-5C7GfCeVMHo@public.gmane.org> > Cc: Matthew Auld <matthew.auld-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > Cc: Mika Kuoppala <mika.kuoppala-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > Cc: Thomas Zimmermann <tdz-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org> > Cc: Kate Stewart <kstewart-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> > Cc: Sumit Semwal <sumit.semwal-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > Cc: Jilayne Lovejoy <opensource-y0T6pEZso2lBDgjK7y7TUQ@public.gmane.org> > Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> > Cc: Mikulas Patocka <mpatocka-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > Cc: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> > Cc: Junwei Zhang <Jerry.Zhang-5C7GfCeVMHo@public.gmane.org> > Cc: intel-gvt-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > Cc: intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 7 +++---- > drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 3 +-- > drivers/gpu/drm/armada/armada_gem.c | 5 ++--- > drivers/gpu/drm/armada/armada_gem.h | 3 +-- > drivers/gpu/drm/drm_prime.c | 9 ++++----- > drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 5 ++--- > drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 8 ++++---- > drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- > drivers/gpu/drm/i915/i915_drv.h | 3 +-- > drivers/gpu/drm/omapdrm/omap_gem.h | 3 +-- > drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 5 ++--- > drivers/gpu/drm/radeon/radeon_drv.c | 3 +-- > drivers/gpu/drm/radeon/radeon_prime.c | 5 ++--- > drivers/gpu/drm/tegra/gem.c | 7 +++---- > drivers/gpu/drm/tegra/gem.h | 3 +-- > drivers/gpu/drm/udl/udl_dmabuf.c | 5 ++--- > drivers/gpu/drm/udl/udl_drv.h | 3 +-- > drivers/gpu/drm/vc4/vc4_bo.c | 5 ++--- > drivers/gpu/drm/vc4/vc4_drv.h | 3 +-- > drivers/gpu/drm/vgem/vgem_fence.c | 2 +- > include/drm/drm_drv.h | 4 ++-- > include/drm/drm_prime.h | 3 +-- > 22 files changed, 39 insertions(+), 57 deletions(-) Acked-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 153 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 09/59] drm/prime: Align gem_prime_export with obj_funcs.export [not found] ` <20190614203615.12639-10-daniel.vetter-/w4YWyX8dFk@public.gmane.org> 2019-06-17 9:32 ` Koenig, Christian 2019-06-17 9:53 ` Thierry Reding @ 2019-06-21 10:37 ` Daniel Vetter 2 siblings, 0 replies; 18+ messages in thread From: Daniel Vetter @ 2019-06-21 10:37 UTC (permalink / raw) To: DRI Development Cc: Kate Stewart, Maxime Ripard, Daniel Vetter, Joonas Lahtinen, Chris Wilson, Eric Anholt, Thomas Zimmermann, Thierry Reding, Jilayne Lovejoy, Daniel Vetter, Sumit Semwal, David (ChunMing) Zhou, Mika Kuoppala, Russell King, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Jonathan Hunter, David Airlie, Tomi Valkeinen, Matthew Auld, Feifei Xu, Dave Airlie, Zhi Wang On Fri, Jun 14, 2019 at 10:35:25PM +0200, Daniel Vetter wrote: > The idea is that gem_prime_export is deprecated in favor of > obj_funcs.export. That's much easier to do if both have matching > function signatures. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Russell King <linux@armlinux.org.uk> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Maxime Ripard <maxime.ripard@bootlin.com> > Cc: Sean Paul <sean@poorly.run> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Zhenyu Wang <zhenyuw@linux.intel.com> > Cc: Zhi Wang <zhi.a.wang@intel.com> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > Cc: Alex Deucher <alexander.deucher@amd.com> > Cc: "Christian König" <christian.koenig@amd.com> > Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Jonathan Hunter <jonathanh@nvidia.com> > Cc: Dave Airlie <airlied@redhat.com> > Cc: Eric Anholt <eric@anholt.net> > Cc: "Michel Dänzer" <michel.daenzer@amd.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Huang Rui <ray.huang@amd.com> > Cc: Felix Kuehling <Felix.Kuehling@amd.com> > Cc: Hawking Zhang <Hawking.Zhang@amd.com> > Cc: Feifei Xu <Feifei.Xu@amd.com> > Cc: Jim Qu <Jim.Qu@amd.com> > Cc: Evan Quan <evan.quan@amd.com> > Cc: Matthew Auld <matthew.auld@intel.com> > Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> > Cc: Thomas Zimmermann <tdz@users.sourceforge.net> > Cc: Kate Stewart <kstewart@linuxfoundation.org> > Cc: Sumit Semwal <sumit.semwal@linaro.org> > Cc: Jilayne Lovejoy <opensource@jilayne.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Mikulas Patocka <mpatocka@redhat.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Junwei Zhang <Jerry.Zhang@amd.com> > Cc: intel-gvt-dev@lists.freedesktop.org > Cc: intel-gfx@lists.freedesktop.org > Cc: amd-gfx@lists.freedesktop.org > Cc: linux-tegra@vger.kernel.org Merged up to this one to drm-misc-next (for 5.4), thanks everyone for the review and comments thus far. -Daniel > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 7 +++---- > drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 3 +-- > drivers/gpu/drm/armada/armada_gem.c | 5 ++--- > drivers/gpu/drm/armada/armada_gem.h | 3 +-- > drivers/gpu/drm/drm_prime.c | 9 ++++----- > drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 5 ++--- > drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 8 ++++---- > drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- > drivers/gpu/drm/i915/i915_drv.h | 3 +-- > drivers/gpu/drm/omapdrm/omap_gem.h | 3 +-- > drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 5 ++--- > drivers/gpu/drm/radeon/radeon_drv.c | 3 +-- > drivers/gpu/drm/radeon/radeon_prime.c | 5 ++--- > drivers/gpu/drm/tegra/gem.c | 7 +++---- > drivers/gpu/drm/tegra/gem.h | 3 +-- > drivers/gpu/drm/udl/udl_dmabuf.c | 5 ++--- > drivers/gpu/drm/udl/udl_drv.h | 3 +-- > drivers/gpu/drm/vc4/vc4_bo.c | 5 ++--- > drivers/gpu/drm/vc4/vc4_drv.h | 3 +-- > drivers/gpu/drm/vgem/vgem_fence.c | 2 +- > include/drm/drm_drv.h | 4 ++-- > include/drm/drm_prime.h | 3 +-- > 22 files changed, 39 insertions(+), 57 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c > index 489041df1f45..4809d4a5d72a 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c > @@ -345,8 +345,7 @@ const struct dma_buf_ops amdgpu_dmabuf_ops = { > * Returns: > * Shared DMA buffer representing the GEM BO from the given device. > */ > -struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gobj, > +struct dma_buf *amdgpu_gem_prime_export(struct drm_gem_object *gobj, > int flags) > { > struct amdgpu_bo *bo = gem_to_amdgpu_bo(gobj); > @@ -356,9 +355,9 @@ struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, > bo->flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID) > return ERR_PTR(-EPERM); > > - buf = drm_gem_prime_export(dev, gobj, flags); > + buf = drm_gem_prime_export(gobj, flags); > if (!IS_ERR(buf)) { > - buf->file->f_mapping = dev->anon_inode->i_mapping; > + buf->file->f_mapping = gobj->dev->anon_inode->i_mapping; > buf->ops = &amdgpu_dmabuf_ops; > } > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h > index c7056cbe8685..7f73a4f94204 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h > @@ -30,8 +30,7 @@ struct drm_gem_object * > amdgpu_gem_prime_import_sg_table(struct drm_device *dev, > struct dma_buf_attachment *attach, > struct sg_table *sg); > -struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gobj, > +struct dma_buf *amdgpu_gem_prime_export(struct drm_gem_object *gobj, > int flags); > struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev, > struct dma_buf *dma_buf); > diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c > index 642d0e70d0f8..7e7fcc3f1f7f 100644 > --- a/drivers/gpu/drm/armada/armada_gem.c > +++ b/drivers/gpu/drm/armada/armada_gem.c > @@ -485,8 +485,7 @@ static const struct dma_buf_ops armada_gem_prime_dmabuf_ops = { > }; > > struct dma_buf * > -armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, > - int flags) > +armada_gem_prime_export(struct drm_gem_object *obj, int flags) > { > DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > > @@ -495,7 +494,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, > exp_info.flags = O_RDWR; > exp_info.priv = obj; > > - return drm_gem_dmabuf_export(dev, &exp_info); > + return drm_gem_dmabuf_export(obj->dev, &exp_info); > } > > struct drm_gem_object * > diff --git a/drivers/gpu/drm/armada/armada_gem.h b/drivers/gpu/drm/armada/armada_gem.h > index 1ac90792b166..c619381eeeff 100644 > --- a/drivers/gpu/drm/armada/armada_gem.h > +++ b/drivers/gpu/drm/armada/armada_gem.h > @@ -35,8 +35,7 @@ struct armada_gem_object *armada_gem_alloc_private_object(struct drm_device *, > size_t); > int armada_gem_dumb_create(struct drm_file *, struct drm_device *, > struct drm_mode_create_dumb *); > -struct dma_buf *armada_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags); > +struct dma_buf *armada_gem_prime_export(struct drm_gem_object *obj, int flags); > struct drm_gem_object *armada_gem_prime_import(struct drm_device *, > struct dma_buf *); > int armada_gem_map_import(struct armada_gem_object *); > diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c > index 78f6f10b2060..d545e681cb41 100644 > --- a/drivers/gpu/drm/drm_prime.c > +++ b/drivers/gpu/drm/drm_prime.c > @@ -382,9 +382,9 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev, > if (obj->funcs && obj->funcs->export) > dmabuf = obj->funcs->export(obj, flags); > else if (dev->driver->gem_prime_export) > - dmabuf = dev->driver->gem_prime_export(dev, obj, flags); > + dmabuf = dev->driver->gem_prime_export(obj, flags); > else > - dmabuf = drm_gem_prime_export(dev, obj, flags); > + dmabuf = drm_gem_prime_export(obj, flags); > if (IS_ERR(dmabuf)) { > /* normally the created dma-buf takes ownership of the ref, > * but if that fails then drop the ref > @@ -812,17 +812,16 @@ EXPORT_SYMBOL(drm_prime_pages_to_sg); > > /** > * drm_gem_prime_export - helper library implementation of the export callback > - * @dev: drm_device to export from > * @obj: GEM object to export > * @flags: flags like DRM_CLOEXEC and DRM_RDWR > * > * This is the implementation of the &drm_gem_object_funcs.export functions for GEM drivers > * using the PRIME helpers. > */ > -struct dma_buf *drm_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, > +struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj, > int flags) > { > + struct drm_device *dev = obj->dev; > struct dma_buf_export_info exp_info = { > .exp_name = KBUILD_MODNAME, /* white lie for debug */ > .owner = dev->driver->fops->owner, > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > index a93e233cfaa9..50b1b73c303a 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c > @@ -204,8 +204,7 @@ static const struct dma_buf_ops i915_dmabuf_ops = { > .end_cpu_access = i915_gem_end_cpu_access, > }; > > -struct dma_buf *i915_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gem_obj, int flags) > +struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags) > { > struct drm_i915_gem_object *obj = to_intel_bo(gem_obj); > DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > @@ -222,7 +221,7 @@ struct dma_buf *i915_gem_prime_export(struct drm_device *dev, > return ERR_PTR(ret); > } > > - return drm_gem_dmabuf_export(dev, &exp_info); > + return drm_gem_dmabuf_export(gem_obj->dev, &exp_info); > } > > static int i915_gem_object_get_pages_dmabuf(struct drm_i915_gem_object *obj) > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c > index e3a64edef918..d85d1ce273ca 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c > @@ -20,7 +20,7 @@ static int igt_dmabuf_export(void *arg) > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); > + dmabuf = i915_gem_prime_export(&obj->base, 0); > i915_gem_object_put(obj); > if (IS_ERR(dmabuf)) { > pr_err("i915_gem_prime_export failed with err=%d\n", > @@ -44,7 +44,7 @@ static int igt_dmabuf_import_self(void *arg) > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); > + dmabuf = i915_gem_prime_export(&obj->base, 0); > if (IS_ERR(dmabuf)) { > pr_err("i915_gem_prime_export failed with err=%d\n", > (int)PTR_ERR(dmabuf)); > @@ -219,7 +219,7 @@ static int igt_dmabuf_export_vmap(void *arg) > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); > + dmabuf = i915_gem_prime_export(&obj->base, 0); > if (IS_ERR(dmabuf)) { > pr_err("i915_gem_prime_export failed with err=%d\n", > (int)PTR_ERR(dmabuf)); > @@ -266,7 +266,7 @@ static int igt_dmabuf_export_kmap(void *arg) > if (IS_ERR(obj)) > return PTR_ERR(obj); > > - dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0); > + dmabuf = i915_gem_prime_export(&obj->base, 0); > i915_gem_object_put(obj); > if (IS_ERR(dmabuf)) { > err = PTR_ERR(dmabuf); > diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/dmabuf.c > index 41c8ebc60c63..13044c027f27 100644 > --- a/drivers/gpu/drm/i915/gvt/dmabuf.c > +++ b/drivers/gpu/drm/i915/gvt/dmabuf.c > @@ -491,7 +491,7 @@ int intel_vgpu_get_dmabuf(struct intel_vgpu *vgpu, unsigned int dmabuf_id) > > obj->gvt_info = dmabuf_obj->info; > > - dmabuf = i915_gem_prime_export(dev, &obj->base, DRM_CLOEXEC | DRM_RDWR); > + dmabuf = i915_gem_prime_export(&obj->base, DRM_CLOEXEC | DRM_RDWR); > if (IS_ERR(dmabuf)) { > gvt_vgpu_err("export dma-buf failed\n"); > ret = PTR_ERR(dmabuf); > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 9dce1c71bb9d..a8af77162567 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -2587,8 +2587,7 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj, > struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, > struct dma_buf *dma_buf); > > -struct dma_buf *i915_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gem_obj, int flags); > +struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags); > > static inline struct i915_gem_context * > __i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id) > diff --git a/drivers/gpu/drm/omapdrm/omap_gem.h b/drivers/gpu/drm/omapdrm/omap_gem.h > index c1c45fbde155..ee0f217cf59d 100644 > --- a/drivers/gpu/drm/omapdrm/omap_gem.h > +++ b/drivers/gpu/drm/omapdrm/omap_gem.h > @@ -76,8 +76,7 @@ u64 omap_gem_mmap_offset(struct drm_gem_object *obj); > size_t omap_gem_mmap_size(struct drm_gem_object *obj); > > /* PRIME Interface */ > -struct dma_buf *omap_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags); > +struct dma_buf *omap_gem_prime_export(struct drm_gem_object *obj, int flags); > struct drm_gem_object *omap_gem_prime_import(struct drm_device *dev, > struct dma_buf *buffer); > > diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c > index 0f8b597ccd10..7e7ad275e3cf 100644 > --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c > +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c > @@ -136,8 +136,7 @@ static const struct dma_buf_ops omap_dmabuf_ops = { > .mmap = omap_gem_dmabuf_mmap, > }; > > -struct dma_buf *omap_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags) > +struct dma_buf *omap_gem_prime_export(struct drm_gem_object *obj, int flags) > { > DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > > @@ -146,7 +145,7 @@ struct dma_buf *omap_gem_prime_export(struct drm_device *dev, > exp_info.flags = flags; > exp_info.priv = obj; > > - return drm_gem_dmabuf_export(dev, &exp_info); > + return drm_gem_dmabuf_export(obj->dev, &exp_info); > } > > /* ----------------------------------------------------------------------------- > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c > index 3b07aa6e551d..4a6acaa3f843 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -130,8 +130,7 @@ int radeon_gem_object_open(struct drm_gem_object *obj, > struct drm_file *file_priv); > void radeon_gem_object_close(struct drm_gem_object *obj, > struct drm_file *file_priv); > -struct dma_buf *radeon_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gobj, > +struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, > int flags); > extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int crtc, > unsigned int flags, int *vpos, int *hpos, > diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c > index d3a5bea9a2c5..deaffce50a2e 100644 > --- a/drivers/gpu/drm/radeon/radeon_prime.c > +++ b/drivers/gpu/drm/radeon/radeon_prime.c > @@ -124,12 +124,11 @@ struct reservation_object *radeon_gem_prime_res_obj(struct drm_gem_object *obj) > return bo->tbo.resv; > } > > -struct dma_buf *radeon_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *gobj, > +struct dma_buf *radeon_gem_prime_export(struct drm_gem_object *gobj, > int flags) > { > struct radeon_bo *bo = gem_to_radeon_bo(gobj); > if (radeon_ttm_tt_has_userptr(bo->tbo.ttm)) > return ERR_PTR(-EPERM); > - return drm_gem_prime_export(dev, gobj, flags); > + return drm_gem_prime_export(gobj, flags); > } > diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c > index 4cce11fd8836..fd5e9c3a2789 100644 > --- a/drivers/gpu/drm/tegra/gem.c > +++ b/drivers/gpu/drm/tegra/gem.c > @@ -629,20 +629,19 @@ static const struct dma_buf_ops tegra_gem_prime_dmabuf_ops = { > .vunmap = tegra_gem_prime_vunmap, > }; > > -struct dma_buf *tegra_gem_prime_export(struct drm_device *drm, > - struct drm_gem_object *gem, > +struct dma_buf *tegra_gem_prime_export(struct drm_gem_object *gem, > int flags) > { > DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > > exp_info.exp_name = KBUILD_MODNAME; > - exp_info.owner = drm->driver->fops->owner; > + exp_info.owner = gem->dev->driver->fops->owner; > exp_info.ops = &tegra_gem_prime_dmabuf_ops; > exp_info.size = gem->size; > exp_info.flags = flags; > exp_info.priv = gem; > > - return drm_gem_dmabuf_export(drm, &exp_info); > + return drm_gem_dmabuf_export(gem->dev, &exp_info); > } > > struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm, > diff --git a/drivers/gpu/drm/tegra/gem.h b/drivers/gpu/drm/tegra/gem.h > index 6bd7dd7e55b4..85ebf83c7e43 100644 > --- a/drivers/gpu/drm/tegra/gem.h > +++ b/drivers/gpu/drm/tegra/gem.h > @@ -73,8 +73,7 @@ extern const struct vm_operations_struct tegra_bo_vm_ops; > int __tegra_gem_mmap(struct drm_gem_object *gem, struct vm_area_struct *vma); > int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma); > > -struct dma_buf *tegra_gem_prime_export(struct drm_device *drm, > - struct drm_gem_object *gem, > +struct dma_buf *tegra_gem_prime_export(struct drm_gem_object *gem, > int flags); > struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm, > struct dma_buf *buf); > diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c > index a28892146f7c..10a60e7e93d6 100644 > --- a/drivers/gpu/drm/udl/udl_dmabuf.c > +++ b/drivers/gpu/drm/udl/udl_dmabuf.c > @@ -170,8 +170,7 @@ static const struct dma_buf_ops udl_dmabuf_ops = { > .release = drm_gem_dmabuf_release, > }; > > -struct dma_buf *udl_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags) > +struct dma_buf *udl_gem_prime_export(struct drm_gem_object *obj, int flags) > { > DEFINE_DMA_BUF_EXPORT_INFO(exp_info); > > @@ -180,7 +179,7 @@ struct dma_buf *udl_gem_prime_export(struct drm_device *dev, > exp_info.flags = flags; > exp_info.priv = obj; > > - return drm_gem_dmabuf_export(dev, &exp_info); > + return drm_gem_dmabuf_export(obj->dev, &exp_info); > } > > static int udl_prime_create(struct drm_device *dev, > diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h > index a928801026c1..9d0790be544f 100644 > --- a/drivers/gpu/drm/udl/udl_drv.h > +++ b/drivers/gpu/drm/udl/udl_drv.h > @@ -126,8 +126,7 @@ int udl_gem_mmap(struct drm_file *file_priv, struct drm_device *dev, > void udl_gem_free_object(struct drm_gem_object *gem_obj); > struct udl_gem_object *udl_gem_alloc_object(struct drm_device *dev, > size_t size); > -struct dma_buf *udl_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags); > +struct dma_buf *udl_gem_prime_export(struct drm_gem_object *obj, int flags); > struct drm_gem_object *udl_gem_prime_import(struct drm_device *dev, > struct dma_buf *dma_buf); > > diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c > index 1434bb829267..b0f9eb6632a2 100644 > --- a/drivers/gpu/drm/vc4/vc4_bo.c > +++ b/drivers/gpu/drm/vc4/vc4_bo.c > @@ -658,8 +658,7 @@ static void vc4_bo_cache_time_timer(struct timer_list *t) > schedule_work(&vc4->bo_cache.time_work); > } > > -struct dma_buf * > -vc4_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags) > +struct dma_buf * vc4_prime_export(struct drm_gem_object *obj, int flags) > { > struct vc4_bo *bo = to_vc4_bo(obj); > struct dma_buf *dmabuf; > @@ -681,7 +680,7 @@ vc4_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags) > return ERR_PTR(ret); > } > > - dmabuf = drm_gem_prime_export(dev, obj, flags); > + dmabuf = drm_gem_prime_export(obj, flags); > if (IS_ERR(dmabuf)) > vc4_bo_dec_usecnt(bo); > > diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h > index 9170a24ec5f5..efd1ec3430f5 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.h > +++ b/drivers/gpu/drm/vc4/vc4_drv.h > @@ -708,8 +708,7 @@ struct vc4_bo *vc4_bo_create(struct drm_device *dev, size_t size, > int vc4_dumb_create(struct drm_file *file_priv, > struct drm_device *dev, > struct drm_mode_create_dumb *args); > -struct dma_buf *vc4_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, int flags); > +struct dma_buf *vc4_prime_export(struct drm_gem_object *obj, int flags); > int vc4_create_bo_ioctl(struct drm_device *dev, void *data, > struct drm_file *file_priv); > int vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data, > diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c > index eb17c0cd3727..72d43d5ec5ab 100644 > --- a/drivers/gpu/drm/vgem/vgem_fence.c > +++ b/drivers/gpu/drm/vgem/vgem_fence.c > @@ -108,7 +108,7 @@ static int attach_dmabuf(struct drm_device *dev, > if (obj->dma_buf) > return 0; > > - dmabuf = dev->driver->gem_prime_export(dev, obj, 0); > + dmabuf = dev->driver->gem_prime_export(obj, 0); > if (IS_ERR(dmabuf)) > return PTR_ERR(dmabuf); > > diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h > index 7bc4795319c4..ec1c638927b0 100644 > --- a/include/drm/drm_drv.h > +++ b/include/drm/drm_drv.h > @@ -584,8 +584,8 @@ struct drm_driver { > * Export hook for GEM drivers. Deprecated in favour of > * &drm_gem_object_funcs.export. > */ > - struct dma_buf * (*gem_prime_export)(struct drm_device *dev, > - struct drm_gem_object *obj, int flags); > + struct dma_buf * (*gem_prime_export)(struct drm_gem_object *obj, > + int flags); > /** > * @gem_prime_import: > * > diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h > index ee32b07f3eb0..d89311b822d5 100644 > --- a/include/drm/drm_prime.h > +++ b/include/drm/drm_prime.h > @@ -91,8 +91,7 @@ int drm_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); > int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma); > > struct sg_table *drm_prime_pages_to_sg(struct page **pages, unsigned int nr_pages); > -struct dma_buf *drm_gem_prime_export(struct drm_device *dev, > - struct drm_gem_object *obj, > +struct dma_buf *drm_gem_prime_export(struct drm_gem_object *obj, > int flags); > > /* helper functions for importing */ > -- > 2.20.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <20190614203615.12639-59-daniel.vetter@ffwll.ch>]
* drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) [not found] ` <20190614203615.12639-59-daniel.vetter@ffwll.ch> @ 2019-06-18 15:19 ` Greg Kroah-Hartman 2019-06-18 15:25 ` Greg Kroah-Hartman ` (2 more replies) 0 siblings, 3 replies; 18+ messages in thread From: Greg Kroah-Hartman @ 2019-06-18 15:19 UTC (permalink / raw) To: Daniel Vetter Cc: Intel Graphics Development, DRI Development, Jonathan Hunter, Thierry Reding, linux-tegra, Daniel Vetter On Fri, Jun 14, 2019 at 10:36:14PM +0200, Daniel Vetter wrote: > Greg is busy already, but maybe he won't do everything ... > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > Documentation/gpu/todo.rst | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst > index 9717540ee28f..026e55c517e1 100644 > --- a/Documentation/gpu/todo.rst > +++ b/Documentation/gpu/todo.rst > @@ -375,6 +375,9 @@ There's a bunch of issues with it: > this (together with the drm_minor->drm_device move) would allow us to remove > debugfs_init. > > +- Drop the return code and error checking from all debugfs functions. Greg KH is > + working on this already. Part of this work was to try to delete drm_debugfs_remove_files(). There are only 4 files that currently still call this function: drivers/gpu/drm/tegra/dc.c drivers/gpu/drm/tegra/dsi.c drivers/gpu/drm/tegra/hdmi.c drivers/gpu/drm/tegra/sor.c For dc.c, the driver wants to add debugfs files to the struct drm_crtc debugfs directory. Which is fine, but it has to do some special memory allocation to get the debugfs callback to point not to the struct drm_minor pointer, but rather the drm_crtc structure. So, to remove this call, I need to remove this special memory allocation and to do that, I need to somehow be able to cast from drm_minor back to the drm_crtc structure being used in this driver. And I can't figure how they are related at all. Any pointers here (pun intended) would be appreciated. For the other 3 files, the situation is much the same, but I need to get from a 'struct drm_minor' pointer to a 'struct drm_connector' pointer. I could just "open code" a bunch of calls to debugfs_create_file() for these drivers, which would solve this issue, but in a more "non-drm" way. Is it worth to just do that instead of overthinking the whole thing and trying to squish it into the drm "model" of drm debugfs calls? Either way, who can test these changes? I can't even build the tegra driver without digging up an arm64 cross-compiler, and can't test it as I have no hardware at all. thanks, greg k-h _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) 2019-06-18 15:19 ` drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) Greg Kroah-Hartman @ 2019-06-18 15:25 ` Greg Kroah-Hartman 2019-06-18 17:32 ` Daniel Vetter 2019-06-18 15:37 ` Jon Hunter 2019-06-20 14:57 ` Thierry Reding 2 siblings, 1 reply; 18+ messages in thread From: Greg Kroah-Hartman @ 2019-06-18 15:25 UTC (permalink / raw) To: Daniel Vetter Cc: Intel Graphics Development, DRI Development, Jonathan Hunter, linux-tegra, Daniel Vetter On Tue, Jun 18, 2019 at 05:19:38PM +0200, Greg Kroah-Hartman wrote: > On Fri, Jun 14, 2019 at 10:36:14PM +0200, Daniel Vetter wrote: > > Greg is busy already, but maybe he won't do everything ... > > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > --- > > Documentation/gpu/todo.rst | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst > > index 9717540ee28f..026e55c517e1 100644 > > --- a/Documentation/gpu/todo.rst > > +++ b/Documentation/gpu/todo.rst > > @@ -375,6 +375,9 @@ There's a bunch of issues with it: > > this (together with the drm_minor->drm_device move) would allow us to remove > > debugfs_init. > > > > +- Drop the return code and error checking from all debugfs functions. Greg KH is > > + working on this already. > > > Part of this work was to try to delete drm_debugfs_remove_files(). > > There are only 4 files that currently still call this function: > drivers/gpu/drm/tegra/dc.c > drivers/gpu/drm/tegra/dsi.c > drivers/gpu/drm/tegra/hdmi.c > drivers/gpu/drm/tegra/sor.c > > For dc.c, the driver wants to add debugfs files to the struct drm_crtc > debugfs directory. Which is fine, but it has to do some special memory > allocation to get the debugfs callback to point not to the struct > drm_minor pointer, but rather the drm_crtc structure. > > So, to remove this call, I need to remove this special memory allocation > and to do that, I need to somehow be able to cast from drm_minor back to > the drm_crtc structure being used in this driver. And I can't figure > how they are related at all. > > Any pointers here (pun intended) would be appreciated. > > For the other 3 files, the situation is much the same, but I need to get > from a 'struct drm_minor' pointer to a 'struct drm_connector' pointer. > > I could just "open code" a bunch of calls to debugfs_create_file() for > these drivers, which would solve this issue, but in a more "non-drm" > way. Is it worth to just do that instead of overthinking the whole > thing and trying to squish it into the drm "model" of drm debugfs calls? An example of "open coding" this is the patch below for the sor.c driver. Totally untested, not even built, but you should get the idea here. thanks, greg k-h --------------- diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 5be5a0817dfe..3216221c77c4 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -414,7 +414,8 @@ struct tegra_sor { struct drm_dp_aux *aux; - struct drm_info_list *debugfs_files; + struct dentry *debugfs_root; + struct drm_device *drm; const struct tegra_sor_ops *ops; enum tegra_io_pad pad; @@ -1262,10 +1263,9 @@ static int tegra_sor_crc_wait(struct tegra_sor *sor, unsigned long timeout) static int tegra_sor_show_crc(struct seq_file *s, void *data) { - struct drm_info_node *node = s->private; - struct tegra_sor *sor = node->info_ent->data; + struct tegra_sor *sor = s->private; struct drm_crtc *crtc = sor->output.encoder.crtc; - struct drm_device *drm = node->minor->dev; + struct drm_device *drm = sor->drm; int err = 0; u32 value; @@ -1302,6 +1302,20 @@ static int tegra_sor_show_crc(struct seq_file *s, void *data) return err; } +static int crc_open(struct inode *inode, struct file *file) +{ + struct tegra_sor *sor = inode->i_private; + return single_open(file, tegra_sor_show_crc, sor); +} + +static const struct file_operations crc_fops = { + .owner = THIS_MODULE, + .open = crc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + #define DEBUGFS_REG32(_name) { .name = #_name, .offset = _name } static const struct debugfs_reg32 tegra_sor_regs[] = { @@ -1424,10 +1438,9 @@ static const struct debugfs_reg32 tegra_sor_regs[] = { static int tegra_sor_show_regs(struct seq_file *s, void *data) { - struct drm_info_node *node = s->private; - struct tegra_sor *sor = node->info_ent->data; + struct tegra_sor *sor = s->private; struct drm_crtc *crtc = sor->output.encoder.crtc; - struct drm_device *drm = node->minor->dev; + struct drm_device *drm = sor->drm; unsigned int i; int err = 0; @@ -1450,51 +1463,44 @@ static int tegra_sor_show_regs(struct seq_file *s, void *data) return err; } -static const struct drm_info_list debugfs_files[] = { - { "crc", tegra_sor_show_crc, 0, NULL }, - { "regs", tegra_sor_show_regs, 0, NULL }, +static int regs_open(struct inode *inode, struct file *file) +{ + struct tegra_sor *sor = inode->i_private; + return single_open(file, tegra_sor_show_regs, sor); +} + +static const struct file_operations crc_fops = { + .owner = THIS_MODULE, + .open = crc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, }; static int tegra_sor_late_register(struct drm_connector *connector) { - struct tegra_output *output = connector_to_output(connector); - unsigned int i, count = ARRAY_SIZE(debugfs_files); struct drm_minor *minor = connector->dev->primary; - struct dentry *root = connector->debugfs_entry; + struct tegra_output *output = connector_to_output(connector); struct tegra_sor *sor = to_sor(output); - int err; + struct dentry *root; - sor->debugfs_files = kmemdup(debugfs_files, sizeof(debugfs_files), - GFP_KERNEL); - if (!sor->debugfs_files) - return -ENOMEM; + sor->drm = minor->dev; - for (i = 0; i < count; i++) - sor->debugfs_files[i].data = sor; + root = debugfs_create_dir("sor", connector->debugfs_entry); + sor->debugfs_root = root; - err = drm_debugfs_create_files(sor->debugfs_files, count, root, minor); - if (err < 0) - goto free; + debugfs_create_file("crc", S_IFREG | S_IRUGO, root, sor, &crc_fops); + debugfs_create_file("regs", S_IFREG | S_IRUGO, root, sor, ®s_fops); return 0; - -free: - kfree(sor->debugfs_files); - sor->debugfs_files = NULL; - - return err; } static void tegra_sor_early_unregister(struct drm_connector *connector) { struct tegra_output *output = connector_to_output(connector); - unsigned int count = ARRAY_SIZE(debugfs_files); struct tegra_sor *sor = to_sor(output); - drm_debugfs_remove_files(sor->debugfs_files, count, - connector->dev->primary); - kfree(sor->debugfs_files); - sor->debugfs_files = NULL; + debugfs_remove_recursive(sor->debugfs_root); } static void tegra_sor_connector_reset(struct drm_connector *connector) _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) 2019-06-18 15:25 ` Greg Kroah-Hartman @ 2019-06-18 17:32 ` Daniel Vetter 2019-06-18 18:01 ` Greg Kroah-Hartman 2019-06-20 15:11 ` Thierry Reding 0 siblings, 2 replies; 18+ messages in thread From: Daniel Vetter @ 2019-06-18 17:32 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Intel Graphics Development, DRI Development, Jonathan Hunter, linux-tegra, Daniel Vetter On Tue, Jun 18, 2019 at 5:25 PM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > On Tue, Jun 18, 2019 at 05:19:38PM +0200, Greg Kroah-Hartman wrote: > > On Fri, Jun 14, 2019 at 10:36:14PM +0200, Daniel Vetter wrote: > > > Greg is busy already, but maybe he won't do everything ... > > > > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > > --- > > > Documentation/gpu/todo.rst | 3 +++ > > > 1 file changed, 3 insertions(+) > > > > > > diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst > > > index 9717540ee28f..026e55c517e1 100644 > > > --- a/Documentation/gpu/todo.rst > > > +++ b/Documentation/gpu/todo.rst > > > @@ -375,6 +375,9 @@ There's a bunch of issues with it: > > > this (together with the drm_minor->drm_device move) would allow us to remove > > > debugfs_init. > > > > > > +- Drop the return code and error checking from all debugfs functions. Greg KH is > > > + working on this already. > > > > > > Part of this work was to try to delete drm_debugfs_remove_files(). > > > > There are only 4 files that currently still call this function: > > drivers/gpu/drm/tegra/dc.c > > drivers/gpu/drm/tegra/dsi.c > > drivers/gpu/drm/tegra/hdmi.c > > drivers/gpu/drm/tegra/sor.c > > > > For dc.c, the driver wants to add debugfs files to the struct drm_crtc > > debugfs directory. Which is fine, but it has to do some special memory > > allocation to get the debugfs callback to point not to the struct > > drm_minor pointer, but rather the drm_crtc structure. There's already a todo to switch the drm_minor debugfs stuff over to drm_device. drm_minor is essentially different uapi flavours (/dev/ minor nodes, hence the name) sitting on top of the same drm_device. Last time I checked all the debugfs files want the drm_device, not the minor. I think we even discussed to only register the debugfs files for the first minor, and create the other ones as symlinks to the first one. But haven't yet gotten around to typing that. drm_crtc/connector are parts of drm_device with modesetting support, so the drm_minor is even worse choice really. Not exactly sure why we went with this, but probably dates back to the *bsd compat layer and a lot of these files hanging out in procfs too (we've fixed those mistakes a few years ago, yay!). > > So, to remove this call, I need to remove this special memory allocation > > and to do that, I need to somehow be able to cast from drm_minor back to > > the drm_crtc structure being used in this driver. And I can't figure > > how they are related at all. > > > > Any pointers here (pun intended) would be appreciated. > > > > For the other 3 files, the situation is much the same, but I need to get > > from a 'struct drm_minor' pointer to a 'struct drm_connector' pointer. Ditch the drm_minor, there's no no way to get from that to something like drm_connector/crtc, since it's a n:m relationship. > > I could just "open code" a bunch of calls to debugfs_create_file() for > > these drivers, which would solve this issue, but in a more "non-drm" > > way. Is it worth to just do that instead of overthinking the whole > > thing and trying to squish it into the drm "model" of drm debugfs calls? > > An example of "open coding" this is the patch below for the sor.c > driver. I think open-coding is the way to go here. One of the todos is to extend debugfs support for crtc/connectors, but looking at the open-coded version we really don't need a drm-flavoured midlayer here. > Totally untested, not even built, but you should get the idea here. > > thanks, > > greg k-h > > --------------- > > diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c > index 5be5a0817dfe..3216221c77c4 100644 > --- a/drivers/gpu/drm/tegra/sor.c > +++ b/drivers/gpu/drm/tegra/sor.c > @@ -414,7 +414,8 @@ struct tegra_sor { > > struct drm_dp_aux *aux; > > - struct drm_info_list *debugfs_files; > + struct dentry *debugfs_root; > + struct drm_device *drm; > > const struct tegra_sor_ops *ops; > enum tegra_io_pad pad; > @@ -1262,10 +1263,9 @@ static int tegra_sor_crc_wait(struct tegra_sor *sor, unsigned long timeout) > > static int tegra_sor_show_crc(struct seq_file *s, void *data) > { > - struct drm_info_node *node = s->private; > - struct tegra_sor *sor = node->info_ent->data; > + struct tegra_sor *sor = s->private; > struct drm_crtc *crtc = sor->output.encoder.crtc; > - struct drm_device *drm = node->minor->dev; > + struct drm_device *drm = sor->drm; > int err = 0; > u32 value; > > @@ -1302,6 +1302,20 @@ static int tegra_sor_show_crc(struct seq_file *s, void *data) > return err; > } > > +static int crc_open(struct inode *inode, struct file *file) > +{ > + struct tegra_sor *sor = inode->i_private; > + return single_open(file, tegra_sor_show_crc, sor); > +} > + > +static const struct file_operations crc_fops = { > + .owner = THIS_MODULE, > + .open = crc_open, > + .read = seq_read, > + .llseek = seq_lseek, > + .release = single_release, > +}; Hm, is there not a macro to create such simple files with read/write ops? At least for sysfs this is a bit less boilerplate iirc. > + > #define DEBUGFS_REG32(_name) { .name = #_name, .offset = _name } > > static const struct debugfs_reg32 tegra_sor_regs[] = { > @@ -1424,10 +1438,9 @@ static const struct debugfs_reg32 tegra_sor_regs[] = { > > static int tegra_sor_show_regs(struct seq_file *s, void *data) > { > - struct drm_info_node *node = s->private; > - struct tegra_sor *sor = node->info_ent->data; > + struct tegra_sor *sor = s->private; > struct drm_crtc *crtc = sor->output.encoder.crtc; > - struct drm_device *drm = node->minor->dev; > + struct drm_device *drm = sor->drm; sor->output.connector.dev should give you this already. And I think getting at the drm_device is the only reason we needed the drm_minor here at all. > unsigned int i; > int err = 0; > > @@ -1450,51 +1463,44 @@ static int tegra_sor_show_regs(struct seq_file *s, void *data) > return err; > } > > -static const struct drm_info_list debugfs_files[] = { > - { "crc", tegra_sor_show_crc, 0, NULL }, > - { "regs", tegra_sor_show_regs, 0, NULL }, > +static int regs_open(struct inode *inode, struct file *file) > +{ > + struct tegra_sor *sor = inode->i_private; > + return single_open(file, tegra_sor_show_regs, sor); > +} > + > +static const struct file_operations crc_fops = { > + .owner = THIS_MODULE, > + .open = crc_open, > + .read = seq_read, > + .llseek = seq_lseek, > + .release = single_release, > }; > > static int tegra_sor_late_register(struct drm_connector *connector) > { > - struct tegra_output *output = connector_to_output(connector); > - unsigned int i, count = ARRAY_SIZE(debugfs_files); > struct drm_minor *minor = connector->dev->primary; > - struct dentry *root = connector->debugfs_entry; > + struct tegra_output *output = connector_to_output(connector); > struct tegra_sor *sor = to_sor(output); > - int err; > + struct dentry *root; > > - sor->debugfs_files = kmemdup(debugfs_files, sizeof(debugfs_files), > - GFP_KERNEL); > - if (!sor->debugfs_files) > - return -ENOMEM; > + sor->drm = minor->dev; > > - for (i = 0; i < count; i++) > - sor->debugfs_files[i].data = sor; > + root = debugfs_create_dir("sor", connector->debugfs_entry); Hm I think the old files got created right in the drm_connector->debugfs_entry directory? > + sor->debugfs_root = root; > > - err = drm_debugfs_create_files(sor->debugfs_files, count, root, minor); > - if (err < 0) > - goto free; > + debugfs_create_file("crc", S_IFREG | S_IRUGO, root, sor, &crc_fops); > + debugfs_create_file("regs", S_IFREG | S_IRUGO, root, sor, ®s_fops); > > return 0; > - > -free: > - kfree(sor->debugfs_files); > - sor->debugfs_files = NULL; > - > - return err; > } I think if you can create a debugfs-simple-file macro, this here would win hands-down from a boilerplate pov. I like. > static void tegra_sor_early_unregister(struct drm_connector *connector) > { > struct tegra_output *output = connector_to_output(connector); > - unsigned int count = ARRAY_SIZE(debugfs_files); > struct tegra_sor *sor = to_sor(output); > > - drm_debugfs_remove_files(sor->debugfs_files, count, > - connector->dev->primary); > - kfree(sor->debugfs_files); > - sor->debugfs_files = NULL; > + debugfs_remove_recursive(sor->debugfs_root); Not needed, we tear down everything as part of drm_dev_unregister anyway. So you can ditch this. > } > > static void tegra_sor_connector_reset(struct drm_connector *connector) Cheers, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) 2019-06-18 17:32 ` Daniel Vetter @ 2019-06-18 18:01 ` Greg Kroah-Hartman 2019-06-18 21:46 ` Daniel Vetter 2019-06-20 15:11 ` Thierry Reding 1 sibling, 1 reply; 18+ messages in thread From: Greg Kroah-Hartman @ 2019-06-18 18:01 UTC (permalink / raw) To: Daniel Vetter Cc: Intel Graphics Development, DRI Development, Jonathan Hunter, Thierry Reding, linux-tegra, Daniel Vetter On Tue, Jun 18, 2019 at 07:32:20PM +0200, Daniel Vetter wrote: > On Tue, Jun 18, 2019 at 5:25 PM Greg Kroah-Hartman > <gregkh@linuxfoundation.org> wrote: > > On Tue, Jun 18, 2019 at 05:19:38PM +0200, Greg Kroah-Hartman wrote: > > > On Fri, Jun 14, 2019 at 10:36:14PM +0200, Daniel Vetter wrote: > > > > Greg is busy already, but maybe he won't do everything ... > > > > > > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > > > --- > > > > Documentation/gpu/todo.rst | 3 +++ > > > > 1 file changed, 3 insertions(+) > > > > > > > > diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst > > > > index 9717540ee28f..026e55c517e1 100644 > > > > --- a/Documentation/gpu/todo.rst > > > > +++ b/Documentation/gpu/todo.rst > > > > @@ -375,6 +375,9 @@ There's a bunch of issues with it: > > > > this (together with the drm_minor->drm_device move) would allow us to remove > > > > debugfs_init. > > > > > > > > +- Drop the return code and error checking from all debugfs functions. Greg KH is > > > > + working on this already. > > > > > > > > > Part of this work was to try to delete drm_debugfs_remove_files(). > > > > > > There are only 4 files that currently still call this function: > > > drivers/gpu/drm/tegra/dc.c > > > drivers/gpu/drm/tegra/dsi.c > > > drivers/gpu/drm/tegra/hdmi.c > > > drivers/gpu/drm/tegra/sor.c > > > > > > For dc.c, the driver wants to add debugfs files to the struct drm_crtc > > > debugfs directory. Which is fine, but it has to do some special memory > > > allocation to get the debugfs callback to point not to the struct > > > drm_minor pointer, but rather the drm_crtc structure. > > There's already a todo to switch the drm_minor debugfs stuff over to > drm_device. drm_minor is essentially different uapi flavours (/dev/ > minor nodes, hence the name) sitting on top of the same drm_device. > Last time I checked all the debugfs files want the drm_device, not the > minor. I think we even discussed to only register the debugfs files > for the first minor, and create the other ones as symlinks to the > first one. But haven't yet gotten around to typing that. > > drm_crtc/connector are parts of drm_device with modesetting support, > so the drm_minor is even worse choice really. Heh, ok, so the existing code is working around that choice right now, but that wasn't a good choice, so I'll ignore it :) > Not exactly sure why we went with this, but probably dates back to the > *bsd compat layer and a lot of these files hanging out in procfs too > (we've fixed those mistakes a few years ago, yay!). > > > > So, to remove this call, I need to remove this special memory allocation > > > and to do that, I need to somehow be able to cast from drm_minor back to > > > the drm_crtc structure being used in this driver. And I can't figure > > > how they are related at all. > > > > > > Any pointers here (pun intended) would be appreciated. > > > > > > For the other 3 files, the situation is much the same, but I need to get > > > from a 'struct drm_minor' pointer to a 'struct drm_connector' pointer. > > Ditch the drm_minor, there's no no way to get from that to something > like drm_connector/crtc, since it's a n:m relationship. Ok, will do. > > > > I could just "open code" a bunch of calls to debugfs_create_file() for > > > these drivers, which would solve this issue, but in a more "non-drm" > > > way. Is it worth to just do that instead of overthinking the whole > > > thing and trying to squish it into the drm "model" of drm debugfs calls? > > > > An example of "open coding" this is the patch below for the sor.c > > driver. > > I think open-coding is the way to go here. One of the todos is to > extend debugfs support for crtc/connectors, but looking at the > open-coded version we really don't need a drm-flavoured midlayer here. There already is debugfs support in the code for crtc/connectors, these files are "hanging" off of those locations already. I'll keep that, but indent it one more directory so that there's no namespace collisions. > > Totally untested, not even built, but you should get the idea here. > > > > thanks, > > > > greg k-h > > > > --------------- > > > > diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c > > index 5be5a0817dfe..3216221c77c4 100644 > > --- a/drivers/gpu/drm/tegra/sor.c > > +++ b/drivers/gpu/drm/tegra/sor.c > > @@ -414,7 +414,8 @@ struct tegra_sor { > > > > struct drm_dp_aux *aux; > > > > - struct drm_info_list *debugfs_files; > > + struct dentry *debugfs_root; > > + struct drm_device *drm; > > > > const struct tegra_sor_ops *ops; > > enum tegra_io_pad pad; > > @@ -1262,10 +1263,9 @@ static int tegra_sor_crc_wait(struct tegra_sor *sor, unsigned long timeout) > > > > static int tegra_sor_show_crc(struct seq_file *s, void *data) > > { > > - struct drm_info_node *node = s->private; > > - struct tegra_sor *sor = node->info_ent->data; > > + struct tegra_sor *sor = s->private; > > struct drm_crtc *crtc = sor->output.encoder.crtc; > > - struct drm_device *drm = node->minor->dev; > > + struct drm_device *drm = sor->drm; > > int err = 0; > > u32 value; > > > > @@ -1302,6 +1302,20 @@ static int tegra_sor_show_crc(struct seq_file *s, void *data) > > return err; > > } > > > > +static int crc_open(struct inode *inode, struct file *file) > > +{ > > + struct tegra_sor *sor = inode->i_private; > > + return single_open(file, tegra_sor_show_crc, sor); > > +} > > + > > +static const struct file_operations crc_fops = { > > + .owner = THIS_MODULE, > > + .open = crc_open, > > + .read = seq_read, > > + .llseek = seq_lseek, > > + .release = single_release, > > +}; > > Hm, is there not a macro to create such simple files with read/write > ops? At least for sysfs this is a bit less boilerplate iirc. For "simple" things like single variables, yes, there is. For more "free-form" text, where you want to use a seq file interface, this seems to be the "simplest" boiler-plate to create. Actually should be pretty simple to create a macro for this, as it's pretty trivial (the drm core already wraps this on its own, so it can be done...) I'll do that too. > > #define DEBUGFS_REG32(_name) { .name = #_name, .offset = _name } > > > > static const struct debugfs_reg32 tegra_sor_regs[] = { > > @@ -1424,10 +1438,9 @@ static const struct debugfs_reg32 tegra_sor_regs[] = { > > > > static int tegra_sor_show_regs(struct seq_file *s, void *data) > > { > > - struct drm_info_node *node = s->private; > > - struct tegra_sor *sor = node->info_ent->data; > > + struct tegra_sor *sor = s->private; > > struct drm_crtc *crtc = sor->output.encoder.crtc; > > - struct drm_device *drm = node->minor->dev; > > + struct drm_device *drm = sor->drm; > > sor->output.connector.dev should give you this already. And I think > getting at the drm_device is the only reason we needed the drm_minor > here at all. Ah, good, I missed that, should make this code simpler then, thanks! > > > unsigned int i; > > int err = 0; > > > > @@ -1450,51 +1463,44 @@ static int tegra_sor_show_regs(struct seq_file *s, void *data) > > return err; > > } > > > > -static const struct drm_info_list debugfs_files[] = { > > - { "crc", tegra_sor_show_crc, 0, NULL }, > > - { "regs", tegra_sor_show_regs, 0, NULL }, > > +static int regs_open(struct inode *inode, struct file *file) > > +{ > > + struct tegra_sor *sor = inode->i_private; > > + return single_open(file, tegra_sor_show_regs, sor); > > +} > > + > > +static const struct file_operations crc_fops = { > > + .owner = THIS_MODULE, > > + .open = crc_open, > > + .read = seq_read, > > + .llseek = seq_lseek, > > + .release = single_release, > > }; > > > > static int tegra_sor_late_register(struct drm_connector *connector) > > { > > - struct tegra_output *output = connector_to_output(connector); > > - unsigned int i, count = ARRAY_SIZE(debugfs_files); > > struct drm_minor *minor = connector->dev->primary; > > - struct dentry *root = connector->debugfs_entry; > > + struct tegra_output *output = connector_to_output(connector); > > struct tegra_sor *sor = to_sor(output); > > - int err; > > + struct dentry *root; > > > > - sor->debugfs_files = kmemdup(debugfs_files, sizeof(debugfs_files), > > - GFP_KERNEL); > > - if (!sor->debugfs_files) > > - return -ENOMEM; > > + sor->drm = minor->dev; > > > > - for (i = 0; i < count; i++) > > - sor->debugfs_files[i].data = sor; > > + root = debugfs_create_dir("sor", connector->debugfs_entry); > > Hm I think the old files got created right in the > drm_connector->debugfs_entry directory? They did. I was trying to be nice and keep things in their own directory so I could clean it up. But I guess we want the drm core to be cleaning things up, I forgot about drm_debugfs_remove_files() being the main goal to get rid of here :) > > + sor->debugfs_root = root; > > > > - err = drm_debugfs_create_files(sor->debugfs_files, count, root, minor); > > - if (err < 0) > > - goto free; > > + debugfs_create_file("crc", S_IFREG | S_IRUGO, root, sor, &crc_fops); > > + debugfs_create_file("regs", S_IFREG | S_IRUGO, root, sor, ®s_fops); > > > > return 0; > > - > > -free: > > - kfree(sor->debugfs_files); > > - sor->debugfs_files = NULL; > > - > > - return err; > > } > > I think if you can create a debugfs-simple-file macro, this here would > win hands-down from a boilerplate pov. I like. Ok, will do. > > static void tegra_sor_early_unregister(struct drm_connector *connector) > > { > > struct tegra_output *output = connector_to_output(connector); > > - unsigned int count = ARRAY_SIZE(debugfs_files); > > struct tegra_sor *sor = to_sor(output); > > > > - drm_debugfs_remove_files(sor->debugfs_files, count, > > - connector->dev->primary); > > - kfree(sor->debugfs_files); > > - sor->debugfs_files = NULL; > > + debugfs_remove_recursive(sor->debugfs_root); > > Not needed, we tear down everything as part of drm_dev_unregister > anyway. So you can ditch this. Wonderful, will do. thanks for the review. greg k-h _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) 2019-06-18 18:01 ` Greg Kroah-Hartman @ 2019-06-18 21:46 ` Daniel Vetter 2019-06-20 14:50 ` Thierry Reding 0 siblings, 1 reply; 18+ messages in thread From: Daniel Vetter @ 2019-06-18 21:46 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Daniel Vetter, Intel Graphics Development, DRI Development, Jonathan Hunter, linux-tegra, Daniel Vetter On Tue, Jun 18, 2019 at 08:01:13PM +0200, Greg Kroah-Hartman wrote: > On Tue, Jun 18, 2019 at 07:32:20PM +0200, Daniel Vetter wrote: > > On Tue, Jun 18, 2019 at 5:25 PM Greg Kroah-Hartman > > <gregkh@linuxfoundation.org> wrote: > > > On Tue, Jun 18, 2019 at 05:19:38PM +0200, Greg Kroah-Hartman wrote: > > > > I could just "open code" a bunch of calls to debugfs_create_file() for > > > > these drivers, which would solve this issue, but in a more "non-drm" > > > > way. Is it worth to just do that instead of overthinking the whole > > > > thing and trying to squish it into the drm "model" of drm debugfs calls? > > > > > > An example of "open coding" this is the patch below for the sor.c > > > driver. > > > > I think open-coding is the way to go here. One of the todos is to > > extend debugfs support for crtc/connectors, but looking at the > > open-coded version we really don't need a drm-flavoured midlayer here. > > There already is debugfs support in the code for crtc/connectors, these > files are "hanging" off of those locations already. I'll keep that, but > indent it one more directory so that there's no namespace collisions. The todo was to have some drm wrappers here for the boilerplate, but after looking at your version that's not a good idea. So not just making sure crtcs/connectors have a debugfs directory made for them, but more. Wrt adding a new directory: debugfs isnt uapi, but there's usually a massive pile of script relying on them, so it's not nice to shuffle paths around. Plus the lifetimes match anyway (at least if you don't hotplug connectors, which tegra doesn't do). -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) 2019-06-18 21:46 ` Daniel Vetter @ 2019-06-20 14:50 ` Thierry Reding 0 siblings, 0 replies; 18+ messages in thread From: Thierry Reding @ 2019-06-20 14:50 UTC (permalink / raw) To: Daniel Vetter Cc: Greg Kroah-Hartman, Intel Graphics Development, DRI Development, Jonathan Hunter, Daniel Vetter, linux-tegra, Daniel Vetter [-- Attachment #1.1: Type: text/plain, Size: 3000 bytes --] On Tue, Jun 18, 2019 at 11:46:56PM +0200, Daniel Vetter wrote: > On Tue, Jun 18, 2019 at 08:01:13PM +0200, Greg Kroah-Hartman wrote: > > On Tue, Jun 18, 2019 at 07:32:20PM +0200, Daniel Vetter wrote: > > > On Tue, Jun 18, 2019 at 5:25 PM Greg Kroah-Hartman > > > <gregkh@linuxfoundation.org> wrote: > > > > On Tue, Jun 18, 2019 at 05:19:38PM +0200, Greg Kroah-Hartman wrote: > > > > > I could just "open code" a bunch of calls to debugfs_create_file() for > > > > > these drivers, which would solve this issue, but in a more "non-drm" > > > > > way. Is it worth to just do that instead of overthinking the whole > > > > > thing and trying to squish it into the drm "model" of drm debugfs calls? > > > > > > > > An example of "open coding" this is the patch below for the sor.c > > > > driver. > > > > > > I think open-coding is the way to go here. One of the todos is to > > > extend debugfs support for crtc/connectors, but looking at the > > > open-coded version we really don't need a drm-flavoured midlayer here. > > > > There already is debugfs support in the code for crtc/connectors, these > > files are "hanging" off of those locations already. I'll keep that, but > > indent it one more directory so that there's no namespace collisions. > > The todo was to have some drm wrappers here for the boilerplate, but after > looking at your version that's not a good idea. So not just making sure > crtcs/connectors have a debugfs directory made for them, but more. > > Wrt adding a new directory: debugfs isnt uapi, but there's usually a > massive pile of script relying on them, so it's not nice to shuffle paths > around. Plus the lifetimes match anyway (at least if you don't hotplug > connectors, which tegra doesn't do). So, I think you two already covered everything. From a Tegra perspective there's not really a need to care about the exact structure of debugfs because there are only a handful of scripts that use this and they are not exactly widely distributed. At the same time there's really no need to add another level of directories, since the connector really is the SOR, so an sor directory in the connector's directory is just redundant. Cleaning up and lifetime management aren't issues, really, so there are no good arguments for adding it, in my opinion. Historically, the sor.c driver is interesting because it used to be just plain debugfs calls. Only when I added a second debugfs file I decided to go with the built-in DRM infrastructure for this and then later went and converted the first file to it as well, for consistency. I do remember though that I was very unhappy about the fact that I had to do all this kmemdup()'ing just to make debugfs files per-instance (the DRM infrastructure doesn't allow that by default). In retrospect that was a poor decision and I should've just stuck with debugfs and perhaps just spin a couple of helpers around that instead. So I'm happy to see this effort. Thierry [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) 2019-06-18 17:32 ` Daniel Vetter 2019-06-18 18:01 ` Greg Kroah-Hartman @ 2019-06-20 15:11 ` Thierry Reding 1 sibling, 0 replies; 18+ messages in thread From: Thierry Reding @ 2019-06-20 15:11 UTC (permalink / raw) To: Daniel Vetter Cc: Greg Kroah-Hartman, Intel Graphics Development, DRI Development, Jonathan Hunter, linux-tegra, Daniel Vetter [-- Attachment #1.1: Type: text/plain, Size: 10888 bytes --] On Tue, Jun 18, 2019 at 07:32:20PM +0200, Daniel Vetter wrote: > On Tue, Jun 18, 2019 at 5:25 PM Greg Kroah-Hartman > <gregkh@linuxfoundation.org> wrote: > > On Tue, Jun 18, 2019 at 05:19:38PM +0200, Greg Kroah-Hartman wrote: > > > On Fri, Jun 14, 2019 at 10:36:14PM +0200, Daniel Vetter wrote: > > > > Greg is busy already, but maybe he won't do everything ... > > > > > > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > > > --- > > > > Documentation/gpu/todo.rst | 3 +++ > > > > 1 file changed, 3 insertions(+) > > > > > > > > diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst > > > > index 9717540ee28f..026e55c517e1 100644 > > > > --- a/Documentation/gpu/todo.rst > > > > +++ b/Documentation/gpu/todo.rst > > > > @@ -375,6 +375,9 @@ There's a bunch of issues with it: > > > > this (together with the drm_minor->drm_device move) would allow us to remove > > > > debugfs_init. > > > > > > > > +- Drop the return code and error checking from all debugfs functions. Greg KH is > > > > + working on this already. > > > > > > > > > Part of this work was to try to delete drm_debugfs_remove_files(). > > > > > > There are only 4 files that currently still call this function: > > > drivers/gpu/drm/tegra/dc.c > > > drivers/gpu/drm/tegra/dsi.c > > > drivers/gpu/drm/tegra/hdmi.c > > > drivers/gpu/drm/tegra/sor.c > > > > > > For dc.c, the driver wants to add debugfs files to the struct drm_crtc > > > debugfs directory. Which is fine, but it has to do some special memory > > > allocation to get the debugfs callback to point not to the struct > > > drm_minor pointer, but rather the drm_crtc structure. > > There's already a todo to switch the drm_minor debugfs stuff over to > drm_device. drm_minor is essentially different uapi flavours (/dev/ > minor nodes, hence the name) sitting on top of the same drm_device. > Last time I checked all the debugfs files want the drm_device, not the > minor. I think we even discussed to only register the debugfs files > for the first minor, and create the other ones as symlinks to the > first one. But haven't yet gotten around to typing that. > > drm_crtc/connector are parts of drm_device with modesetting support, > so the drm_minor is even worse choice really. For the connector drivers we already sit on top of the per-connector debugfs directories. I think the only reason why we don't do that for the display controller is because drm_crtc didn't have built-in debugfs support like the connectors have. It looks like that's no longer true, though it's been there for a while. I think it'd be good to just move those over as well. As for passing struct drm_minor, I think that's mostly unnecessary. As far as I can tell, we only use drm_minor to get at drm_device, which in turn we only use to check some features flags, and drm_minor itself is only used to track the list of files that are being added so that they can later be removed again. Given that we can just tear down everything debugfs recursively, I don't think we need any of that. > > Not exactly sure why we went with this, but probably dates back to the > *bsd compat layer and a lot of these files hanging out in procfs too > (we've fixed those mistakes a few years ago, yay!). > > > > So, to remove this call, I need to remove this special memory allocation > > > and to do that, I need to somehow be able to cast from drm_minor back to > > > the drm_crtc structure being used in this driver. And I can't figure > > > how they are related at all. > > > > > > Any pointers here (pun intended) would be appreciated. > > > > > > For the other 3 files, the situation is much the same, but I need to get > > > from a 'struct drm_minor' pointer to a 'struct drm_connector' pointer. > > Ditch the drm_minor, there's no no way to get from that to something > like drm_connector/crtc, since it's a n:m relationship. Yeah. That too. > > > I could just "open code" a bunch of calls to debugfs_create_file() for > > > these drivers, which would solve this issue, but in a more "non-drm" > > > way. Is it worth to just do that instead of overthinking the whole > > > thing and trying to squish it into the drm "model" of drm debugfs calls? > > > > An example of "open coding" this is the patch below for the sor.c > > driver. > > I think open-coding is the way to go here. One of the todos is to > extend debugfs support for crtc/connectors, but looking at the > open-coded version we really don't need a drm-flavoured midlayer here. Exactly my thoughts. It'd be nice to have some sort of macro to help bring the boilerplate down a bit. Thierry > > Totally untested, not even built, but you should get the idea here. > > > > thanks, > > > > greg k-h > > > > --------------- > > > > diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c > > index 5be5a0817dfe..3216221c77c4 100644 > > --- a/drivers/gpu/drm/tegra/sor.c > > +++ b/drivers/gpu/drm/tegra/sor.c > > @@ -414,7 +414,8 @@ struct tegra_sor { > > > > struct drm_dp_aux *aux; > > > > - struct drm_info_list *debugfs_files; > > + struct dentry *debugfs_root; > > + struct drm_device *drm; > > > > const struct tegra_sor_ops *ops; > > enum tegra_io_pad pad; > > @@ -1262,10 +1263,9 @@ static int tegra_sor_crc_wait(struct tegra_sor *sor, unsigned long timeout) > > > > static int tegra_sor_show_crc(struct seq_file *s, void *data) > > { > > - struct drm_info_node *node = s->private; > > - struct tegra_sor *sor = node->info_ent->data; > > + struct tegra_sor *sor = s->private; > > struct drm_crtc *crtc = sor->output.encoder.crtc; > > - struct drm_device *drm = node->minor->dev; > > + struct drm_device *drm = sor->drm; > > int err = 0; > > u32 value; > > > > @@ -1302,6 +1302,20 @@ static int tegra_sor_show_crc(struct seq_file *s, void *data) > > return err; > > } > > > > +static int crc_open(struct inode *inode, struct file *file) > > +{ > > + struct tegra_sor *sor = inode->i_private; > > + return single_open(file, tegra_sor_show_crc, sor); > > +} > > + > > +static const struct file_operations crc_fops = { > > + .owner = THIS_MODULE, > > + .open = crc_open, > > + .read = seq_read, > > + .llseek = seq_lseek, > > + .release = single_release, > > +}; > > Hm, is there not a macro to create such simple files with read/write > ops? At least for sysfs this is a bit less boilerplate iirc. > > > + > > #define DEBUGFS_REG32(_name) { .name = #_name, .offset = _name } > > > > static const struct debugfs_reg32 tegra_sor_regs[] = { > > @@ -1424,10 +1438,9 @@ static const struct debugfs_reg32 tegra_sor_regs[] = { > > > > static int tegra_sor_show_regs(struct seq_file *s, void *data) > > { > > - struct drm_info_node *node = s->private; > > - struct tegra_sor *sor = node->info_ent->data; > > + struct tegra_sor *sor = s->private; > > struct drm_crtc *crtc = sor->output.encoder.crtc; > > - struct drm_device *drm = node->minor->dev; > > + struct drm_device *drm = sor->drm; > > sor->output.connector.dev should give you this already. And I think > getting at the drm_device is the only reason we needed the drm_minor > here at all. > > > unsigned int i; > > int err = 0; > > > > @@ -1450,51 +1463,44 @@ static int tegra_sor_show_regs(struct seq_file *s, void *data) > > return err; > > } > > > > -static const struct drm_info_list debugfs_files[] = { > > - { "crc", tegra_sor_show_crc, 0, NULL }, > > - { "regs", tegra_sor_show_regs, 0, NULL }, > > +static int regs_open(struct inode *inode, struct file *file) > > +{ > > + struct tegra_sor *sor = inode->i_private; > > + return single_open(file, tegra_sor_show_regs, sor); > > +} > > + > > +static const struct file_operations crc_fops = { > > + .owner = THIS_MODULE, > > + .open = crc_open, > > + .read = seq_read, > > + .llseek = seq_lseek, > > + .release = single_release, > > }; > > > > static int tegra_sor_late_register(struct drm_connector *connector) > > { > > - struct tegra_output *output = connector_to_output(connector); > > - unsigned int i, count = ARRAY_SIZE(debugfs_files); > > struct drm_minor *minor = connector->dev->primary; > > - struct dentry *root = connector->debugfs_entry; > > + struct tegra_output *output = connector_to_output(connector); > > struct tegra_sor *sor = to_sor(output); > > - int err; > > + struct dentry *root; > > > > - sor->debugfs_files = kmemdup(debugfs_files, sizeof(debugfs_files), > > - GFP_KERNEL); > > - if (!sor->debugfs_files) > > - return -ENOMEM; > > + sor->drm = minor->dev; > > > > - for (i = 0; i < count; i++) > > - sor->debugfs_files[i].data = sor; > > + root = debugfs_create_dir("sor", connector->debugfs_entry); > > Hm I think the old files got created right in the > drm_connector->debugfs_entry directory? > > > + sor->debugfs_root = root; > > > > - err = drm_debugfs_create_files(sor->debugfs_files, count, root, minor); > > - if (err < 0) > > - goto free; > > + debugfs_create_file("crc", S_IFREG | S_IRUGO, root, sor, &crc_fops); > > + debugfs_create_file("regs", S_IFREG | S_IRUGO, root, sor, ®s_fops); > > > > return 0; > > - > > -free: > > - kfree(sor->debugfs_files); > > - sor->debugfs_files = NULL; > > - > > - return err; > > } > > I think if you can create a debugfs-simple-file macro, this here would > win hands-down from a boilerplate pov. I like. I fully agree with this and all of your points above. > > static void tegra_sor_early_unregister(struct drm_connector *connector) > > { > > struct tegra_output *output = connector_to_output(connector); > > - unsigned int count = ARRAY_SIZE(debugfs_files); > > struct tegra_sor *sor = to_sor(output); > > > > - drm_debugfs_remove_files(sor->debugfs_files, count, > > - connector->dev->primary); > > - kfree(sor->debugfs_files); > > - sor->debugfs_files = NULL; > > + debugfs_remove_recursive(sor->debugfs_root); > > Not needed, we tear down everything as part of drm_dev_unregister > anyway. So you can ditch this. And this. Greg, let me know if you need a hand with the patches or if you want any of these to be build/runtime tested. Thierry [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) 2019-06-18 15:19 ` drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) Greg Kroah-Hartman 2019-06-18 15:25 ` Greg Kroah-Hartman @ 2019-06-18 15:37 ` Jon Hunter 2019-06-20 15:16 ` Thierry Reding 2019-06-20 14:57 ` Thierry Reding 2 siblings, 1 reply; 18+ messages in thread From: Jon Hunter @ 2019-06-18 15:37 UTC (permalink / raw) To: Greg Kroah-Hartman, Daniel Vetter Cc: linux-tegra, Daniel Vetter, Intel Graphics Development, Thierry Reding, DRI Development On 18/06/2019 16:19, Greg Kroah-Hartman wrote: > On Fri, Jun 14, 2019 at 10:36:14PM +0200, Daniel Vetter wrote: >> Greg is busy already, but maybe he won't do everything ... >> >> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> >> --- >> Documentation/gpu/todo.rst | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst >> index 9717540ee28f..026e55c517e1 100644 >> --- a/Documentation/gpu/todo.rst >> +++ b/Documentation/gpu/todo.rst >> @@ -375,6 +375,9 @@ There's a bunch of issues with it: >> this (together with the drm_minor->drm_device move) would allow us to remove >> debugfs_init. >> >> +- Drop the return code and error checking from all debugfs functions. Greg KH is >> + working on this already. > > > Part of this work was to try to delete drm_debugfs_remove_files(). > > There are only 4 files that currently still call this function: > drivers/gpu/drm/tegra/dc.c > drivers/gpu/drm/tegra/dsi.c > drivers/gpu/drm/tegra/hdmi.c > drivers/gpu/drm/tegra/sor.c > > For dc.c, the driver wants to add debugfs files to the struct drm_crtc > debugfs directory. Which is fine, but it has to do some special memory > allocation to get the debugfs callback to point not to the struct > drm_minor pointer, but rather the drm_crtc structure. > > So, to remove this call, I need to remove this special memory allocation > and to do that, I need to somehow be able to cast from drm_minor back to > the drm_crtc structure being used in this driver. And I can't figure > how they are related at all. > > Any pointers here (pun intended) would be appreciated. > > For the other 3 files, the situation is much the same, but I need to get > from a 'struct drm_minor' pointer to a 'struct drm_connector' pointer. > > I could just "open code" a bunch of calls to debugfs_create_file() for > these drivers, which would solve this issue, but in a more "non-drm" > way. Is it worth to just do that instead of overthinking the whole > thing and trying to squish it into the drm "model" of drm debugfs calls? > > Either way, who can test these changes? I can't even build the tegra > driver without digging up an arm64 cross-compiler, and can't test it as > I have no hardware at all. We can definitely compile and boot test these no problem. In fact anything that lands in -next we will boot test. However, I can do some quick sanity if you have something to test. Thierry may have more specific Tegra DRM tests. Cheers Jon -- nvpublic _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) 2019-06-18 15:37 ` Jon Hunter @ 2019-06-20 15:16 ` Thierry Reding 0 siblings, 0 replies; 18+ messages in thread From: Thierry Reding @ 2019-06-20 15:16 UTC (permalink / raw) To: Jon Hunter Cc: Greg Kroah-Hartman, Intel Graphics Development, DRI Development, Daniel Vetter, linux-tegra, Daniel Vetter [-- Attachment #1.1: Type: text/plain, Size: 3250 bytes --] On Tue, Jun 18, 2019 at 04:37:16PM +0100, Jon Hunter wrote: > > On 18/06/2019 16:19, Greg Kroah-Hartman wrote: > > On Fri, Jun 14, 2019 at 10:36:14PM +0200, Daniel Vetter wrote: > >> Greg is busy already, but maybe he won't do everything ... > >> > >> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > >> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > >> --- > >> Documentation/gpu/todo.rst | 3 +++ > >> 1 file changed, 3 insertions(+) > >> > >> diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst > >> index 9717540ee28f..026e55c517e1 100644 > >> --- a/Documentation/gpu/todo.rst > >> +++ b/Documentation/gpu/todo.rst > >> @@ -375,6 +375,9 @@ There's a bunch of issues with it: > >> this (together with the drm_minor->drm_device move) would allow us to remove > >> debugfs_init. > >> > >> +- Drop the return code and error checking from all debugfs functions. Greg KH is > >> + working on this already. > > > > > > Part of this work was to try to delete drm_debugfs_remove_files(). > > > > There are only 4 files that currently still call this function: > > drivers/gpu/drm/tegra/dc.c > > drivers/gpu/drm/tegra/dsi.c > > drivers/gpu/drm/tegra/hdmi.c > > drivers/gpu/drm/tegra/sor.c > > > > For dc.c, the driver wants to add debugfs files to the struct drm_crtc > > debugfs directory. Which is fine, but it has to do some special memory > > allocation to get the debugfs callback to point not to the struct > > drm_minor pointer, but rather the drm_crtc structure. > > > > So, to remove this call, I need to remove this special memory allocation > > and to do that, I need to somehow be able to cast from drm_minor back to > > the drm_crtc structure being used in this driver. And I can't figure > > how they are related at all. > > > > Any pointers here (pun intended) would be appreciated. > > > > For the other 3 files, the situation is much the same, but I need to get > > from a 'struct drm_minor' pointer to a 'struct drm_connector' pointer. > > > > I could just "open code" a bunch of calls to debugfs_create_file() for > > these drivers, which would solve this issue, but in a more "non-drm" > > way. Is it worth to just do that instead of overthinking the whole > > thing and trying to squish it into the drm "model" of drm debugfs calls? > > > > Either way, who can test these changes? I can't even build the tegra > > driver without digging up an arm64 cross-compiler, and can't test it as > > I have no hardware at all. > > We can definitely compile and boot test these no problem. In fact > anything that lands in -next we will boot test. However, I can do some > quick sanity if you have something to test. > > Thierry may have more specific Tegra DRM tests. We don't have any automated tests for this yet, unfortunately. Let me work on something. In the meantime I can manually test any of the patches that Greg sends out. These should be fairly trivial to test. It's difficult to check for success/failure on something like the register dump or the CRC, but I think for now we don't really need much more than just validating that things don't crash when we read one of these debugfs files. Thierry [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) 2019-06-18 15:19 ` drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) Greg Kroah-Hartman 2019-06-18 15:25 ` Greg Kroah-Hartman 2019-06-18 15:37 ` Jon Hunter @ 2019-06-20 14:57 ` Thierry Reding 2 siblings, 0 replies; 18+ messages in thread From: Thierry Reding @ 2019-06-20 14:57 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Daniel Vetter, Intel Graphics Development, DRI Development, Jonathan Hunter, linux-tegra, Daniel Vetter [-- Attachment #1.1: Type: text/plain, Size: 2429 bytes --] On Tue, Jun 18, 2019 at 05:19:38PM +0200, Greg Kroah-Hartman wrote: > On Fri, Jun 14, 2019 at 10:36:14PM +0200, Daniel Vetter wrote: > > Greg is busy already, but maybe he won't do everything ... > > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > --- > > Documentation/gpu/todo.rst | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst > > index 9717540ee28f..026e55c517e1 100644 > > --- a/Documentation/gpu/todo.rst > > +++ b/Documentation/gpu/todo.rst > > @@ -375,6 +375,9 @@ There's a bunch of issues with it: > > this (together with the drm_minor->drm_device move) would allow us to remove > > debugfs_init. > > > > +- Drop the return code and error checking from all debugfs functions. Greg KH is > > + working on this already. > > > Part of this work was to try to delete drm_debugfs_remove_files(). > > There are only 4 files that currently still call this function: > drivers/gpu/drm/tegra/dc.c > drivers/gpu/drm/tegra/dsi.c > drivers/gpu/drm/tegra/hdmi.c > drivers/gpu/drm/tegra/sor.c > > For dc.c, the driver wants to add debugfs files to the struct drm_crtc > debugfs directory. Which is fine, but it has to do some special memory > allocation to get the debugfs callback to point not to the struct > drm_minor pointer, but rather the drm_crtc structure. Actually the reason why the memory allocation is done is because there can be multiple instances of the display controller. In fact, there's always at least two (and up to four in later Tegra generations). The DRM debugfs infrastructure, however, doesn't automatically duplicate the data for each drm_debugfs_create_files() call and at the same time it does not allow you to specify driver-private data other than by embedding it in the drm_info_list structure. So rather than manually create the drm_info_list for each display controller instance, the code creates a template that is then duplicated and for which the driver- private is then set. That way multiple invocations end up with different data. This is because of the extra indirection that the DRM debugfs infrastructure introduces. It's in fact much easier to do this with just plain debugfs function calls. The only downside is the boilerplate required to make that happen. Thierry [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2019-06-21 10:37 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20190614203615.12639-1-daniel.vetter@ffwll.ch>
[not found] ` <20190614203615.12639-1-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
2019-06-14 20:35 ` [PATCH 06/59] drm/prime: Actually remove DRIVER_PRIME everywhere Daniel Vetter
[not found] ` <20190614203615.12639-7-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
2019-06-14 21:36 ` Sam Ravnborg
2019-06-17 15:39 ` [PATCH] " Daniel Vetter
2019-06-17 17:56 ` [PATCH 06/59] " Emil Velikov
2019-06-14 20:35 ` [PATCH 09/59] drm/prime: Align gem_prime_export with obj_funcs.export Daniel Vetter
[not found] ` <20190614203615.12639-10-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
2019-06-17 9:32 ` Koenig, Christian
2019-06-17 9:53 ` Thierry Reding
2019-06-21 10:37 ` Daniel Vetter
[not found] ` <20190614203615.12639-59-daniel.vetter@ffwll.ch>
2019-06-18 15:19 ` drm connectors, tegra, and the web they weave (was Re: [PATCH 58/59] drm/todo: Add new debugfs todo) Greg Kroah-Hartman
2019-06-18 15:25 ` Greg Kroah-Hartman
2019-06-18 17:32 ` Daniel Vetter
2019-06-18 18:01 ` Greg Kroah-Hartman
2019-06-18 21:46 ` Daniel Vetter
2019-06-20 14:50 ` Thierry Reding
2019-06-20 15:11 ` Thierry Reding
2019-06-18 15:37 ` Jon Hunter
2019-06-20 15:16 ` Thierry Reding
2019-06-20 14:57 ` Thierry Reding
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).