Skip to contentSkip to conversation

drm/mediatek: Remove dependency on GEM DMA helper

PATCH Applied Rob Clark 3 participants 3 messages Jan 19, 2023 – Jan 27, 2023

Subsystems (3)
lore
Share & tools
lore

Rob Clark

author
#0 lore raw

PATCH 1/1 drm/mediatek: Remove dependency on GEM DMA helper

From: Rob Clark <[email protected]>

It appears that the dependency on the DMA helpers was only for drm_gem_dma_vm_ops.

---
 drivers/gpu/drm/mediatek/Kconfig       | 1 -
 drivers/gpu/drm/mediatek/mtk_drm_gem.c | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/Kconfig +0 -1
index 369e495d0c3e..b451dee64d34 100644
@@ -7,7 +7,6 @@ config DRM_MEDIATEK
 	depends on HAVE_ARM_SMCCC
 	depends on OF
 	depends on MTK_MMSYS
-	select DRM_GEM_DMA_HELPER
 	select DRM_KMS_HELPER
 	select DRM_MIPI_DSI
 	select DRM_PANEL
drivers/gpu/drm/mediatek/mtk_drm_gem.c +6 -1
index 47e96b0289f9..9b3d15d3a983 100644
@@ -16,13 +16,18 @@
 
 static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
 
+static const struct vm_operations_struct vm_ops = {
+	.open = drm_gem_vm_open,
+	.close = drm_gem_vm_close,
+};
+
 static const struct drm_gem_object_funcs mtk_drm_gem_object_funcs = {
 	.free = mtk_drm_gem_free_object,
 	.get_sg_table = mtk_gem_prime_get_sg_table,
 	.vmap = mtk_drm_gem_prime_vmap,
 	.vunmap = mtk_drm_gem_prime_vunmap,
 	.mmap = mtk_drm_gem_object_mmap,
-	.vm_ops = &drm_gem_dma_vm_ops,
+	.vm_ops = &vm_ops,
 };
 
 static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device *dev,
Signature · 1 line
2.38.1
maintainer Applied
#1 lore raw

Hi, Rob:

Rob Clark <[email protected]> 於 2023年1月20日 週五 上午6:40寫道:

Quoted 5 lines

From: Rob Clark <[email protected]>

It appears that the dependency on the DMA helpers was only for drm_gem_dma_vm_ops.

Applied to mediatek-drm-next [1], thanks.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next

Regards,
Chun-Kuang.

Quoted 46 lines
---
 drivers/gpu/drm/mediatek/Kconfig       | 1 -
 drivers/gpu/drm/mediatek/mtk_drm_gem.c | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/mediatek/Kconfig +0 -1
index 369e495d0c3e..b451dee64d34 100644
@@ -7,7 +7,6 @@ config DRM_MEDIATEK
        depends on HAVE_ARM_SMCCC
        depends on OF
        depends on MTK_MMSYS
-       select DRM_GEM_DMA_HELPER
        select DRM_KMS_HELPER
        select DRM_MIPI_DSI
        select DRM_PANEL
drivers/gpu/drm/mediatek/mtk_drm_gem.c +6 -2
index 47e96b0289f9..9b3d15d3a983 100644
@@ -16,13 +16,18 @@
 
 static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
 
+static const struct vm_operations_struct vm_ops = {
+       .open = drm_gem_vm_open,
+       .close = drm_gem_vm_close,
+};
+
 static const struct drm_gem_object_funcs mtk_drm_gem_object_funcs = {
        .free = mtk_drm_gem_free_object,
        .get_sg_table = mtk_gem_prime_get_sg_table,
        .vmap = mtk_drm_gem_prime_vmap,
        .vunmap = mtk_drm_gem_prime_vunmap,
        .mmap = mtk_drm_gem_object_mmap,
-       .vm_ops = &drm_gem_dma_vm_ops,
+       .vm_ops = &vm_ops,
 };
 
 static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device *dev,
--

2.38.1

#2 lore raw
In reply to Rob Clark

Hi,

Quoted 11 lines · Rob Clark

From: Rob Clark <[email protected]>

It appears that the dependency on the DMA helpers was only for drm_gem_dma_vm_ops.

---
 drivers/gpu/drm/mediatek/Kconfig       | 1 -
 drivers/gpu/drm/mediatek/mtk_drm_gem.c | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

Drive-by comment: can you post a follow-up patch that also removes the "#include <drm/drm_gem_dma_helper.h>" from "mtk_drm_gem.c", assuming that still compiles? If it doesn't compile, that might be a bad sign that we missed something. ;-)

-Doug