Convert all remaining drivers to GEM object functions
Subsystems (25)
Thomas Zimmermann
maintainercover Convert all remaining drivers to GEM object functions
The GEM and PRIME related callbacks in struct drm_driver are deprecated in favor of GEM object functions in struct drm_gem_object_funcs. This patchset converts the remaining drivers to object functions and removes most of the obsolete interfaces.
Patches #1 to #18 convert DRM drivers to GEM object functions, one by one. Each patch moves existing callbacks from struct drm_driver to an instance of struct drm_gem_object_funcs, and sets these funcs when the GEM object is initialized. The expection is .gem_prime_mmap. There are different ways of how drivers implement the callback, and moving it to GEM object functions requires a closer review for each.
Patch #19 converts xlnx to CMA helper macros. There's no apparent reason why the driver does the GEM setup on it's own. Using CMA helper macros adds GEM object functions implicitly.
With most of the GEM and PRIME moved to GEM object functions, related code in struct drm_driver and in the DRM core/helpers is being removed by patch #20.
Further testing is welcome. I tested the drivers for which I have HW available, which are gma500, i915, nouveau, radeon and vc4. The console, Weston and Xorg apparently work with the patches applied.
Thomas Zimmermann (20):
drm/amdgpu: Introduce GEM object functions
drm/armada: Introduce GEM object functions
drm/etnaviv: Introduce GEM object functions
drm/exynos: Introduce GEM object functions
drm/gma500: Introduce GEM object functions
drm/i915: Introduce GEM object functions
drm/mediatek: Introduce GEM object functions
drm/msm: Introduce GEM object funcs
drm/nouveau: Introduce GEM object functions
drm/omapdrm: Introduce GEM object functions
drm/pl111: Introduce GEM object functions
drm/radeon: Introduce GEM object functions
drm/rockchip: Convert to drm_gem_object_funcs
drm/tegra: Introduce GEM object functions
drm/vc4: Introduce GEM object functions
drm/vgem: Introduce GEM object functions
drm/vkms: Introduce GEM object functions
drm/xen: Introduce GEM object functions
drm/xlnx: Initialize DRM driver instance with CMA helper macro
drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 -- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 12 +++ drivers/gpu/drm/armada/armada_drv.c | 3 - drivers/gpu/drm/armada/armada_gem.c | 12 ++- drivers/gpu/drm/armada/armada_gem.h | 2 - drivers/gpu/drm/drm_gem.c | 35 ++------ drivers/gpu/drm/drm_gem_cma_helper.c | 6 +- drivers/gpu/drm/drm_prime.c | 17 ++-- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 13 --- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 ++++- drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 --- drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 ++++ drivers/gpu/drm/gma500/framebuffer.c | 2 + drivers/gpu/drm/gma500/gem.c | 18 +++- drivers/gpu/drm/gma500/gem.h | 3 + drivers/gpu/drm/gma500/psb_drv.c | 9 -- drivers/gpu/drm/gma500/psb_drv.h | 2 - drivers/gpu/drm/i915/gem/i915_gem_object.c | 9 +- drivers/gpu/drm/i915/i915_drv.c | 10 ++- drivers/gpu/drm/i915/i915_drv.h | 1 + .../gpu/drm/i915/selftests/mock_gem_device.c | 3 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 -- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 11 +++ drivers/gpu/drm/msm/msm_drv.c | 13 --- drivers/gpu/drm/msm/msm_drv.h | 1 - drivers/gpu/drm/msm/msm_gem.c | 19 ++++- drivers/gpu/drm/nouveau/nouveau_drm.c | 9 -- drivers/gpu/drm/nouveau/nouveau_gem.c | 13 +++ drivers/gpu/drm/nouveau/nouveau_gem.h | 2 + drivers/gpu/drm/nouveau/nouveau_prime.c | 2 + drivers/gpu/drm/omapdrm/omap_drv.c | 9 -- drivers/gpu/drm/omapdrm/omap_gem.c | 16 +++- drivers/gpu/drm/omapdrm/omap_gem.h | 1 - drivers/gpu/drm/pl111/pl111_drv.c | 28 +++++- drivers/gpu/drm/radeon/radeon_drv.c | 23 +---- drivers/gpu/drm/radeon/radeon_object.c | 26 ++++++ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 5 -- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 10 +++ drivers/gpu/drm/tegra/drm.c | 4 - drivers/gpu/drm/tegra/gem.c | 8 ++ drivers/gpu/drm/vc4/vc4_bo.c | 21 ++++- drivers/gpu/drm/vc4/vc4_drv.c | 12 --- drivers/gpu/drm/vc4/vc4_drv.h | 1 - drivers/gpu/drm/vgem/vgem_drv.c | 21 +++-- drivers/gpu/drm/vkms/vkms_drv.c | 8 -- drivers/gpu/drm/vkms/vkms_gem.c | 13 +++ drivers/gpu/drm/xen/xen_drm_front.c | 12 +-- drivers/gpu/drm/xen/xen_drm_front.h | 2 + drivers/gpu/drm/xen/xen_drm_front_gem.c | 15 ++++ drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 14 +-- include/drm/drm_drv.h | 85 +------------------ 52 files changed, 311 insertions(+), 306 deletions(-)
Thomas Zimmermann
maintainerPATCH 1/20 drm/amdgpu: Introduce GEM object functions
GEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in amdgpu. The only exception is gem_prime_mmap, which is non-trivial to convert.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ------ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -6
@@ -1468,19 +1468,13 @@ static struct drm_driver kms_driver = { .lastclose = amdgpu_driver_lastclose_kms, .irq_handler = amdgpu_irq_handler, .ioctls = amdgpu_ioctls_kms, - .gem_free_object_unlocked = amdgpu_gem_object_free, - .gem_open_object = amdgpu_gem_object_open, - .gem_close_object = amdgpu_gem_object_close, .dumb_create = amdgpu_mode_dumb_create, .dumb_map_offset = amdgpu_mode_dumb_mmap, .fops = &amdgpu_driver_kms_fops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = amdgpu_gem_prime_export, .gem_prime_import = amdgpu_gem_prime_import, - .gem_prime_vmap = amdgpu_gem_prime_vmap, - .gem_prime_vunmap = amdgpu_gem_prime_vunmap, .gem_prime_mmap = amdgpu_gem_prime_mmap, .name = DRIVER_NAME,
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +12 -0
@@ -36,6 +36,7 @@#include <drm/amdgpu_drm.h> #include <drm/drm_cache.h> #include "amdgpu.h" +#include "amdgpu_dma_buf.h" #include "amdgpu_trace.h" #include "amdgpu_amdkfd.h"
@@ -510,6 +511,15 @@ bool amdgpu_bo_support_uswc(u64 bo_flags)#endif } +static const struct drm_gem_object_funcs amdgpu_gem_object_funcs = { + .free = amdgpu_gem_object_free, + .open = amdgpu_gem_object_open, + .close = amdgpu_gem_object_close, + .export = amdgpu_gem_prime_export, + .vmap = amdgpu_gem_prime_vmap, + .vunmap = amdgpu_gem_prime_vunmap, +}; +static int amdgpu_bo_do_create (struct amdgpu_device *adev,struct amdgpu_bo_param *bp,struct amdgpu_bo **bo_ptr)
@@ -552,6 +562,8 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, bo =kzalloc (sizeof (struct amdgpu_bo ),GFP_KERNEL );if (bo ==NULL )return -ENOMEM ; + + bo->tbo.base.funcs = &amdgpu_gem_object_funcs;drm_gem_private_object_init (adev->ddev, &bo->tbo.base, size);INIT_LIST_HEAD (&bo->shadow_list); bo->vm_bo =NULL ;
Signature · 1 line
2.28.0
Christian König
maintainerRe: [PATCH 01/20] drm/amdgpu: Introduce GEM object functions
Am 13.08.20 um 10:36 schrieb Thomas Zimmermann:
Quoted 50 lines
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in amdgpu. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ------ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0
-6@@ -1468,19 +1468,13 @@ static struct drm_driver kms_driver = { .lastclose = amdgpu_driver_lastclose_kms, .irq_handler = amdgpu_irq_handler, .ioctls = amdgpu_ioctls_kms, - .gem_free_object_unlocked = amdgpu_gem_object_free, - .gem_open_object = amdgpu_gem_object_open, - .gem_close_object = amdgpu_gem_object_close, .dumb_create = amdgpu_mode_dumb_create, .dumb_map_offset = amdgpu_mode_dumb_mmap, .fops = &amdgpu_driver_kms_fops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = amdgpu_gem_prime_export, .gem_prime_import = amdgpu_gem_prime_import, - .gem_prime_vmap = amdgpu_gem_prime_vmap, - .gem_prime_vunmap = amdgpu_gem_prime_vunmap, .gem_prime_mmap = amdgpu_gem_prime_mmap, .name = DRIVER_NAME,drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1
-0@@ -36,6 +36,7 @@#include <drm/amdgpu_drm.h> #include <drm/drm_cache.h> #include "amdgpu.h" +#include "amdgpu_dma_buf.h" #include "amdgpu_trace.h" #include "amdgpu_amdkfd.h" @@ -510,6 +511,15 @@ bool amdgpu_bo_support_uswc(u64 bo_flags)#endif }
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c bool amdgpu_bo_support_uswc(u64 bo_flags) · line 522
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +9
-0+static const struct drm_gem_object_funcs amdgpu_gem_object_funcs = { + .free = amdgpu_gem_object_free, + .open = amdgpu_gem_object_open, + .close = amdgpu_gem_object_close, + .export = amdgpu_gem_prime_export, + .vmap = amdgpu_gem_prime_vmap, + .vunmap = amdgpu_gem_prime_vunmap, +}; +
Wrong file, this belongs into amdgpu_gem.c
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c static int amdgpu_bo_do_create(struct amdgpu_device *adev, · line 566
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2
-0static int amdgpu_bo_do_create (struct amdgpu_device *adev,struct amdgpu_bo_param *bp,struct amdgpu_bo **bo_ptr)@@ -552,6 +562,8 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, bo =kzalloc (sizeof (struct amdgpu_bo ),GFP_KERNEL );if (bo ==NULL )return -ENOMEM ; + + bo->tbo.base.funcs = &amdgpu_gem_object_funcs;
And this should probably go into amdgpu_gem_object_create().
Apart from that looks like a good idea to me.
Christian.
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-0drm_gem_private_object_init (adev->ddev, &bo->tbo.base, size);INIT_LIST_HEAD (&bo->shadow_list); bo->vm_bo =NULL ;
Thomas Zimmermann
maintainerRe: [PATCH 01/20] drm/amdgpu: Introduce GEM object functions
Hi
Am 13.08.20 um 12:22 schrieb Christian König:
Quoted 62 lines
Am 13.08.20 um 10:36 schrieb Thomas Zimmermann:
Quoted 56 lines
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in amdgpu. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>---
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ------drivers/gpu/drm/amd/amdgpu/amdgpu_object.c| 12 ++++++++++++2 files changed, 12 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0
-6@@ -1468,19 +1468,13 @@ static struct drm_driver kms_driver = { .lastclose = amdgpu_driver_lastclose_kms, .irq_handler = amdgpu_irq_handler, .ioctls = amdgpu_ioctls_kms, - .gem_free_object_unlocked = amdgpu_gem_object_free, - .gem_open_object = amdgpu_gem_object_open, - .gem_close_object = amdgpu_gem_object_close, .dumb_create = amdgpu_mode_dumb_create, .dumb_map_offset = amdgpu_mode_dumb_mmap, .fops = &amdgpu_driver_kms_fops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = amdgpu_gem_prime_export, .gem_prime_import = amdgpu_gem_prime_import, - .gem_prime_vmap = amdgpu_gem_prime_vmap, - .gem_prime_vunmap = amdgpu_gem_prime_vunmap, .gem_prime_mmap = amdgpu_gem_prime_mmap, .name = DRIVER_NAME,drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1
-0@@ -36,6 +36,7 @@ #include <drm/amdgpu_drm.h> #include <drm/drm_cache.h> #include "amdgpu.h" +#include "amdgpu_dma_buf.h" #include "amdgpu_trace.h" #include "amdgpu_amdkfd.h" @@ -510,6 +511,15 @@ bool amdgpu_bo_support_uswc(u64 bo_flags)#endif
}
+static const structdrm_gem_object_funcsamdgpu_gem_object_funcs= { + .free =amdgpu_gem_object_free,
+ .open =amdgpu_gem_object_open,
+ .close =amdgpu_gem_object_close,
+ .export =amdgpu_gem_prime_export,
+ .vmap =amdgpu_gem_prime_vmap,
+ .vunmap =amdgpu_gem_prime_vunmap,drivers/gpu/drm/amd/amdgpu/amdgpu_object.c bool amdgpu_bo_support_uswc(u64 bo_flags) · line 522
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2
-0+}; +Wrong file, this belongs into
amdgpu_gem.c
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c static int amdgpu_bo_do_create(struct · line 567
Quoted 10 lines
static int
amdgpu_bo_do_create(struct amdgpu_device *adev, struct amdgpu_bo_param *bp, struct amdgpu_bo **bo_ptr)drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2
-0@@ -552,6 +562,8 @@ static int amdgpu_bo_do_create(structamdgpu_device *adev, bo = kzalloc(sizeof(struct amdgpu_bo), GFP_KERNEL); if (bo == NULL) return -ENOMEM; + + bo->tbo.base.funcs = &amdgpu_gem_object_funcs;And this should probably go into
amdgpu_gem_object_create().
I'm trying to understand what amdgpu does. What about all the places where amdgpu calls amdgpu_bo_create() internally? Wouldn't these miss the free callback for the GEM object?
Best regards
Thomas
Quoted 9 lines
Apart from that looks like a good idea to me.
Christian.
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-0drm_gem_private_object_init(adev->ddev, &bo->tbo.base, size); INIT_LIST_HEAD(&bo->shadow_list);
bo->vm_bo= NULL;
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
Freedreno mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Re: [PATCH 01/20] drm/amdgpu: Introduce GEM object functions
Am 14.09.20 um 17:05 schrieb Thomas Zimmermann:
Quoted 75 lines
Hi
Am 13.08.20 um 12:22 schrieb Christian König:
Quoted 61 lines
Am 13.08.20 um 10:36 schrieb Thomas Zimmermann:
Quoted 56 lines
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in amdgpu. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ------ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0
-6@@ -1468,19 +1468,13 @@ static struct drm_driver kms_driver = { .lastclose = amdgpu_driver_lastclose_kms, .irq_handler = amdgpu_irq_handler, .ioctls = amdgpu_ioctls_kms, - .gem_free_object_unlocked = amdgpu_gem_object_free, - .gem_open_object = amdgpu_gem_object_open, - .gem_close_object = amdgpu_gem_object_close, .dumb_create = amdgpu_mode_dumb_create, .dumb_map_offset = amdgpu_mode_dumb_mmap, .fops = &amdgpu_driver_kms_fops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = amdgpu_gem_prime_export, .gem_prime_import = amdgpu_gem_prime_import, - .gem_prime_vmap = amdgpu_gem_prime_vmap, - .gem_prime_vunmap = amdgpu_gem_prime_vunmap, .gem_prime_mmap = amdgpu_gem_prime_mmap, .name = DRIVER_NAME,drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1
-0@@ -36,6 +36,7 @@ #include <drm/amdgpu_drm.h> #include <drm/drm_cache.h> #include "amdgpu.h" +#include "amdgpu_dma_buf.h" #include "amdgpu_trace.h" #include "amdgpu_amdkfd.h" @@ -510,6 +511,15 @@ bool amdgpu_bo_support_uswc(u64 bo_flags)#endif
}
+static const structdrm_gem_object_funcsamdgpu_gem_object_funcs= {
+ .free =amdgpu_gem_object_free,
+ .open =amdgpu_gem_object_open,
+ .close =amdgpu_gem_object_close,
+ .export =amdgpu_gem_prime_export,
+ .vmap =amdgpu_gem_prime_vmap,
+ .vunmap =amdgpu_gem_prime_vunmap,drivers/gpu/drm/amd/amdgpu/amdgpu_object.c bool amdgpu_bo_support_uswc(u64 bo_flags) · line 522
Quoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2
-0+}; +Wrong file, this belongs into
amdgpu_gem.cQuoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c static int amdgpu_bo_do_create(struct · line 567
Quoted 10 lines
static int
amdgpu_bo_do_create(struct amdgpu_device *adev, struct amdgpu_bo_param *bp, struct amdgpu_bo **bo_ptr)drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2
-0@@ -552,6 +562,8 @@ static int amdgpu_bo_do_create(structamdgpu_device *adev, bo = kzalloc(sizeof(struct amdgpu_bo), GFP_KERNEL); if (bo == NULL) return -ENOMEM; + + bo->tbo.base.funcs = &amdgpu_gem_object_funcs;And this should probably go into
amdgpu_gem_object_create().
Quoted 3 lines
I'm trying to understand what amdgpu does. What about all the places where amdgpu calls
amdgpu_bo_create()internally? Wouldn't these miss the free callback for the GEM object?
Those shouldn't have a GEM object in the first place.
Or otherwise we would have a reference counting issue.
Regards,
Christian.
Quoted 8 lines
Best regards
ThomasQuoted 4 lines
Apart from that looks like a good idea to me.
Christian.
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-0drm_gem_private_object_init(adev->ddev, &bo->tbo.base, size); INIT_LIST_HEAD(&bo->shadow_list);
bo->vm_bo= NULL;_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Thomas Zimmermann
maintainerPATCH 2/20 drm/armada: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in armada.
--- drivers/gpu/drm/armada/armada_drv.c | 3 --- drivers/gpu/drm/armada/armada_gem.c | 12 +++++++++++- drivers/gpu/drm/armada/armada_gem.h | 2 -- 3 files changed, 11 insertions(+), 6 deletions(-)
drivers/gpu/drm/armada/armada_drv.c +0 -3
@@ -37,13 +37,10 @@ DEFINE_DRM_GEM_FOPS(armada_drm_fops);static struct drm_driver armada_drm_driver = { .lastclose = drm_fb_helper_lastclose, - .gem_free_object_unlocked = armada_gem_free_object, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = armada_gem_prime_export, .gem_prime_import = armada_gem_prime_import, .dumb_create = armada_gem_dumb_create, - .gem_vm_ops = &armada_gem_vm_ops, .major =1 , .minor =0 , .name ="armada-drm" ,
drivers/gpu/drm/armada/armada_gem.c +11 -1
@@ -25,7 +25,7 @@ static vm_fault_t armada_gem_vm_fault(struct vm_fault *vmf)return vmf_insert_pfn (vmf->vma, vmf->address, pfn); } -const struct vm_operations_struct armada_gem_vm_ops = { +static const struct vm_operations_struct armada_gem_vm_ops = { .fault = armada_gem_vm_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close,
@@ -184,6 +184,12 @@ armada_gem_map_object(struct drm_device *dev, struct armada_gem_object *dobj)return dobj->addr; } +static const struct drm_gem_object_funcs armada_gem_object_funcs = { + .free = armada_gem_free_object, + .export = armada_gem_prime_export, + .vm_ops = &armada_gem_vm_ops, +}; +struct armada_gem_object *armada_gem_alloc_private_object (struct drm_device *dev,size_t size) {
@@ -195,6 +201,8 @@ armada_gem_alloc_private_object(struct drm_device *dev, size_t size)if (!obj)return NULL ; + obj->obj.funcs = &armada_gem_object_funcs; +drm_gem_private_object_init (dev, &obj->obj, size);DRM_DEBUG_DRIVER ("alloc private obj %p size %zu\n" , obj, size);
@@ -214,6 +222,8 @@ static struct armada_gem_object *armada_gem_alloc_object(struct drm_device *dev,if (!obj)return NULL ; + obj->obj.funcs = &armada_gem_object_funcs; +if (drm_gem_object_init (dev, &obj->obj, size)) {kfree (obj);return NULL ;
drivers/gpu/drm/armada/armada_gem.h +0 -2
@@ -21,8 +21,6 @@ struct armada_gem_object {void *update_data; }; -extern const struct vm_operations_struct armada_gem_vm_ops; -#define drm_to_armada_gem (o) container_of(o, struct armada_gem_object, obj)void armada_gem_free_object (struct drm_gem_object *);
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 3/20 drm/etnaviv: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in etnaviv. The only exception is gem_prime_mmap, which is non-trivial to convert.
--- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 13 ------------- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - drivers/gpu/drm/etnaviv/etnaviv_gem.c | 19 ++++++++++++++++++- 3 files changed, 18 insertions(+), 15 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_drv.c +0 -13
@@ -468,12 +468,6 @@ static const struct drm_ioctl_desc etnaviv_ioctls[] = { ETNA_IOCTL(PM_QUERY_SIG, pm_query_sig, DRM_RENDER_ALLOW), }; -static const struct vm_operations_struct vm_ops = { - .fault = etnaviv_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static const struct file_operations fops = { .owner =THIS_MODULE , .open = drm_open,
@@ -490,16 +484,9 @@ static struct drm_driver etnaviv_drm_driver = { .driver_features = DRIVER_GEM | DRIVER_RENDER, .open = etnaviv_open, .postclose = etnaviv_postclose, - .gem_free_object_unlocked = etnaviv_gem_free_object, - .gem_vm_ops = &vm_ops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_pin = etnaviv_gem_prime_pin, - .gem_prime_unpin = etnaviv_gem_prime_unpin, - .gem_prime_get_sg_table = etnaviv_gem_prime_get_sg_table, .gem_prime_import_sg_table = etnaviv_gem_prime_import_sg_table, - .gem_prime_vmap = etnaviv_gem_prime_vmap, - .gem_prime_vunmap = etnaviv_gem_prime_vunmap, .gem_prime_mmap = etnaviv_gem_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init = etnaviv_debugfs_init,
drivers/gpu/drm/etnaviv/etnaviv_drv.h +0 -1
@@ -49,7 +49,6 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, struct drm_file *file);int etnaviv_gem_mmap (struct file *filp,struct vm_area_struct *vma); -vm_fault_t etnaviv_gem_fault (struct vm_fault *vmf);int etnaviv_gem_mmap_offset (struct drm_gem_object *obj,u64 *offset);struct sg_table *etnaviv_gem_prime_get_sg_table (struct drm_gem_object *obj);void *etnaviv_gem_prime_vmap (struct drm_gem_object *obj);
drivers/gpu/drm/etnaviv/etnaviv_gem.c +18 -1
@@ -170,7 +170,7 @@ int etnaviv_gem_mmap(struct file *filp, struct vm_area_struct *vma)return obj->ops->mmap (obj, vma); } -vm_fault_t etnaviv_gem_fault (struct vm_fault *vmf) +static vm_fault_t etnaviv_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_gem_object *obj = vma->vm_private_data;
@@ -560,6 +560,22 @@ void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj)mutex_unlock (&priv->gem_lock); } +static const struct vm_operations_struct vm_ops = { + .fault = etnaviv_gem_fault, + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs etnaviv_gem_object_funcs = { + .free = etnaviv_gem_free_object, + .pin = etnaviv_gem_prime_pin, + .unpin = etnaviv_gem_prime_unpin, + .get_sg_table = etnaviv_gem_prime_get_sg_table, + .vmap = etnaviv_gem_prime_vmap, + .vunmap = etnaviv_gem_prime_vunmap, + .vm_ops = &vm_ops, +}; +static int etnaviv_gem_new_impl (struct drm_device *dev,u32 size,u32 flags,const struct etnaviv_gem_ops *ops,struct drm_gem_object **obj) {
@@ -594,6 +610,7 @@ static int etnaviv_gem_new_impl(struct drm_device *dev, u32 size, u32 flags,INIT_LIST_HEAD (&etnaviv_obj->vram_list); *obj = &etnaviv_obj->base; + (*obj)->funcs = &etnaviv_gem_object_funcs;return 0 ; }
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 4/20 drm/exynos: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in exynos. The only exception is gem_prime_mmap, which is non-trivial to convert.
--- drivers/gpu/drm/exynos/exynos_drm_drv.c | 10 ---------- drivers/gpu/drm/exynos/exynos_drm_gem.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 10 deletions(-)
drivers/gpu/drm/exynos/exynos_drm_drv.c +0 -10
@@ -75,11 +75,6 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) file->driver_priv =NULL ; } -static const struct vm_operations_struct exynos_drm_gem_vm_ops = { - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static const struct drm_ioctl_desc exynos_ioctls[] = {DRM_IOCTL_DEF_DRV (EXYNOS_GEM_CREATE , exynos_drm_gem_create_ioctl,DRM_RENDER_ALLOW ),
@@ -124,16 +119,11 @@ static struct drm_driver exynos_drm_driver = { .open = exynos_drm_open, .lastclose = drm_fb_helper_lastclose, .postclose = exynos_drm_postclose, - .gem_free_object_unlocked = exynos_drm_gem_free_object, - .gem_vm_ops = &exynos_drm_gem_vm_ops, .dumb_create = exynos_drm_gem_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = exynos_drm_gem_prime_import, - .gem_prime_get_sg_table = exynos_drm_gem_prime_get_sg_table, .gem_prime_import_sg_table = exynos_drm_gem_prime_import_sg_table, - .gem_prime_vmap = exynos_drm_gem_prime_vmap, - .gem_prime_vunmap = exynos_drm_gem_prime_vunmap, .gem_prime_mmap = exynos_drm_gem_prime_mmap, .ioctls = exynos_ioctls, .num_ioctls = ARRAY_SIZE(exynos_ioctls),
drivers/gpu/drm/exynos/exynos_drm_gem.c +15 -0
@@ -129,6 +129,19 @@ void exynos_drm_gem_destroy(struct exynos_drm_gem *exynos_gem)kfree (exynos_gem); } +static const struct vm_operations_struct exynos_drm_gem_vm_ops = { + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs exynos_drm_gem_object_funcs = { + .free = exynos_drm_gem_free_object, + .get_sg_table = exynos_drm_gem_prime_get_sg_table, + .vmap = exynos_drm_gem_prime_vmap, + .vunmap = exynos_drm_gem_prime_vunmap, + .vm_ops = &exynos_drm_gem_vm_ops, +}; +static struct exynos_drm_gem *exynos_drm_gem_init (struct drm_device *dev,unsigned long size) {
@@ -143,6 +156,8 @@ static struct exynos_drm_gem *exynos_drm_gem_init(struct drm_device *dev, exynos_gem->size = size; obj = &exynos_gem->base; + obj->funcs = &exynos_drm_gem_object_funcs; + ret =drm_gem_object_init (dev, obj, size);if (ret <0 ) {DRM_DEV_ERROR (dev->dev,"failed to initialize gem object\n" );
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 5/20 drm/gma500: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in gma500.
--- drivers/gpu/drm/gma500/framebuffer.c | 2 ++ drivers/gpu/drm/gma500/gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/gma500/gem.h | 3 +++ drivers/gpu/drm/gma500/psb_drv.c | 9 --------- drivers/gpu/drm/gma500/psb_drv.h | 2 -- 5 files changed, 21 insertions(+), 13 deletions(-)
drivers/gpu/drm/gma500/framebuffer.c +2 -0
@@ -24,6 +24,7 @@#include <drm/drm_gem_framebuffer_helper.h> #include "framebuffer.h" +#include "gem.h" #include "gtt.h" #include "psb_drv.h" #include "psb_intel_drv.h"
@@ -285,6 +286,7 @@ static struct gtt_range *psbfb_alloc(struct drm_device *dev, int aligned_size)/* Begin by trying to use stolen memory backing */ backing =psb_gtt_alloc_range (dev, aligned_size,"fb" ,1 ,PAGE_SIZE );if (backing) { + backing->gem.funcs = &psb_gem_object_funcs;drm_gem_private_object_init (dev, &backing->gem, aligned_size);return backing; }
drivers/gpu/drm/gma500/gem.c +16 -2
@@ -18,7 +18,9 @@#include "psb_drv.h" -void psb_gem_free_object (struct drm_gem_object *obj) +static vm_fault_t psb_gem_fault (struct vm_fault *vmf); + +static void psb_gem_free_object (struct drm_gem_object *obj) { struct gtt_range *gtt = container_of(obj, struct gtt_range, gem);
@@ -36,6 +38,17 @@ int psb_gem_get_aperture(struct drm_device *dev, void *data,return -EINVAL ; } +static const struct vm_operations_struct psb_gem_vm_ops = { + .fault = psb_gem_fault, + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +const struct drm_gem_object_funcs psb_gem_object_funcs = { + .free = psb_gem_free_object, + .vm_ops = &psb_gem_vm_ops, +}; +/** * psb_gem_create - create a mappable object * @file: the DRM file of the client
@@ -63,6 +76,7 @@ int psb_gem_create(struct drm_file *file, struct drm_device *dev, u64 size,dev_err (dev->dev,"no memory for %lld byte GEM object\n" , size);return -ENOSPC ; } + r->gem.funcs = &psb_gem_object_funcs;/* Initialize the extra goodies GEM needs to do all the hard work */ if (drm_gem_object_init (dev, &r->gem, size) !=0 ) {psb_gtt_free_range (dev, r);
@@ -123,7 +137,7 @@ int psb_gem_dumb_create(struct drm_file *file, struct drm_device *dev,* vma->vm_private_data points to the GEM object that is backing this * mapping. */ -vm_fault_t psb_gem_fault (struct vm_fault *vmf) +static vm_fault_t psb_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_gem_object *obj;
drivers/gpu/drm/gma500/gem.h +3 -0
@@ -8,6 +8,9 @@#ifndef _GEM_H#define _GEM_H +extern const struct drm_gem_object_funcs psb_gem_object_funcs; +extern int psb_gem_create (struct drm_file *file,struct drm_device *dev,u64 size,u32 *handlep,int stolen,u32 align); +#endif
drivers/gpu/drm/gma500/psb_drv.c +0 -9
@@ -480,12 +480,6 @@ static const struct dev_pm_ops psb_pm_ops = { .runtime_idle = psb_runtime_idle, }; -static const struct vm_operations_struct psb_gem_vm_ops = { - .fault = psb_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static const struct file_operations psb_gem_fops = { .owner =THIS_MODULE , .open = drm_open,
@@ -507,9 +501,6 @@ static struct drm_driver driver = { .irq_uninstall = psb_irq_uninstall, .irq_handler = psb_irq_handler, - .gem_free_object_unlocked = psb_gem_free_object, - .gem_vm_ops = &psb_gem_vm_ops, - .dumb_create = psb_gem_dumb_create, .ioctls = psb_ioctls, .fops = &psb_gem_fops,
drivers/gpu/drm/gma500/psb_drv.h +0 -2
@@ -735,12 +735,10 @@ extern const struct drm_connector_helper_funcsextern const struct drm_connector_funcs psb_intel_lvds_connector_funcs;/* gem.c */ -extern void psb_gem_free_object (struct drm_gem_object *obj);extern int psb_gem_get_aperture (struct drm_device *dev,void *data,struct drm_file *file);extern int psb_gem_dumb_create (struct drm_file *file,struct drm_device *dev,struct drm_mode_create_dumb *args); -extern vm_fault_t psb_gem_fault (struct vm_fault *vmf);/* psb_device.c */ extern const struct psb_ops psb_chip_ops;
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 6/20 drm/i915: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in i915.
--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 9 ++++++++- drivers/gpu/drm/i915/i915_drv.c | 10 ++++++---- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 --- 4 files changed, 15 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object.c +8 -1
@@ -41,7 +41,14 @@ static struct i915_global_object {struct drm_i915_gem_object *i915_gem_object_alloc (void ) { -return kmem_cache_zalloc (global.slab_objects,GFP_KERNEL ); +struct drm_i915_gem_object *obj; + + obj =kmem_cache_zalloc (global.slab_objects,GFP_KERNEL ); +if (!obj) +return NULL ; + obj->base.funcs = &i915_gem_object_funcs; + +return obj; }void i915_gem_object_free (struct drm_i915_gem_object *obj)
drivers/gpu/drm/i915/i915_drv.c +6 -4
@@ -1840,6 +1840,12 @@ static const struct drm_ioctl_desc i915_ioctls[] = { DRM_IOCTL_DEF_DRV(I915_GEM_VM_DESTROY, i915_gem_vm_destroy_ioctl, DRM_RENDER_ALLOW), }; +const struct drm_gem_object_funcs i915_gem_object_funcs = { + .free = i915_gem_free_object, + .close = i915_gem_close_object, + .export = i915_gem_prime_export, +}; +static struct drm_driver driver = {/* Don't use MTRRs here; the Xserver or userspace app should * deal with them for Intel hardware.
@@ -1853,12 +1859,8 @@ static struct drm_driver driver = { .lastclose = i915_driver_lastclose, .postclose = i915_driver_postclose, - .gem_close_object = i915_gem_close_object, - .gem_free_object_unlocked = i915_gem_free_object, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = i915_gem_prime_export, .gem_prime_import = i915_gem_prime_import, .dumb_create = i915_gem_dumb_create,
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1736,6 +1736,7 @@ intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv)/* i915_drv.c */ extern const struct dev_pm_ops i915_pm_ops; +extern const struct drm_gem_object_funcs i915_gem_object_funcs;int i915_driver_probe (struct pci_dev *pdev,const struct pci_device_id *ent);void i915_driver_remove (struct drm_i915_private *i915);
drivers/gpu/drm/i915/selftests/mock_gem_device.c +0 -3
@@ -86,9 +86,6 @@ static struct drm_driver mock_driver = { .name = "mock", .driver_features = DRIVER_GEM, .release = mock_device_release, - - .gem_close_object = i915_gem_close_object, - .gem_free_object_unlocked = i915_gem_free_object, };static void release_dev (struct device *dev)
Signature · 1 line
2.28.0
Jani Nikula
maintainerRe: [PATCH 06/20] drm/i915: Introduce GEM object functions
Quoted 37 lines · Thomas Zimmermann
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in i915.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 9 ++++++++- drivers/gpu/drm/i915/i915_drv.c | 10 ++++++---- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 --- 4 files changed, 15 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_object.c +8
-1@@ -41,7 +41,14 @@ static struct i915_global_object {struct drm_i915_gem_object *i915_gem_object_alloc (void ) { -return kmem_cache_zalloc (global.slab_objects,GFP_KERNEL ); +struct drm_i915_gem_object *obj; + + obj =kmem_cache_zalloc (global.slab_objects,GFP_KERNEL ); +if (!obj) +return NULL ; + obj->base.funcs = &i915_gem_object_funcs; + +return obj; }void i915_gem_object_free (struct drm_i915_gem_object *obj)drivers/gpu/drm/i915/i915_drv.c +0
-0
drivers/gpu/drm/i915/i915_drv.c static const struct drm_ioctl_desc i915_ioctls[] = { · line 1848
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c +6
-0@@ -1840,6 +1840,12 @@ static const struct drm_ioctl_desc i915_ioctls[] = { DRM_IOCTL_DEF_DRV(I915_GEM_VM_DESTROY, i915_gem_vm_destroy_ioctl, DRM_RENDER_ALLOW), }; +const struct drm_gem_object_funcs i915_gem_object_funcs = { + .free = i915_gem_free_object, + .close = i915_gem_close_object, + .export = i915_gem_prime_export, +}; +
Any reason not to make this static in i915_gem_object.c next to its only user?
BR,
Jani.
Quoted 42 lines
drivers/gpu/drm/i915/i915_drv.c +0
-4static struct drm_driver driver = {/* Don't use MTRRs here; the Xserver or userspace app should * deal with them for Intel hardware. @@ -1853,12 +1859,8 @@ static struct drm_driver driver = { .lastclose = i915_driver_lastclose, .postclose = i915_driver_postclose, - .gem_close_object = i915_gem_close_object, - .gem_free_object_unlocked = i915_gem_free_object, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = i915_gem_prime_export, .gem_prime_import = i915_gem_prime_import, .dumb_create = i915_gem_dumb_create,drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -1736,6 +1736,7 @@ intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv)/* i915_drv.c */ extern const struct dev_pm_ops i915_pm_ops; +extern const struct drm_gem_object_funcs i915_gem_object_funcs;int i915_driver_probe (struct pci_dev *pdev,const struct pci_device_id *ent);void i915_driver_remove (struct drm_i915_private *i915);drivers/gpu/drm/i915/selftests/mock_gem_device.c +0
-3@@ -86,9 +86,6 @@ static struct drm_driver mock_driver = { .name = "mock", .driver_features = DRIVER_GEM, .release = mock_device_release, - - .gem_close_object = i915_gem_close_object, - .gem_free_object_unlocked = i915_gem_free_object, };static void release_dev (struct device *dev)
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Thomas Zimmermann
maintainerRe: [PATCH 06/20] drm/i915: Introduce GEM object functions
Hi
Am 13.08.20 um 11:08 schrieb Jani Nikula:
Quoted 41 lines · Thomas Zimmermann
Quoted 40 lines
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in i915.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 9 ++++++++- drivers/gpu/drm/i915/i915_drv.c | 10 ++++++---- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 --- 4 files changed, 15 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_object.c +8
-1@@ -41,7 +41,14 @@ static struct i915_global_object {struct drm_i915_gem_object *i915_gem_object_alloc (void ) { -return kmem_cache_zalloc (global.slab_objects,GFP_KERNEL ); +struct drm_i915_gem_object *obj; + + obj =kmem_cache_zalloc (global.slab_objects,GFP_KERNEL ); +if (!obj) +return NULL ; + obj->base.funcs = &i915_gem_object_funcs; + +return obj; }void i915_gem_object_free (struct drm_i915_gem_object *obj)drivers/gpu/drm/i915/i915_drv.c +0
-0@@ -1840,6 +1840,12 @@ static const struct drm_ioctl_desc i915_ioctls[] = { DRM_IOCTL_DEF_DRV(I915_GEM_VM_DESTROY, i915_gem_vm_destroy_ioctl, DRM_RENDER_ALLOW), };
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c static const struct drm_ioctl_desc i915_ioctls[] = { · line 1848
Quoted 6 lines
drivers/gpu/drm/i915/i915_drv.c +6
-0+const struct drm_gem_object_funcs i915_gem_object_funcs = { + .free = i915_gem_free_object, + .close = i915_gem_close_object, + .export = i915_gem_prime_export, +}; +Any reason not to make this static in
i915_gem_object.cnext to its only user?
That is just an oversight. Will be fixed in the next iteration. Thanks.
Best regards
Thomas
Quoted 48 lines
BR,
Jani.Quoted 42 lines
drivers/gpu/drm/i915/i915_drv.c +0
-4static struct drm_driver driver = {/* Don't use MTRRs here; the Xserver or userspace app should * deal with them for Intel hardware. @@ -1853,12 +1859,8 @@ static struct drm_driver driver = { .lastclose = i915_driver_lastclose, .postclose = i915_driver_postclose, - .gem_close_object = i915_gem_close_object, - .gem_free_object_unlocked = i915_gem_free_object, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = i915_gem_prime_export, .gem_prime_import = i915_gem_prime_import, .dumb_create = i915_gem_dumb_create,drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -1736,6 +1736,7 @@ intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv)/* i915_drv.c */ extern const struct dev_pm_ops i915_pm_ops; +extern const struct drm_gem_object_funcs i915_gem_object_funcs;int i915_driver_probe (struct pci_dev *pdev,const struct pci_device_id *ent);void i915_driver_remove (struct drm_i915_private *i915);drivers/gpu/drm/i915/selftests/mock_gem_device.c +0
-3@@ -86,9 +86,6 @@ static struct drm_driver mock_driver = { .name = "mock", .driver_features = DRIVER_GEM, .release = mock_device_release, - - .gem_close_object = i915_gem_close_object, - .gem_free_object_unlocked = i915_gem_free_object, };static void release_dev (struct device *dev)
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Thomas Zimmermann
maintainerPATCH 7/20 drm/mediatek: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in mediatek. The only exception is gem_prime_mmap, which is non-trivial to convert.
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 ----- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 5 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +0 -5
@@ -301,18 +301,13 @@ struct drm_gem_object *mtk_drm_gem_prime_import(struct drm_device *dev,static struct drm_driver mtk_drm_driver = { .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, .dumb_create = mtk_drm_gem_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = mtk_drm_gem_prime_import, - .gem_prime_get_sg_table = mtk_gem_prime_get_sg_table, .gem_prime_import_sg_table = mtk_gem_prime_import_sg_table, .gem_prime_mmap = mtk_drm_gem_mmap_buf, - .gem_prime_vmap = mtk_drm_gem_prime_vmap, - .gem_prime_vunmap = mtk_drm_gem_prime_vunmap, .fops = &mtk_drm_fops, .name =DRIVER_NAME ,
drivers/gpu/drm/mediatek/mtk_drm_gem.c +11 -0
@@ -8,11 +8,20 @@#include <drm/drm.h> #include <drm/drm_device.h> #include <drm/drm_gem.h> +#include <drm/drm_gem_cma_helper.h> #include <drm/drm_prime.h> #include "mtk_drm_drv.h" #include "mtk_drm_gem.h" +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, + .vm_ops = &drm_gem_cma_vm_ops, +}; +static struct mtk_drm_gem_obj *mtk_drm_gem_init (struct drm_device *dev,unsigned long size) {
@@ -25,6 +34,8 @@ static struct mtk_drm_gem_obj *mtk_drm_gem_init(struct drm_device *dev,if (!mtk_gem_obj)return ERR_PTR (-ENOMEM ); + mtk_gem_obj->base.funcs = &mtk_drm_gem_object_funcs; + ret =drm_gem_object_init (dev, &mtk_gem_obj->base, size);if (ret <0 ) {DRM_ERROR ("failed to initialize gem object\n" );
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 8/20 drm/msm: Introduce GEM object funcs
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in msm. The only exception is gem_prime_mmap, which is non-trivial to convert.
--- drivers/gpu/drm/msm/msm_drv.c | 13 ------------- drivers/gpu/drm/msm/msm_drv.h | 1 - drivers/gpu/drm/msm/msm_gem.c | 19 ++++++++++++++++++- 3 files changed, 18 insertions(+), 15 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +0 -13
@@ -989,12 +989,6 @@ static const struct drm_ioctl_desc msm_ioctls[] = { DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), }; -static const struct vm_operations_struct vm_ops = { - .fault = msm_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static const struct file_operations fops = { .owner =THIS_MODULE , .open = drm_open,
@@ -1020,18 +1014,11 @@ static struct drm_driver msm_driver = { .irq_preinstall = msm_irq_preinstall, .irq_postinstall = msm_irq_postinstall, .irq_uninstall = msm_irq_uninstall, - .gem_free_object_unlocked = msm_gem_free_object, - .gem_vm_ops = &vm_ops, .dumb_create = msm_gem_dumb_create, .dumb_map_offset = msm_gem_dumb_map_offset, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_pin = msm_gem_prime_pin, - .gem_prime_unpin = msm_gem_prime_unpin, - .gem_prime_get_sg_table = msm_gem_prime_get_sg_table, .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, - .gem_prime_vmap = msm_gem_prime_vmap, - .gem_prime_vunmap = msm_gem_prime_vunmap, .gem_prime_mmap = msm_gem_prime_mmap, #ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init,
drivers/gpu/drm/msm/msm_drv.h +0 -1
@@ -269,7 +269,6 @@ void msm_gem_shrinker_cleanup(struct drm_device *dev);int msm_gem_mmap_obj (struct drm_gem_object *obj,struct vm_area_struct *vma);int msm_gem_mmap (struct file *filp,struct vm_area_struct *vma); -vm_fault_t msm_gem_fault (struct vm_fault *vmf);uint64_t msm_gem_mmap_offset (struct drm_gem_object *obj);int msm_gem_get_iova (struct drm_gem_object *obj,struct msm_gem_address_space *aspace,uint64_t *iova);
drivers/gpu/drm/msm/msm_gem.c +18 -1
@@ -247,7 +247,7 @@ int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma)return msm_gem_mmap_obj (vma->vm_private_data, vma); } -vm_fault_t msm_gem_fault (struct vm_fault *vmf) +static vm_fault_t msm_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_gem_object *obj = vma->vm_private_data;
@@ -994,6 +994,22 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,return ret; } +static const struct vm_operations_struct vm_ops = { + .fault = msm_gem_fault, + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs msm_gem_object_funcs = { + .free = msm_gem_free_object, + .pin = msm_gem_prime_pin, + .unpin = msm_gem_prime_unpin, + .get_sg_table = msm_gem_prime_get_sg_table, + .vmap = msm_gem_prime_vmap, + .vunmap = msm_gem_prime_vunmap, + .vm_ops = &vm_ops, +}; +static int msm_gem_new_impl (struct drm_device *dev,uint32_t size,uint32_t flags,struct drm_gem_object **obj)
@@ -1024,6 +1040,7 @@ static int msm_gem_new_impl(struct drm_device *dev,INIT_LIST_HEAD (&msm_obj->vmas); *obj = &msm_obj->base; + (*obj)->funcs = &msm_gem_object_funcs;return 0 ; }
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 9/20 drm/nouveau: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in nouveau.
--- drivers/gpu/drm/nouveau/nouveau_drm.c | 9 --------- drivers/gpu/drm/nouveau/nouveau_gem.c | 13 +++++++++++++ drivers/gpu/drm/nouveau/nouveau_gem.h | 2 ++ drivers/gpu/drm/nouveau/nouveau_prime.c | 2 ++ 4 files changed, 17 insertions(+), 9 deletions(-)
drivers/gpu/drm/nouveau/nouveau_drm.c +0 -9
@@ -1207,16 +1207,7 @@ driver_stub = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_pin = nouveau_gem_prime_pin, - .gem_prime_unpin = nouveau_gem_prime_unpin, - .gem_prime_get_sg_table = nouveau_gem_prime_get_sg_table, .gem_prime_import_sg_table = nouveau_gem_prime_import_sg_table, - .gem_prime_vmap = nouveau_gem_prime_vmap, - .gem_prime_vunmap = nouveau_gem_prime_vunmap, - - .gem_free_object_unlocked = nouveau_gem_object_del, - .gem_open_object = nouveau_gem_object_open, - .gem_close_object = nouveau_gem_object_close, .dumb_create = nouveau_display_dumb_create, .dumb_map_offset = nouveau_display_dumb_map_offset,
drivers/gpu/drm/nouveau/nouveau_gem.c +13 -0
@@ -169,6 +169,17 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv)ttm_bo_unreserve (&nvbo->bo); } +const struct drm_gem_object_funcs nouveau_gem_object_funcs = { + .free = nouveau_gem_object_del, + .open = nouveau_gem_object_open, + .close = nouveau_gem_object_close, + .pin = nouveau_gem_prime_pin, + .unpin = nouveau_gem_prime_unpin, + .get_sg_table = nouveau_gem_prime_get_sg_table, + .vmap = nouveau_gem_prime_vmap, + .vunmap = nouveau_gem_prime_vunmap, +}; + int nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain, uint32_t tile_mode, uint32_t tile_flags,
@@ -194,6 +205,8 @@ nouveau_gem_new(struct nouveau_cli *cli, u64 size, int align, uint32_t domain,if (IS_ERR (nvbo))return PTR_ERR (nvbo); + nvbo->bo.base.funcs = &nouveau_gem_object_funcs; +/* Initialize the embedded gem-object. We return a single gem-reference * to the caller, instead of a normal nouveau_bo ttm reference. */ ret =drm_gem_object_init (drm->dev, &nvbo->bo.base, size);
drivers/gpu/drm/nouveau/nouveau_gem.h +2 -0
@@ -5,6 +5,8 @@#include "nouveau_drv.h" #include "nouveau_bo.h" +extern const struct drm_gem_object_funcs nouveau_gem_object_funcs; +static inline struct nouveau_bo *nouveau_gem_object (struct drm_gem_object *gem) {
drivers/gpu/drm/nouveau/nouveau_prime.c +2 -0
@@ -79,6 +79,8 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev, nvbo->valid_domains =NOUVEAU_GEM_DOMAIN_GART ; + nvbo->bo.base.funcs = &nouveau_gem_object_funcs; +/* Initialize the embedded gem-object. We return a single gem-reference * to the caller, instead of a normal nouveau_bo ttm reference. */ ret =drm_gem_object_init (dev, &nvbo->bo.base, size);
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 10/20 drm/omapdrm: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in omapdrm.
--- drivers/gpu/drm/omapdrm/omap_drv.c | 9 --------- drivers/gpu/drm/omapdrm/omap_gem.c | 16 +++++++++++++++- drivers/gpu/drm/omapdrm/omap_gem.h | 1 - 3 files changed, 15 insertions(+), 11 deletions(-)
drivers/gpu/drm/omapdrm/omap_drv.c +0 -9
@@ -521,12 +521,6 @@ static int dev_open(struct drm_device *dev, struct drm_file *file)return 0 ; } -static const struct vm_operations_struct omap_gem_vm_ops = { - .fault = omap_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static const struct file_operations omapdriver_fops = { .owner =THIS_MODULE , .open = drm_open,
@@ -549,10 +543,7 @@ static struct drm_driver omap_drm_driver = {#endif .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = omap_gem_prime_export, .gem_prime_import = omap_gem_prime_import, - .gem_free_object_unlocked = omap_gem_free_object, - .gem_vm_ops = &omap_gem_vm_ops, .dumb_create = omap_gem_dumb_create, .dumb_map_offset = omap_gem_dumb_map_offset, .ioctls = ioctls,
drivers/gpu/drm/omapdrm/omap_gem.c +15 -1
@@ -487,7 +487,7 @@ static vm_fault_t omap_gem_fault_2d(struct drm_gem_object *obj,* vma->vm_private_data points to the GEM object that is backing this * mapping. */ -vm_fault_t omap_gem_fault (struct vm_fault *vmf) +static vm_fault_t omap_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_gem_object *obj = vma->vm_private_data;
@@ -1169,6 +1169,18 @@ static bool omap_gem_validate_flags(struct drm_device *dev, u32 flags)return true; } +static const struct vm_operations_struct omap_gem_vm_ops = { + .fault = omap_gem_fault, + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs omap_gem_object_funcs = { + .free = omap_gem_free_object, + .export = omap_gem_prime_export, + .vm_ops = &omap_gem_vm_ops, +}; +/* GEM buffer object constructor */ struct drm_gem_object *omap_gem_new (struct drm_device *dev,union omap_gem_size gsize,u32 flags)
@@ -1236,6 +1248,8 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev, size =PAGE_ALIGN (gsize.bytes); } + obj->funcs = &omap_gem_object_funcs; +/* Initialize the GEM object. */ if (!(flags &OMAP_BO_MEM_SHMEM )) {drm_gem_private_object_init (dev, obj, size);
drivers/gpu/drm/omapdrm/omap_gem.h +0 -1
@@ -69,7 +69,6 @@ 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); -vm_fault_t omap_gem_fault (struct vm_fault *vmf);int omap_gem_roll (struct drm_gem_object *obj,u32 roll);void omap_gem_cpu_sync_page (struct drm_gem_object *obj,int pgoff); void omap_gem_dma_sync_buffer(struct drm_gem_object *obj,
Signature · 1 line
2.28.0
Re: [PATCH 10/20] drm/omapdrm: Introduce GEM object functions
Hi Thomas,
Thank you for the patch.
Quoted 85 lines · Thomas Zimmermann
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in omapdrm.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/omapdrm/omap_drv.c | 9 --------- drivers/gpu/drm/omapdrm/omap_gem.c | 16 +++++++++++++++- drivers/gpu/drm/omapdrm/omap_gem.h | 1 - 3 files changed, 15 insertions(+), 11 deletions(-)drivers/gpu/drm/omapdrm/omap_drv.c +0
-9@@ -521,12 +521,6 @@ static int dev_open(struct drm_device *dev, struct drm_file *file)return 0 ; } -static const struct vm_operations_struct omap_gem_vm_ops = { - .fault = omap_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static const struct file_operations omapdriver_fops = { .owner =THIS_MODULE , .open = drm_open,@@ -549,10 +543,7 @@ static struct drm_driver omap_drm_driver = {#endif .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = omap_gem_prime_export, .gem_prime_import = omap_gem_prime_import, - .gem_free_object_unlocked = omap_gem_free_object, - .gem_vm_ops = &omap_gem_vm_ops, .dumb_create = omap_gem_dumb_create, .dumb_map_offset = omap_gem_dumb_map_offset, .ioctls = ioctls,drivers/gpu/drm/omapdrm/omap_gem.c +15
-1@@ -487,7 +487,7 @@ static vm_fault_t omap_gem_fault_2d(struct drm_gem_object *obj,* vma->vm_private_data points to the GEM object that is backing this * mapping. */ -vm_fault_t omap_gem_fault (struct vm_fault *vmf) +static vm_fault_t omap_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_gem_object *obj = vma->vm_private_data;@@ -1169,6 +1169,18 @@ static bool omap_gem_validate_flags(struct drm_device *dev, u32 flags)return true; } +static const struct vm_operations_struct omap_gem_vm_ops = { + .fault = omap_gem_fault, + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs omap_gem_object_funcs = { + .free = omap_gem_free_object, + .export = omap_gem_prime_export, + .vm_ops = &omap_gem_vm_ops, +}; +/* GEM buffer object constructor */ struct drm_gem_object *omap_gem_new (struct drm_device *dev,union omap_gem_size gsize,u32 flags)@@ -1236,6 +1248,8 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev, size =PAGE_ALIGN (gsize.bytes); } + obj->funcs = &omap_gem_object_funcs; +/* Initialize the GEM object. */ if (!(flags &OMAP_BO_MEM_SHMEM )) {drm_gem_private_object_init (dev, obj, size);drivers/gpu/drm/omapdrm/omap_gem.h +0
-0
drivers/gpu/drm/omapdrm/omap_gem.h struct dma_buf *omap_gem_prime_export(struct drm_gem_object *obj, int flags); · line 72
Quoted 4 lines
drivers/gpu/drm/omapdrm/omap_gem.h +0
-1@@ -69,7 +69,6 @@ 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); -vm_fault_t omap_gem_fault (struct vm_fault *vmf);
I like how this function now becomes internal to omap_gem.c.
Quoted 3 lines
drivers/gpu/drm/omapdrm/omap_gem.h +0
-0int omap_gem_roll (struct drm_gem_object *obj,u32 roll);void omap_gem_cpu_sync_page (struct drm_gem_object *obj,int pgoff); void omap_gem_dma_sync_buffer(struct drm_gem_object *obj,
Signature · 3 lines
Regards, Laurent Pinchart
Re: [PATCH 10/20] drm/omapdrm: Introduce GEM object functions
In reply to Thomas ZimmermannHi,
Quoted 85 lines · Thomas Zimmermann
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in omapdrm.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/omapdrm/omap_drv.c | 9 --------- drivers/gpu/drm/omapdrm/omap_gem.c | 16 +++++++++++++++- drivers/gpu/drm/omapdrm/omap_gem.h | 1 - 3 files changed, 15 insertions(+), 11 deletions(-)drivers/gpu/drm/omapdrm/omap_drv.c +0
-9@@ -521,12 +521,6 @@ static int dev_open(struct drm_device *dev, struct drm_file *file)return 0 ; } -static const struct vm_operations_struct omap_gem_vm_ops = { - .fault = omap_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static const struct file_operations omapdriver_fops = { .owner =THIS_MODULE , .open = drm_open,@@ -549,10 +543,7 @@ static struct drm_driver omap_drm_driver = {#endif .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = omap_gem_prime_export, .gem_prime_import = omap_gem_prime_import, - .gem_free_object_unlocked = omap_gem_free_object, - .gem_vm_ops = &omap_gem_vm_ops, .dumb_create = omap_gem_dumb_create, .dumb_map_offset = omap_gem_dumb_map_offset, .ioctls = ioctls,drivers/gpu/drm/omapdrm/omap_gem.c +15
-1@@ -487,7 +487,7 @@ static vm_fault_t omap_gem_fault_2d(struct drm_gem_object *obj,* vma->vm_private_data points to the GEM object that is backing this * mapping. */ -vm_fault_t omap_gem_fault (struct vm_fault *vmf) +static vm_fault_t omap_gem_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_gem_object *obj = vma->vm_private_data;@@ -1169,6 +1169,18 @@ static bool omap_gem_validate_flags(struct drm_device *dev, u32 flags)return true; } +static const struct vm_operations_struct omap_gem_vm_ops = { + .fault = omap_gem_fault, + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs omap_gem_object_funcs = { + .free = omap_gem_free_object, + .export = omap_gem_prime_export, + .vm_ops = &omap_gem_vm_ops, +}; +/* GEM buffer object constructor */ struct drm_gem_object *omap_gem_new (struct drm_device *dev,union omap_gem_size gsize,u32 flags)@@ -1236,6 +1248,8 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev, size =PAGE_ALIGN (gsize.bytes); } + obj->funcs = &omap_gem_object_funcs; +/* Initialize the GEM object. */ if (!(flags &OMAP_BO_MEM_SHMEM )) {drm_gem_private_object_init (dev, obj, size);drivers/gpu/drm/omapdrm/omap_gem.h +0
-0
drivers/gpu/drm/omapdrm/omap_gem.h struct dma_buf *omap_gem_prime_export(struct drm_gem_object *obj, int flags); · line 74
Quoted 7 lines
drivers/gpu/drm/omapdrm/omap_gem.h +0
-1@@ -69,7 +69,6 @@ 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); -vm_fault_t omap_gem_fault (struct vm_fault *vmf);int omap_gem_roll (struct drm_gem_object *obj,u32 roll);void omap_gem_cpu_sync_page (struct drm_gem_object *obj,int pgoff); void omap_gem_dma_sync_buffer(struct drm_gem_object *obj,
omap_gem_free_object() can also be made static, and removed from omap_gem.h.
Tested on AM5 EVM.
Tomi
Signature · 2 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
Thomas Zimmermann
maintainerPATCH 11/20 drm/pl111: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in pl111. The only exception is gem_prime_mmap, which is non-trivial to convert.
--- drivers/gpu/drm/pl111/pl111_drv.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
drivers/gpu/drm/pl111/pl111_drv.c +24 -4
@@ -211,6 +211,29 @@ pl111_gem_import_sg_table(struct drm_device *dev,return drm_gem_cma_prime_import_sg_table (dev, attach, sgt); } +static const struct drm_gem_object_funcs pl111_gem_object_funcs = { + .free = drm_gem_cma_free_object, + .get_sg_table = drm_gem_cma_prime_get_sg_table, + .vmap = drm_gem_cma_prime_vmap, + .vm_ops = &drm_gem_cma_vm_ops, +}; + +static struct drm_gem_object * +pl111_gem_create_object (struct drm_device *dev,size_t size) +{ +static struct drm_gem_cma_object *cma_obj; +struct drm_gem_object *obj; + + cma_obj =kzalloc (sizeof (*cma_obj),GFP_KERNEL ); +if (!cma_obj) +return NULL ; + + obj = &cma_obj->base; + obj->funcs = &pl111_gem_object_funcs; + +return obj; +} +DEFINE_DRM_GEM_CMA_FOPS (drm_fops);static struct drm_driver pl111_drm_driver = {
@@ -224,15 +247,12 @@ static struct drm_driver pl111_drm_driver = { .major = 1, .minor = 0, .patchlevel = 0, + .gem_create_object = pl111_gem_create_object, .dumb_create = drm_gem_cma_dumb_create, - .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, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = pl111_gem_import_sg_table, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_mmap = drm_gem_cma_prime_mmap, - .gem_prime_vmap = drm_gem_cma_prime_vmap,#if defined(CONFIG_DEBUG_FS ) .debugfs_init = pl111_debugfs_init,
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 12/20 drm/radeon: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in radeon.
--- drivers/gpu/drm/radeon/radeon_drv.c | 23 +---------------------- drivers/gpu/drm/radeon/radeon_object.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 22 deletions(-)
drivers/gpu/drm/radeon/radeon_drv.c +1 -22
@@ -124,13 +124,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev);int radeon_driver_irq_postinstall_kms (struct drm_device *dev);void radeon_driver_irq_uninstall_kms (struct drm_device *dev);irqreturn_t radeon_driver_irq_handler_kms (int irq,void *arg); -void radeon_gem_object_free (struct drm_gem_object *obj); -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_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, ktime_t *stime, ktime_t *etime,
@@ -145,14 +138,9 @@ int radeon_mode_dumb_mmap(struct drm_file *filp,int radeon_mode_dumb_create (struct drm_file *file_priv,struct drm_device *dev,struct drm_mode_create_dumb *args); -struct sg_table *radeon_gem_prime_get_sg_table (struct drm_gem_object *obj);struct drm_gem_object *radeon_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *,struct sg_table *sg); -int radeon_gem_prime_pin (struct drm_gem_object *obj); -void radeon_gem_prime_unpin (struct drm_gem_object *obj); -void *radeon_gem_prime_vmap (struct drm_gem_object *obj); -void radeon_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr);/* atpx handler */ #if defined(CONFIG_VGA_SWITCHEROO )
@@ -550,7 +538,7 @@ long radeon_drm_ioctl(struct file *filp, } ret =drm_ioctl (filp, cmd, arg); - +pm_runtime_mark_last_busy (dev->dev);pm_runtime_put_autosuspend (dev->dev);return ret;
@@ -609,22 +597,13 @@ static struct drm_driver kms_driver = { .irq_uninstall = radeon_driver_irq_uninstall_kms, .irq_handler = radeon_driver_irq_handler_kms, .ioctls = radeon_ioctls_kms, - .gem_free_object_unlocked = radeon_gem_object_free, - .gem_open_object = radeon_gem_object_open, - .gem_close_object = radeon_gem_object_close, .dumb_create = radeon_mode_dumb_create, .dumb_map_offset = radeon_mode_dumb_mmap, .fops = &radeon_driver_kms_fops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = radeon_gem_prime_export, - .gem_prime_pin = radeon_gem_prime_pin, - .gem_prime_unpin = radeon_gem_prime_unpin, - .gem_prime_get_sg_table = radeon_gem_prime_get_sg_table, .gem_prime_import_sg_table = radeon_gem_prime_import_sg_table, - .gem_prime_vmap = radeon_gem_prime_vmap, - .gem_prime_vunmap = radeon_gem_prime_vunmap, .name = DRIVER_NAME, .desc = DRIVER_DESC,
drivers/gpu/drm/radeon/radeon_object.c +26 -0
@@ -45,6 +45,19 @@ int radeon_ttm_init(struct radeon_device *rdev);void radeon_ttm_fini (struct radeon_device *rdev);static void radeon_bo_clear_surface_reg (struct radeon_bo *bo); +void radeon_gem_object_free (struct drm_gem_object *obj); +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_gem_object *gobj, +int flags); +struct sg_table *radeon_gem_prime_get_sg_table (struct drm_gem_object *obj); +int radeon_gem_prime_pin (struct drm_gem_object *obj); +void radeon_gem_prime_unpin (struct drm_gem_object *obj); +void *radeon_gem_prime_vmap (struct drm_gem_object *obj); +void radeon_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr); +/* * To exclude mutual BO access we rely on bo_reserve exclusion, as all * function are calling it.
@@ -180,6 +193,18 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) } } +static const struct drm_gem_object_funcs radeon_gem_object_funcs = { + .free = radeon_gem_object_free, + .open = radeon_gem_object_open, + .close = radeon_gem_object_close, + .export = radeon_gem_prime_export, + .pin = radeon_gem_prime_pin, + .unpin = radeon_gem_prime_unpin, + .get_sg_table = radeon_gem_prime_get_sg_table, + .vmap = radeon_gem_prime_vmap, + .vunmap = radeon_gem_prime_vunmap, +}; + int radeon_bo_create(struct radeon_device *rdev, unsigned long size, int byte_align, bool kernel, u32 domain, u32 flags, struct sg_table *sg,
@@ -209,6 +234,7 @@ int radeon_bo_create(struct radeon_device *rdev, bo =kzalloc (sizeof (struct radeon_bo ),GFP_KERNEL );if (bo ==NULL )return -ENOMEM ; + bo->tbo.base.funcs = &radeon_gem_object_funcs;drm_gem_private_object_init (rdev->ddev, &bo->tbo.base, size); bo->rdev = rdev; bo->surface_reg =-1 ;
Signature · 1 line
2.28.0
Christian König
maintainerRe: [PATCH 12/20] drm/radeon: Introduce GEM object functions
Am 13.08.20 um 10:36 schrieb Thomas Zimmermann:
Quoted 105 lines
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in radeon.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/radeon/radeon_drv.c | 23 +---------------------- drivers/gpu/drm/radeon/radeon_object.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 22 deletions(-)drivers/gpu/drm/radeon/radeon_drv.c +1
-22@@ -124,13 +124,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev);int radeon_driver_irq_postinstall_kms (struct drm_device *dev);void radeon_driver_irq_uninstall_kms (struct drm_device *dev);irqreturn_t radeon_driver_irq_handler_kms (int irq,void *arg); -void radeon_gem_object_free (struct drm_gem_object *obj); -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_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, ktime_t *stime, ktime_t *etime,@@ -145,14 +138,9 @@ int radeon_mode_dumb_mmap(struct drm_file *filp,int radeon_mode_dumb_create (struct drm_file *file_priv,struct drm_device *dev,struct drm_mode_create_dumb *args); -struct sg_table *radeon_gem_prime_get_sg_table (struct drm_gem_object *obj);struct drm_gem_object *radeon_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *,struct sg_table *sg); -int radeon_gem_prime_pin (struct drm_gem_object *obj); -void radeon_gem_prime_unpin (struct drm_gem_object *obj); -void *radeon_gem_prime_vmap (struct drm_gem_object *obj); -void radeon_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr);/* atpx handler */ #if defined(CONFIG_VGA_SWITCHEROO )@@ -550,7 +538,7 @@ long radeon_drm_ioctl(struct file *filp, } ret =drm_ioctl (filp, cmd, arg); - +pm_runtime_mark_last_busy (dev->dev);pm_runtime_put_autosuspend (dev->dev);return ret;@@ -609,22 +597,13 @@ static struct drm_driver kms_driver = { .irq_uninstall = radeon_driver_irq_uninstall_kms, .irq_handler = radeon_driver_irq_handler_kms, .ioctls = radeon_ioctls_kms, - .gem_free_object_unlocked = radeon_gem_object_free, - .gem_open_object = radeon_gem_object_open, - .gem_close_object = radeon_gem_object_close, .dumb_create = radeon_mode_dumb_create, .dumb_map_offset = radeon_mode_dumb_mmap, .fops = &radeon_driver_kms_fops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = radeon_gem_prime_export, - .gem_prime_pin = radeon_gem_prime_pin, - .gem_prime_unpin = radeon_gem_prime_unpin, - .gem_prime_get_sg_table = radeon_gem_prime_get_sg_table, .gem_prime_import_sg_table = radeon_gem_prime_import_sg_table, - .gem_prime_vmap = radeon_gem_prime_vmap, - .gem_prime_vunmap = radeon_gem_prime_vunmap, .name = DRIVER_NAME, .desc = DRIVER_DESC,drivers/gpu/drm/radeon/radeon_object.c +15
-0@@ -45,6 +45,19 @@ int radeon_ttm_init(struct radeon_device *rdev);void radeon_ttm_fini (struct radeon_device *rdev);static void radeon_bo_clear_surface_reg (struct radeon_bo *bo); +void radeon_gem_object_free (struct drm_gem_object *obj); +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_gem_object *gobj, +int flags); +struct sg_table *radeon_gem_prime_get_sg_table (struct drm_gem_object *obj); +int radeon_gem_prime_pin (struct drm_gem_object *obj); +void radeon_gem_prime_unpin (struct drm_gem_object *obj); +void *radeon_gem_prime_vmap (struct drm_gem_object *obj); +void radeon_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr); +/* * To exclude mutual BO access we rely on bo_reserve exclusion, as all * function are calling it. @@ -180,6 +193,18 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) } } +static const struct drm_gem_object_funcs radeon_gem_object_funcs = { + .free = radeon_gem_object_free,
drivers/gpu/drm/radeon/radeon_object.c void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) · line 207
Quoted 10 lines
drivers/gpu/drm/radeon/radeon_object.c +10
-0+ .open = radeon_gem_object_open, + .close = radeon_gem_object_close, + .export = radeon_gem_prime_export, + .pin = radeon_gem_prime_pin, + .unpin = radeon_gem_prime_unpin, + .get_sg_table = radeon_gem_prime_get_sg_table, + .vmap = radeon_gem_prime_vmap, + .vunmap = radeon_gem_prime_vunmap, +}; +
Same comment as for amdgpu, please put that into radeon_gem.c instead.
Christian.
Quoted 11 lines
drivers/gpu/drm/radeon/radeon_object.c +1
-0int radeon_bo_create(struct radeon_device *rdev, unsigned long size, int byte_align, bool kernel, u32 domain, u32 flags, struct sg_table *sg,@@ -209,6 +234,7 @@ int radeon_bo_create(struct radeon_device *rdev, bo =kzalloc (sizeof (struct radeon_bo ),GFP_KERNEL );if (bo ==NULL )return -ENOMEM ; + bo->tbo.base.funcs = &radeon_gem_object_funcs;drm_gem_private_object_init (rdev->ddev, &bo->tbo.base, size); bo->rdev = rdev; bo->surface_reg =-1 ;
Thomas Zimmermann
maintainerRe: [PATCH 12/20] drm/radeon: Introduce GEM object functions
Hi
Am 13.08.20 um 12:24 schrieb Christian König:
Quoted 112 lines
Am 13.08.20 um 10:36 schrieb Thomas Zimmermann:
Quoted 111 lines
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in radeon.Signed-off-by Thomas Zimmermann <[email protected]>---
drivers/gpu/drm/radeon/radeon_drv.c | 23 +----------------------drivers/gpu/drm/radeon/radeon_object.c| 26 ++++++++++++++++++++++++++2 files changed, 27 insertions(+), 22 deletions(-)drivers/gpu/drm/radeon/radeon_drv.c +0
-7@@ -124,13 +124,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev); int radeon_driver_irq_postinstall_kms(struct drm_device *dev); void radeon_driver_irq_uninstall_kms(struct drm_device *dev); irqreturn_t radeon_driver_irq_handler_kms(int irq, void *arg); -void radeon_gem_object_free (struct drm_gem_object *obj); -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_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,
ktime_t*stime,ktime_t*etime,drivers/gpu/drm/radeon/radeon_drv.c +0
-1@@ -145,14 +138,9 @@ int radeon_mode_dumb_mmap(struct drm_file *filp, int radeon_mode_dumb_create(struct drm_file *file_priv, struct drm_device *dev, struct drm_mode_create_dumb *args); -struct sg_table *radeon_gem_prime_get_sg_table (struct drm_gem_object *obj);struct
drm_gem_object*radeon_gem_prime_import_sg_table(structdrm_device*dev,
structdma_buf_attachment*, structsg_table*sg);drivers/gpu/drm/radeon/radeon_drv.c +0
-4-int radeon_gem_prime_pin (struct drm_gem_object *obj); -void radeon_gem_prime_unpin (struct drm_gem_object *obj); -void *radeon_gem_prime_vmap (struct drm_gem_object *obj); -void radeon_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr);/* atpx handler */
#ifdefined(CONFIG_VGA_SWITCHEROO)drivers/gpu/drm/radeon/radeon_drv.c +1
-10@@ -550,7 +538,7 @@ long radeon_drm_ioctl(struct file *filp, } ret = drm_ioctl(filp, cmd, arg); - + pm_runtime_mark_last_busy(dev->dev); pm_runtime_put_autosuspend(dev->dev); return ret;@@ -609,22 +597,13 @@ static struct drm_driver kms_driver = { .irq_uninstall = radeon_driver_irq_uninstall_kms, .irq_handler = radeon_driver_irq_handler_kms, .ioctls = radeon_ioctls_kms, - .gem_free_object_unlocked = radeon_gem_object_free, - .gem_open_object = radeon_gem_object_open, - .gem_close_object = radeon_gem_object_close, .dumb_create = radeon_mode_dumb_create, .dumb_map_offset = radeon_mode_dumb_mmap, .fops = &radeon_driver_kms_fops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = radeon_gem_prime_export, - .gem_prime_pin = radeon_gem_prime_pin, - .gem_prime_unpin = radeon_gem_prime_unpin, - .gem_prime_get_sg_table = radeon_gem_prime_get_sg_table, .gem_prime_import_sg_table = radeon_gem_prime_import_sg_table, - .gem_prime_vmap = radeon_gem_prime_vmap, - .gem_prime_vunmap = radeon_gem_prime_vunmap, .name = DRIVER_NAME, .desc = DRIVER_DESC,drivers/gpu/drm/radeon/radeon_object.c +12
-0@@ -45,6 +45,19 @@ int radeon_ttm_init(struct radeon_device *rdev); void radeon_ttm_fini(struct radeon_device *rdev); static void radeon_bo_clear_surface_reg(struct radeon_bo *bo); +void radeon_gem_object_free(struct drm_gem_object *obj); +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_gem_object *gobj, + int flags); +struct sg_table *radeon_gem_prime_get_sg_table (struct drm_gem_object *obj); +int radeon_gem_prime_pin (struct drm_gem_object *obj); +void radeon_gem_prime_unpin (struct drm_gem_object *obj); +void *radeon_gem_prime_vmap (struct drm_gem_object *obj); +void radeon_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr); + /** To exclude mutual BO access we rely on bo_reserve exclusion, as all * function are calling it.
drivers/gpu/drm/radeon/radeon_object.c +5
-0@@ -180,6 +193,18 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) } } +static const struct drm_gem_object_funcs radeon_gem_object_funcs = { + .free = radeon_gem_object_free, + .open = radeon_gem_object_open, + .close = radeon_gem_object_close, + .export = radeon_gem_prime_export, + .pin = radeon_gem_prime_pin,
Quoted 8 lines
drivers/gpu/drm/radeon/radeon_object.c void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) · line 207
Quoted 6 lines
drivers/gpu/drm/radeon/radeon_object.c +6
-0+ .unpin = radeon_gem_prime_unpin, + .get_sg_table = radeon_gem_prime_get_sg_table, + .vmap = radeon_gem_prime_vmap, + .vunmap = radeon_gem_prime_vunmap, +}; +Same comment as for amdgpu, please put that into
radeon_gem.cinstead.
There's no good header file to put the declarations, right? I'm asking because checkpatch warns about declarations in the source files.
Best regards
Thomas
Quoted 15 lines
Christian.
Quoted 11 lines
drivers/gpu/drm/radeon/radeon_object.c +0
-0int radeon_bo_create(struct radeon_device *rdev, unsigned long size, int byte_align, bool kernel,u32 domain, u32 flags, struct
sg_table*sg,drivers/gpu/drm/radeon/radeon_object.c +1
-0@@ -209,6 +234,7 @@ int radeon_bo_create(struct radeon_device *rdev, bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL); if (bo == NULL) return -ENOMEM; + bo->tbo.base.funcs = &radeon_gem_object_funcs; drm_gem_private_object_init(rdev->ddev, &bo->tbo.base, size); bo->rdev = rdev; bo->surface_reg = -1;
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
Christian König
maintainerRe: [PATCH 12/20] drm/radeon: Introduce GEM object functions
Am 13.08.20 um 12:41 schrieb Thomas Zimmermann:
Quoted 122 lines
Hi
Am 13.08.20 um 12:24 schrieb Christian König:
Quoted 111 lines
Am 13.08.20 um 10:36 schrieb Thomas Zimmermann:
Quoted 110 lines
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in radeon.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/radeon/radeon_drv.c | 23 +---------------------- drivers/gpu/drm/radeon/radeon_object.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 22 deletions(-)drivers/gpu/drm/radeon/radeon_drv.c +0
-7@@ -124,13 +124,6 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev); int radeon_driver_irq_postinstall_kms(struct drm_device *dev); void radeon_driver_irq_uninstall_kms(struct drm_device *dev); irqreturn_t radeon_driver_irq_handler_kms(int irq, void *arg); -void radeon_gem_object_free (struct drm_gem_object *obj); -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_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,
ktime_t*stime,ktime_t*etime,drivers/gpu/drm/radeon/radeon_drv.c +0
-5@@ -145,14 +138,9 @@ int radeon_mode_dumb_mmap(struct drm_file *filp, int radeon_mode_dumb_create(struct drm_file *file_priv, struct drm_device *dev, struct drm_mode_create_dumb *args); -struct sg_table *radeon_gem_prime_get_sg_table (struct drm_gem_object *obj); struct drm_gem_object *radeon_gem_prime_import_sg_table(structdrm_device *dev, struct dma_buf_attachment *, struct sg_table *sg); -int radeon_gem_prime_pin (struct drm_gem_object *obj); -void radeon_gem_prime_unpin (struct drm_gem_object *obj); -void *radeon_gem_prime_vmap (struct drm_gem_object *obj); -void radeon_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr); /* atpx handler */#if
defined(CONFIG_VGA_SWITCHEROO)drivers/gpu/drm/radeon/radeon_drv.c +1
-10@@ -550,7 +538,7 @@ long radeon_drm_ioctl(struct file *filp, } ret = drm_ioctl(filp, cmd, arg); - + pm_runtime_mark_last_busy(dev->dev); pm_runtime_put_autosuspend(dev->dev); return ret;@@ -609,22 +597,13 @@ static struct drm_driver kms_driver = { .irq_uninstall = radeon_driver_irq_uninstall_kms, .irq_handler = radeon_driver_irq_handler_kms, .ioctls = radeon_ioctls_kms, - .gem_free_object_unlocked = radeon_gem_object_free, - .gem_open_object = radeon_gem_object_open, - .gem_close_object = radeon_gem_object_close, .dumb_create = radeon_mode_dumb_create, .dumb_map_offset = radeon_mode_dumb_mmap, .fops = &radeon_driver_kms_fops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = radeon_gem_prime_export, - .gem_prime_pin = radeon_gem_prime_pin, - .gem_prime_unpin = radeon_gem_prime_unpin, - .gem_prime_get_sg_table = radeon_gem_prime_get_sg_table, .gem_prime_import_sg_table = radeon_gem_prime_import_sg_table, - .gem_prime_vmap = radeon_gem_prime_vmap, - .gem_prime_vunmap = radeon_gem_prime_vunmap, .name = DRIVER_NAME, .desc = DRIVER_DESC,drivers/gpu/drm/radeon/radeon_object.c +16
-0@@ -45,6 +45,19 @@ int radeon_ttm_init(struct radeon_device *rdev); void radeon_ttm_fini(struct radeon_device *rdev); static void radeon_bo_clear_surface_reg(struct radeon_bo *bo); +void radeon_gem_object_free(struct drm_gem_object *obj); +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_gem_object *gobj, + int flags); +struct sg_table *radeon_gem_prime_get_sg_table (struct drm_gem_object *obj); +int radeon_gem_prime_pin (struct drm_gem_object *obj); +void radeon_gem_prime_unpin (struct drm_gem_object *obj); +void *radeon_gem_prime_vmap (struct drm_gem_object *obj); +void radeon_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr); + /** To exclude mutual BO access we rely on bo_reserve exclusion, as all * function are calling it. @@ -180,6 +193,18 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) } } +static const struct drm_gem_object_funcs radeon_gem_object_funcs = { + .free = radeon_gem_object_free, + .open = radeon_gem_object_open, + .close = radeon_gem_object_close, + .export = radeon_gem_prime_export,Quoted 8 lines
drivers/gpu/drm/radeon/radeon_object.c void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) · line 207
Quoted 7 lines
drivers/gpu/drm/radeon/radeon_object.c +7
-0+ .pin = radeon_gem_prime_pin, + .unpin = radeon_gem_prime_unpin, + .get_sg_table = radeon_gem_prime_get_sg_table, + .vmap = radeon_gem_prime_vmap, + .vunmap = radeon_gem_prime_vunmap, +}; +Same comment as for amdgpu, please put that into
radeon_gem.cinstead.
Quoted 2 lines
There's no good header file to put the declarations, right? I'm asking because checkpatch warns about declarations in the source files.
Yes, that is kind of a mess because radeon used to support both KMS and UMS.
Thanks for cleaning this up,
Christian.
Quoted 6 lines
Best regards
ThomasQuoted 2 lines
Christian.
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/radeon/radeon_object.c int radeon_bo_create(struct radeon_device *rdev, · line 240
Quoted 11 lines
drivers/gpu/drm/radeon/radeon_object.c +1
-0int radeon_bo_create(struct radeon_device *rdev, unsigned long size, int byte_align, bool kernel, u32 domain, u32 flags, struct sg_table *sg,@@ -209,6 +234,7 @@ int radeon_bo_create(struct radeon_device *rdev, bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL); if (bo == NULL) return -ENOMEM; + bo->tbo.base.funcs = &radeon_gem_object_funcs; drm_gem_private_object_init(rdev->ddev, &bo->tbo.base, size); bo->rdev = rdev; bo->surface_reg = -1;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Thomas Zimmermann
maintainerPATCH 13/20 drm/rockchip: Convert to drm_gem_object_funcs
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in rockchip. The only exception is gem_prime_mmap, which is non-trivial to convert.
--- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 5 ----- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-)
drivers/gpu/drm/rockchip/rockchip_drm_drv.c +0 -5
@@ -212,15 +212,10 @@ static const struct file_operations rockchip_drm_driver_fops = {static struct drm_driver rockchip_drm_driver = { .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, .dumb_create = rockchip_gem_dumb_create, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_get_sg_table = rockchip_gem_prime_get_sg_table, .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, - .gem_prime_vmap = rockchip_gem_prime_vmap, - .gem_prime_vunmap = rockchip_gem_prime_vunmap, .gem_prime_mmap = rockchip_gem_mmap_buf, .fops = &rockchip_drm_driver_fops, .name =DRIVER_NAME ,
drivers/gpu/drm/rockchip/rockchip_drm_gem.c +10 -0
@@ -295,6 +295,14 @@ static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj)kfree (rk_obj); } +static const struct drm_gem_object_funcs rockchip_gem_object_funcs = { + .free = rockchip_gem_free_object, + .get_sg_table = rockchip_gem_prime_get_sg_table, + .vmap = rockchip_gem_prime_vmap, + .vunmap = rockchip_gem_prime_vunmap, + .vm_ops = &drm_gem_cma_vm_ops, +}; +static struct rockchip_gem_object *rockchip_gem_alloc_object (struct drm_device *drm,unsigned int size) {
@@ -309,6 +317,8 @@ static struct rockchip_gem_object * obj = &rk_obj->base; + obj->funcs = &rockchip_gem_object_funcs; +drm_gem_object_init (drm, obj, size);return rk_obj;
Signature · 1 line
2.28.0
kernel test robot
build botRe: [Intel-gfx] [PATCH 13/20] drm/rockchip: Convert to drm_gem_object_funcs
I love your patch! Yet something to improve:
Hi Thomas,
I love your patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on next-20200813]
[cannot apply to drm-intel/for-linux-next linux-arm/drm-armada-devel linux-arm/drm-armada-fixes v5.8] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200813-163944 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git dc06fe51d26efc100ac74121607c01a454867c91 config: arc-allmodconfig (attached as .config) compiler: arc-elf-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arc
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/rockchip/rockchip_drm_gem.c:303:13: error: 'drm_gem_cma_vm_ops' undeclared here (not in a function); did you mean 'drm_gem_mmap_obj'?
303 | .vm_ops = &drm_gem_cma_vm_ops,
| ^~~~~~~~~~~~~~~~~~
| drm_gem_mmap_objvim +303 drivers/gpu/drm/rockchip/rockchip_drm_gem.c
297
298 static const struct drm_gem_object_funcs rockchip_gem_object_funcs = {
299 .free = rockchip_gem_free_object,
300 .get_sg_table = rockchip_gem_prime_get_sg_table,
301 .vmap = rockchip_gem_prime_vmap,
302 .vunmap = rockchip_gem_prime_vunmap,
> 303 .vm_ops = &drm_gem_cma_vm_ops,
304 };
305
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Thomas Zimmermann
maintainerPATCH 14/20 drm/tegra: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in tegra.
--- drivers/gpu/drm/tegra/drm.c | 4 ---- drivers/gpu/drm/tegra/gem.c | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/tegra/drm.c +0 -4
@@ -858,12 +858,8 @@ static struct drm_driver tegra_drm_driver = { .debugfs_init = tegra_debugfs_init, #endif - .gem_free_object_unlocked = tegra_bo_free_object, - .gem_vm_ops = &tegra_bo_vm_ops, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = tegra_gem_prime_export, .gem_prime_import = tegra_gem_prime_import, .dumb_create = tegra_bo_dumb_create,
drivers/gpu/drm/tegra/gem.c +8 -0
@@ -231,6 +231,12 @@ static int tegra_bo_iommu_unmap(struct tegra_drm *tegra, struct tegra_bo *bo)return 0 ; } +static const struct drm_gem_object_funcs tegra_gem_object_funcs = { + .free = tegra_bo_free_object, + .export = tegra_gem_prime_export, + .vm_ops = &tegra_bo_vm_ops, +}; +static struct tegra_bo *tegra_bo_alloc_object (struct drm_device *drm,size_t size) {
@@ -241,6 +247,8 @@ static struct tegra_bo *tegra_bo_alloc_object(struct drm_device *drm,if (!bo)return ERR_PTR (-ENOMEM ); + bo->gem.funcs = &tegra_gem_object_funcs; +host1x_bo_init (&bo->base, &tegra_bo_ops); size =round_up (size,PAGE_SIZE );
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 15/20 drm/vc4: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in vc4. The only exception is gem_prime_mmap, which is non-trivial to convert.
--- drivers/gpu/drm/vc4/vc4_bo.c | 21 ++++++++++++++++++++- drivers/gpu/drm/vc4/vc4_drv.c | 12 ------------ drivers/gpu/drm/vc4/vc4_drv.h | 1 - 3 files changed, 20 insertions(+), 14 deletions(-)
drivers/gpu/drm/vc4/vc4_bo.c +20 -1
@@ -21,6 +21,8 @@#include "vc4_drv.h" #include "uapi/drm/vc4_drm.h" +static vm_fault_t vc4_fault (struct vm_fault *vmf); +static const char *const bo_type_names[] = {"kernel" ,"V3D" ,
@@ -374,6 +376,21 @@ static struct vc4_bo *vc4_bo_get_from_cache(struct drm_device *dev,return bo; } +static const struct vm_operations_struct vc4_vm_ops = { + .fault = vc4_fault, + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs vc4_gem_object_funcs = { + .free = vc4_free_object, + .export = vc4_prime_export, + .get_sg_table = drm_gem_cma_prime_get_sg_table, + .vmap = vc4_prime_vmap, + .vunmap = drm_gem_cma_prime_vunmap, + .vm_ops = &vc4_vm_ops, +}; +/** * vc4_gem_create_object - Implementation of driver->gem_create_object. * @dev: DRM device
@@ -400,6 +417,8 @@ struct drm_gem_object *vc4_create_object(struct drm_device *dev, size_t size) vc4->bo_labels[VC4_BO_TYPE_KERNEL ].size_allocated += size;mutex_unlock (&vc4->bo_lock); + bo->base.base.funcs = &vc4_gem_object_funcs; +return &bo->base.base; }
@@ -684,7 +703,7 @@ struct dma_buf * vc4_prime_export(struct drm_gem_object *obj, int flags)return dmabuf; } -vm_fault_t vc4_fault (struct vm_fault *vmf) +static vm_fault_t vc4_fault (struct vm_fault *vmf) {struct vm_area_struct *vma = vmf->vma;struct drm_gem_object *obj = vma->vm_private_data;
drivers/gpu/drm/vc4/vc4_drv.c +0 -12
@@ -140,12 +140,6 @@ static void vc4_close(struct drm_device *dev, struct drm_file *file)kfree (vc4file); } -static const struct vm_operations_struct vc4_vm_ops = { - .fault = vc4_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static const struct file_operations vc4_drm_fops = { .owner =THIS_MODULE , .open = drm_open,
@@ -195,16 +189,10 @@ static struct drm_driver vc4_drm_driver = {#endif .gem_create_object = vc4_create_object, - .gem_free_object_unlocked = vc4_free_object, - .gem_vm_ops = &vc4_vm_ops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = vc4_prime_export, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, .gem_prime_import_sg_table = vc4_prime_import_sg_table, - .gem_prime_vmap = vc4_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = vc4_prime_mmap, .dumb_create = vc4_dumb_create,
drivers/gpu/drm/vc4/vc4_drv.h +0 -1
@@ -778,7 +778,6 @@ int vc4_get_hang_state_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);int vc4_label_bo_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); -vm_fault_t vc4_fault (struct vm_fault *vmf);int vc4_mmap (struct file *filp,struct vm_area_struct *vma);int vc4_prime_mmap (struct drm_gem_object *obj,struct vm_area_struct *vma); struct drm_gem_object *vc4_prime_import_sg_table(struct drm_device *dev,
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 16/20 drm/vgem: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in vgem. The only exception is gem_prime_mmap, which is non-trivial to convert.
--- drivers/gpu/drm/vgem/vgem_drv.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/gpu/drm/vgem/vgem_drv.c +14 -7
@@ -50,6 +50,8 @@#define DRIVER_MAJOR 1#define DRIVER_MINOR 0 +static const struct drm_gem_object_funcs vgem_gem_object_funcs; + static struct vgem_device { struct drm_device drm; struct platform_device *platform;
@@ -167,6 +169,8 @@ static struct drm_vgem_gem_object *__vgem_gem_create(struct drm_device *dev,if (!obj)return ERR_PTR (-ENOMEM ); + obj->base.funcs = &vgem_gem_object_funcs; + ret =drm_gem_object_init (dev, &obj->base,roundup (size,PAGE_SIZE ));if (ret) {kfree (obj);
@@ -408,13 +412,21 @@ static void vgem_release(struct drm_device *dev)platform_device_unregister (vgem->platform); } +static const struct drm_gem_object_funcs vgem_gem_object_funcs = { + .free = vgem_gem_free_object, + .pin = vgem_prime_pin, + .unpin = vgem_prime_unpin, + .get_sg_table = vgem_prime_get_sg_table, + .vmap = vgem_prime_vmap, + .vunmap = vgem_prime_vunmap, + .vm_ops = &vgem_gem_vm_ops, +}; +static struct drm_driver vgem_driver = { .driver_features =DRIVER_GEM |DRIVER_RENDER , .release = vgem_release, .open = vgem_open, .postclose = vgem_postclose, - .gem_free_object_unlocked = vgem_gem_free_object, - .gem_vm_ops = &vgem_gem_vm_ops, .ioctls = vgem_ioctls, .num_ioctls =ARRAY_SIZE (vgem_ioctls), .fops = &vgem_driver_fops,
@@ -423,13 +435,8 @@ static struct drm_driver vgem_driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_pin = vgem_prime_pin, - .gem_prime_unpin = vgem_prime_unpin, .gem_prime_import = vgem_prime_import, .gem_prime_import_sg_table = vgem_prime_import_sg_table, - .gem_prime_get_sg_table = vgem_prime_get_sg_table, - .gem_prime_vmap = vgem_prime_vmap, - .gem_prime_vunmap = vgem_prime_vunmap, .gem_prime_mmap = vgem_prime_mmap, .name = DRIVER_NAME,
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 17/20 drm/vkms: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in vkms.
--- drivers/gpu/drm/vkms/vkms_drv.c | 8 -------- drivers/gpu/drm/vkms/vkms_gem.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-)
drivers/gpu/drm/vkms/vkms_drv.c +0 -8
@@ -51,12 +51,6 @@ static const struct file_operations vkms_driver_fops = { .release = drm_release, }; -static const struct vm_operations_struct vkms_gem_vm_ops = { - .fault = vkms_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static void vkms_release (struct drm_device *dev) { struct vkms_device *vkms = container_of(dev, struct vkms_device, drm);
@@ -101,8 +95,6 @@ static struct drm_driver vkms_driver = { .release = vkms_release, .fops = &vkms_driver_fops, .dumb_create = vkms_dumb_create, - .gem_vm_ops = &vkms_gem_vm_ops, - .gem_free_object_unlocked = vkms_gem_free_object, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = vkms_prime_import_sg_table,
drivers/gpu/drm/vkms/vkms_gem.c +13 -0
@@ -7,6 +7,17 @@#include "vkms_drv.h" +static const struct vm_operations_struct vkms_gem_vm_ops = { + .fault = vkms_gem_fault, + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs vkms_gem_object_funcs = { + .free = vkms_gem_free_object, + .vm_ops = &vkms_gem_vm_ops, +}; +static struct vkms_gem_object *__vkms_gem_create (struct drm_device *dev,u64 size) {
@@ -17,6 +28,8 @@ static struct vkms_gem_object *__vkms_gem_create(struct drm_device *dev,if (!obj)return ERR_PTR (-ENOMEM ); + obj->gem.funcs = &vkms_gem_object_funcs; + size =roundup (size,PAGE_SIZE ); ret =drm_gem_object_init (dev, &obj->gem, size);if (ret) {
Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerPATCH 18/20 drm/xen: Introduce GEM object functions
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in xen. The only exception is gem_prime_mmap, which is non-trivial to convert.
--- drivers/gpu/drm/xen/xen_drm_front.c | 12 +----------- drivers/gpu/drm/xen/xen_drm_front.h | 2 ++ drivers/gpu/drm/xen/xen_drm_front_gem.c | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 11 deletions(-)
drivers/gpu/drm/xen/xen_drm_front.c +1 -11
@@ -433,7 +433,7 @@ static int xen_drm_drv_dumb_create(struct drm_file *filp,return ret; } -static void xen_drm_drv_free_object_unlocked (struct drm_gem_object *obj) +void xen_drm_drv_free_object_unlocked (struct drm_gem_object *obj) {struct xen_drm_front_drm_info *drm_info = obj->dev->dev_private;int idx;
@@ -481,22 +481,12 @@ static const struct file_operations xen_drm_dev_fops = { .mmap = xen_drm_front_gem_mmap, }; -static const struct vm_operations_struct xen_drm_drv_vm_ops = { - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static struct drm_driver xen_drm_driver = { .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, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = xen_drm_front_gem_import_sg_table, - .gem_prime_get_sg_table = xen_drm_front_gem_get_sg_table, - .gem_prime_vmap = xen_drm_front_gem_prime_vmap, - .gem_prime_vunmap = xen_drm_front_gem_prime_vunmap, .gem_prime_mmap = xen_drm_front_gem_prime_mmap, .dumb_create = xen_drm_drv_dumb_create, .fops = &xen_drm_dev_fops,
drivers/gpu/drm/xen/xen_drm_front.h +2 -0
@@ -160,4 +160,6 @@ int xen_drm_front_page_flip(struct xen_drm_front_info *front_info,void xen_drm_front_on_frame_done (struct xen_drm_front_info *front_info,int conn_idx,u64 fb_cookie); +void xen_drm_drv_free_object_unlocked (struct drm_gem_object *obj); +#endif /* __XEN_DRM_FRONT_H_ */
drivers/gpu/drm/xen/xen_drm_front_gem.c +15 -0
@@ -56,6 +56,19 @@ static void gem_free_pages_array(struct xen_gem_object *xen_obj) xen_obj->pages =NULL ; } +static const struct vm_operations_struct xen_drm_drv_vm_ops = { + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs xen_drm_front_gem_object_funcs = { + .free = xen_drm_drv_free_object_unlocked, + .get_sg_table = xen_drm_front_gem_get_sg_table, + .vmap = xen_drm_front_gem_prime_vmap, + .vunmap = xen_drm_front_gem_prime_vunmap, + .vm_ops = &xen_drm_drv_vm_ops, +}; +static struct xen_gem_object *gem_create_obj (struct drm_device *dev,size_t size) {
@@ -66,6 +79,8 @@ static struct xen_gem_object *gem_create_obj(struct drm_device *dev,if (!xen_obj)return ERR_PTR (-ENOMEM ); + xen_obj->base.funcs = &xen_drm_front_gem_object_funcs; + ret =drm_gem_object_init (dev, &xen_obj->base, size);if (ret <0 ) {kfree (xen_obj);
Signature · 1 line
2.28.0
Re: [PATCH 18/20] drm/xen: Introduce GEM object functions
Hi,
Quoted 17 lines · Thomas Zimmermann
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in xen. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/xen/xen_drm_front.c | 12 +----------- drivers/gpu/drm/xen/xen_drm_front.h | 2 ++ drivers/gpu/drm/xen/xen_drm_front_gem.c | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 11 deletions(-)drivers/gpu/drm/xen/xen_drm_front.c +0
-0
drivers/gpu/drm/xen/xen_drm_front.c static int xen_drm_drv_dumb_create(struct drm_file *filp, · line 436
Quoted 5 lines
drivers/gpu/drm/xen/xen_drm_front.c +1
-1@@ -433,7 +433,7 @@ static int xen_drm_drv_dumb_create(struct drm_file *filp,return ret; } -static void xen_drm_drv_free_object_unlocked (struct drm_gem_object *obj) +void xen_drm_drv_free_object_unlocked (struct drm_gem_object *obj)
Can we please have naming consistent and name it as
xen_drm_front_drv_free_object_unlocked or any other name if this seems to be too long,
but starting with xen_drm_front_ as the rest of exported functions?
With this,
Thank you,
Oleksandr
Quoted 70 lines
drivers/gpu/drm/xen/xen_drm_front.c +0
-10{struct xen_drm_front_drm_info *drm_info = obj->dev->dev_private;int idx;@@ -481,22 +481,12 @@ static const struct file_operations xen_drm_dev_fops = { .mmap = xen_drm_front_gem_mmap, }; -static const struct vm_operations_struct xen_drm_drv_vm_ops = { - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static struct drm_driver xen_drm_driver = { .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, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = xen_drm_front_gem_import_sg_table, - .gem_prime_get_sg_table = xen_drm_front_gem_get_sg_table, - .gem_prime_vmap = xen_drm_front_gem_prime_vmap, - .gem_prime_vunmap = xen_drm_front_gem_prime_vunmap, .gem_prime_mmap = xen_drm_front_gem_prime_mmap, .dumb_create = xen_drm_drv_dumb_create, .fops = &xen_drm_dev_fops,drivers/gpu/drm/xen/xen_drm_front.h +2
-0@@ -160,4 +160,6 @@ int xen_drm_front_page_flip(struct xen_drm_front_info *front_info,void xen_drm_front_on_frame_done (struct xen_drm_front_info *front_info,int conn_idx,u64 fb_cookie); +void xen_drm_drv_free_object_unlocked (struct drm_gem_object *obj); +#endif /* __XEN_DRM_FRONT_H_ */ drivers/gpu/drm/xen/xen_drm_front_gem.c +15
-0@@ -56,6 +56,19 @@ static void gem_free_pages_array(struct xen_gem_object *xen_obj) xen_obj->pages =NULL ; } +static const struct vm_operations_struct xen_drm_drv_vm_ops = { + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs xen_drm_front_gem_object_funcs = { + .free = xen_drm_drv_free_object_unlocked, + .get_sg_table = xen_drm_front_gem_get_sg_table, + .vmap = xen_drm_front_gem_prime_vmap, + .vunmap = xen_drm_front_gem_prime_vunmap, + .vm_ops = &xen_drm_drv_vm_ops, +}; +static struct xen_gem_object *gem_create_obj (struct drm_device *dev,size_t size) {@@ -66,6 +79,8 @@ static struct xen_gem_object *gem_create_obj(struct drm_device *dev,if (!xen_obj)return ERR_PTR (-ENOMEM ); + xen_obj->base.funcs = &xen_drm_front_gem_object_funcs; + ret =drm_gem_object_init (dev, &xen_obj->base, size);if (ret <0 ) {kfree (xen_obj);
Thomas Zimmermann
maintainerRe: [PATCH 18/20] drm/xen: Introduce GEM object functions
Hi
Am 13.08.20 um 13:19 schrieb Oleksandr Andrushchenko:
Quoted 23 lines
Hi,
Quoted 20 lines · Thomas Zimmermann
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces the per-driver callbacks with per-instance callbacks in xen. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/xen/xen_drm_front.c | 12 +----------- drivers/gpu/drm/xen/xen_drm_front.h | 2 ++ drivers/gpu/drm/xen/xen_drm_front_gem.c | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 11 deletions(-)drivers/gpu/drm/xen/xen_drm_front.c +0
-0@@ -433,7 +433,7 @@ static int xen_drm_drv_dumb_create(struct drm_file *filp,return ret; }
Quoted 8 lines
drivers/gpu/drm/xen/xen_drm_front.c static int xen_drm_drv_dumb_create(struct drm_file *filp, · line 436
Quoted 2 lines
drivers/gpu/drm/xen/xen_drm_front.c +1
-1-static void xen_drm_drv_free_object_unlocked (struct drm_gem_object *obj) +void xen_drm_drv_free_object_unlocked (struct drm_gem_object *obj)Can we please have naming consistent and name it as
xen_drm_front_drv_free_object_unlockedor any other name if this seems to be too long,but starting with
xen_drm_front_as the rest of exported functions?
There already is a function with that name in drm_xen_front_gem.c. I'll move the callback function next to the object-function structure and rename it slightly.
Best regards
Thomas
Quoted 79 lines
With this,
Thank you,
Oleksandr
Quoted 70 lines
drivers/gpu/drm/xen/xen_drm_front.c +0
-10{struct xen_drm_front_drm_info *drm_info = obj->dev->dev_private;int idx;@@ -481,22 +481,12 @@ static const struct file_operations xen_drm_dev_fops = { .mmap = xen_drm_front_gem_mmap, }; -static const struct vm_operations_struct xen_drm_drv_vm_ops = { - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static struct drm_driver xen_drm_driver = { .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, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import_sg_table = xen_drm_front_gem_import_sg_table, - .gem_prime_get_sg_table = xen_drm_front_gem_get_sg_table, - .gem_prime_vmap = xen_drm_front_gem_prime_vmap, - .gem_prime_vunmap = xen_drm_front_gem_prime_vunmap, .gem_prime_mmap = xen_drm_front_gem_prime_mmap, .dumb_create = xen_drm_drv_dumb_create, .fops = &xen_drm_dev_fops,drivers/gpu/drm/xen/xen_drm_front.h +2
-0@@ -160,4 +160,6 @@ int xen_drm_front_page_flip(struct xen_drm_front_info *front_info,void xen_drm_front_on_frame_done (struct xen_drm_front_info *front_info,int conn_idx,u64 fb_cookie); +void xen_drm_drv_free_object_unlocked (struct drm_gem_object *obj); +#endif /* __XEN_DRM_FRONT_H_ */ drivers/gpu/drm/xen/xen_drm_front_gem.c +15
-0@@ -56,6 +56,19 @@ static void gem_free_pages_array(struct xen_gem_object *xen_obj) xen_obj->pages =NULL ; } +static const struct vm_operations_struct xen_drm_drv_vm_ops = { + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +}; + +static const struct drm_gem_object_funcs xen_drm_front_gem_object_funcs = { + .free = xen_drm_drv_free_object_unlocked, + .get_sg_table = xen_drm_front_gem_get_sg_table, + .vmap = xen_drm_front_gem_prime_vmap, + .vunmap = xen_drm_front_gem_prime_vunmap, + .vm_ops = &xen_drm_drv_vm_ops, +}; +static struct xen_gem_object *gem_create_obj (struct drm_device *dev,size_t size) {@@ -66,6 +79,8 @@ static struct xen_gem_object *gem_create_obj(struct drm_device *dev,if (!xen_obj)return ERR_PTR (-ENOMEM ); + xen_obj->base.funcs = &xen_drm_front_gem_object_funcs; + ret =drm_gem_object_init (dev, &xen_obj->base, size);if (ret <0 ) {kfree (xen_obj);
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
Thomas Zimmermann
maintainerPATCH 19/20 drm/xlnx: Initialize DRM driver instance with CMA helper macro
In reply to Thomas ZimmermannThe xlnx driver uses CMA helpers with default callback functions. Initialize the driver structure with the rsp CMA helper macro. The driver is being converted to use GEM object functions as part of this change.
Two callbacks, .dumb_destroy and .gem_prime_import, were initialized to their default implementations, so they are just kept empty now.
--- drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
drivers/gpu/drm/xlnx/zynqmp_dpsub.c +1 -13
@@ -80,19 +80,7 @@ static struct drm_driver zynqmp_dpsub_drm_driver = { .driver_features = DRIVER_MODESET | DRIVER_GEM |DRIVER_ATOMIC , - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = drm_gem_prime_export, - .gem_prime_import = drm_gem_prime_import, - .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .dumb_create = zynqmp_dpsub_dumb_create, - .dumb_destroy = drm_gem_dumb_destroy, +DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE (zynqmp_dpsub_dumb_create), .fops = &zynqmp_dpsub_drm_fops,
Signature · 1 line
2.28.0
Laurent Pinchart
maintainerRe: [PATCH 19/20] drm/xlnx: Initialize DRM driver instance with CMA helper macro
Hi Thomas,
Thank you for the patch.
Quoted 25 lines · Thomas Zimmermann
The xlnx driver uses CMA helpers with default callback functions. Initialize the driver structure with the rsp CMA helper macro. The driver is being converted to use GEM object functions as part of this change.
Two callbacks, .dumb_destroy and .gem_prime_import, were initialized to their default implementations, so they are just kept empty now.
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)drivers/gpu/drm/xlnx/zynqmp_dpsub.c +0
-4@@ -80,19 +80,7 @@ static struct drm_driver zynqmp_dpsub_drm_driver = { .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = drm_gem_prime_export, - .gem_prime_import = drm_gem_prime_import,
drivers/gpu/drm/xlnx/zynqmp_dpsub.c static struct drm_driver zynqmp_dpsub_drm_driver = { · line 83
Quoted 10 lines
drivers/gpu/drm/xlnx/zynqmp_dpsub.c +1
-9- .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .dumb_create = zynqmp_dpsub_dumb_create, - .dumb_destroy = drm_gem_dumb_destroy, + DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(zynqmp_dpsub_dumb_create),
The only effective change here is
- .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
- .gem_prime_mmap = drm_gem_cma_prime_mmap,
+ .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table_vmap,
+ .gem_prime_mmap = drm_gem_prime_mmap,
The change is significant, and I have a hard time following the code to verify that it's correct, or if it's an undesired side effect. If it's correct, could the change be mentioned in the commit message, with at least a brief explanation of why this is correct, and what the consequences here ?
Quoted 3 lines
drivers/gpu/drm/xlnx/zynqmp_dpsub.c +0
-0.fops = &zynqmp_dpsub_drm_fops,
Signature · 3 lines
Regards, Laurent Pinchart
Thomas Zimmermann
maintainerRe: [PATCH 19/20] drm/xlnx: Initialize DRM driver instance with CMA helper macro
Hi
Am 13.08.20 um 15:36 schrieb Laurent Pinchart:
Quoted 48 lines
Hi Thomas,
Thank you for the patch.
Quoted 25 lines · Thomas Zimmermann
The xlnx driver uses CMA helpers with default callback functions. Initialize the driver structure with the rsp CMA helper macro. The driver is being converted to use GEM object functions as part of this change.
Two callbacks, .dumb_destroy and .gem_prime_import, were initialized to their default implementations, so they are just kept empty now.
Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)drivers/gpu/drm/xlnx/zynqmp_dpsub.c +0
-4@@ -80,19 +80,7 @@ static struct drm_driver zynqmp_dpsub_drm_driver = { .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = drm_gem_prime_export, - .gem_prime_import = drm_gem_prime_import,drivers/gpu/drm/xlnx/zynqmp_dpsub.c static struct drm_driver zynqmp_dpsub_drm_driver = { · line 83
Quoted 10 lines
drivers/gpu/drm/xlnx/zynqmp_dpsub.c +1
-9- .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, - .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_vmap = drm_gem_cma_prime_vmap, - .gem_prime_vunmap = drm_gem_cma_prime_vunmap, - .gem_prime_mmap = drm_gem_cma_prime_mmap, - .gem_free_object_unlocked = drm_gem_cma_free_object, - .gem_vm_ops = &drm_gem_cma_vm_ops, - .dumb_create = zynqmp_dpsub_dumb_create, - .dumb_destroy = drm_gem_dumb_destroy, + DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(zynqmp_dpsub_dumb_create),The only effective change here is
drivers/gpu/drm/xlnx/zynqmp_dpsub.c +2
-2- .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, - .gem_prime_mmap = drm_gem_cma_prime_mmap, + .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table_vmap, + .gem_prime_mmap = drm_gem_prime_mmap,
Quoted 5 lines
The change is significant, and I have a hard time following the code to verify that it's correct, or if it's an undesired side effect. If it's correct, could the change be mentioned in the commit message, with at least a brief explanation of why this is correct, and what the consequences here ?
I think this is a mistake that I didn't notice. Thanks for spotting it. Initializing the driver structure DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE should fix it. I'll change this for the patch's next revision.
Best regards
Thomas
Quoted 5 lines
Quoted 4 lines
drivers/gpu/drm/xlnx/zynqmp_dpsub.c +0
-0.fops = &zynqmp_dpsub_drm_fops,
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
Thomas Zimmermann
maintainerPATCH 20/20 drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
In reply to Thomas ZimmermannSeveral GEM and PRIME callbacks have been deprecated in favor of per-instance GEM object functions. Remove the callbacks as they are now unused. The only exception is .gem_prime_mmap, which is still in use by several drivers.
What is also gone is gem_vm_ops in struct drm_driver. All drivers now use struct drm_gem_object_funcs.vm_ops instead.
While at it, the patch also improves error handling around calls to .free and .get_sg_table callbacks.
--- drivers/gpu/drm/drm_gem.c | 35 +++--------- drivers/gpu/drm/drm_gem_cma_helper.c | 6 +- drivers/gpu/drm/drm_prime.c | 17 +++--- include/drm/drm_drv.h | 85 ++-------------------------- 4 files changed, 23 insertions(+), 120 deletions(-)
drivers/gpu/drm/drm_gem.c +8 -27
@@ -247,12 +247,9 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) {struct drm_file *file_priv = data;struct drm_gem_object *obj = ptr; -struct drm_device *dev = obj->dev;if (obj->funcs && obj->funcs->close) obj->funcs->close (obj, file_priv); -else if (dev->driver->gem_close_object) - dev->driver->gem_close_object (obj, file_priv);drm_gem_remove_prime_handles (obj, file_priv);drm_vma_node_revoke (&obj->vma_node, file_priv);
@@ -407,10 +404,6 @@ drm_gem_handle_create_tail(struct drm_file *file_priv, ret = obj->funcs->open (obj, file_priv);if (ret) goto err_revoke; - }else if (dev->driver->gem_open_object) { - ret = dev->driver->gem_open_object (obj, file_priv); -if (ret) - goto err_revoke; } *handlep = handle;
@@ -982,12 +975,11 @@ drm_gem_object_free(struct kref *kref) {struct drm_gem_object *obj = container_of(kref, struct drm_gem_object, refcount); -struct drm_device *dev = obj->dev; -if (obj->funcs) - obj->funcs->free (obj); -else if (dev->driver->gem_free_object_unlocked) - dev->driver->gem_free_object_unlocked (obj); +if (drm_WARN_ON_ONCE (obj->dev, !obj->funcs || !obj->funcs->free)) +return ; + + obj->funcs->free (obj); }EXPORT_SYMBOL (drm_gem_object_free);
@@ -1049,9 +1041,9 @@ EXPORT_SYMBOL(drm_gem_vm_close);* @obj_size: the object size to be mapped, in bytes * @vma: VMA for the area to be mapped * -* Set up the VMA to prepare mapping of the GEM object using the gem_vm_ops -* provided by the driver. Depending on their requirements, drivers can either -* provide a fault handler in their gem_vm_ops (in which case any accesses to +* Set up the VMA to prepare mapping of the GEM object using the GEM object's +* vm_ops. Depending on their requirements, GEM objects can either +* provide a fault handler in their vm_ops (in which case any accesses to * the object will be trapped, to perform migration, GTT binding, surface * register allocation, or performance monitoring), or mmap the buffer memory * synchronously after calling drm_gem_mmap_obj.
@@ -1065,12 +1057,11 @@ EXPORT_SYMBOL(drm_gem_vm_close);* callers must verify access restrictions before calling this helper. * * Return 0 or success or -EINVAL if the object size is smaller than the VMA -* size, or if no gem_vm_ops are provided. +* size, or if no vm_ops are provided. */ int drm_gem_mmap_obj (struct drm_gem_object *obj,unsigned long obj_size,struct vm_area_struct *vma) { -struct drm_device *dev = obj->dev;int ret;/* Check for valid size. */
@@ -1095,8 +1086,6 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, }else {if (obj->funcs && obj->funcs->vm_ops) vma->vm_ops = obj->funcs->vm_ops; -else if (dev->driver->gem_vm_ops) - vma->vm_ops = dev->driver->gem_vm_ops;else {drm_gem_object_put (obj);return -EINVAL ;
@@ -1206,8 +1195,6 @@ int drm_gem_pin(struct drm_gem_object *obj) {if (obj->funcs && obj->funcs->pin)return obj->funcs->pin (obj); -else if (obj->dev->driver->gem_prime_pin) -return obj->dev->driver->gem_prime_pin (obj);else return 0 ; }
@@ -1216,8 +1203,6 @@ void drm_gem_unpin(struct drm_gem_object *obj) {if (obj->funcs && obj->funcs->unpin) obj->funcs->unpin (obj); -else if (obj->dev->driver->gem_prime_unpin) - obj->dev->driver->gem_prime_unpin (obj); }void *drm_gem_vmap (struct drm_gem_object *obj)
@@ -1226,8 +1211,6 @@ void *drm_gem_vmap(struct drm_gem_object *obj)if (obj->funcs && obj->funcs->vmap) vaddr = obj->funcs->vmap (obj); -else if (obj->dev->driver->gem_prime_vmap) - vaddr = obj->dev->driver->gem_prime_vmap (obj);else vaddr =ERR_PTR (-EOPNOTSUPP );
@@ -1244,8 +1227,6 @@ void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr)if (obj->funcs && obj->funcs->vunmap) obj->funcs->vunmap (obj, vaddr); -else if (obj->dev->driver->gem_prime_vunmap) - obj->dev->driver->gem_prime_vunmap (obj, vaddr); }/**
drivers/gpu/drm/drm_gem_cma_helper.c +3 -3
@@ -419,7 +419,7 @@ EXPORT_SYMBOL(drm_gem_cma_print_info);* * This function exports a scatter/gather table suitable for PRIME usage by * calling the standard DMA mapping API. Drivers using the CMA helpers should -* set this as their &drm_driver.gem_prime_get_sg_table callback. +* set this as their &drm_gem_object_funcs.get_sg_table callback. * * Returns: * A pointer to the scatter/gather table of pinned pages or NULL on failure.
@@ -542,7 +542,7 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_prime_mmap);* virtual address space. Since the CMA buffers are already mapped into the * kernel virtual address space this simply returns the cached virtual * address. Drivers using the CMA helpers should set this as their DRM -* driver's &drm_driver.gem_prime_vmap callback. +* driver's &drm_gem_object_funcs.vmap callback. * * Returns: * The kernel virtual address of the CMA GEM object's backing store.
@@ -564,7 +564,7 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_prime_vmap);* This function removes a buffer exported via DRM PRIME from the kernel's * virtual address space. This is a no-op because CMA buffers cannot be * unmapped from kernel space. Drivers using the CMA helpers should set this -* as their &drm_driver.gem_prime_vunmap callback. +* as their &drm_gem_object_funcs.vunmap callback. */ void drm_gem_cma_prime_vunmap (struct drm_gem_object *obj,void *vaddr) {
drivers/gpu/drm/drm_prime.c +8 -9
@@ -386,10 +386,6 @@ 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 (obj, flags); -else - 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
@@ -419,7 +415,7 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev,* This is the PRIME export function which must be used mandatorily by GEM * drivers to ensure correct lifetime management of the underlying GEM object. * The actual exporting from GEM object to a dma-buf is done through the -* &drm_driver.gem_prime_export driver callback. +* &drm_gem_object_funcs.export callback. */ int drm_gem_prime_handle_to_fd(struct drm_device *dev, struct drm_file *file_priv, uint32_t handle,
@@ -616,15 +612,18 @@ struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, enum dma_data_direction dir) {struct drm_gem_object *obj = attach->dmabuf->priv; -struct sg_table *sgt; +struct sg_table *sgt =NULL ;if (WARN_ON (dir ==DMA_NONE ))return ERR_PTR (-EINVAL ); -if (obj->funcs) +if (obj->funcs && obj->funcs->get_sg_table) sgt = obj->funcs->get_sg_table (obj); -else - sgt = obj->dev->driver->gem_prime_get_sg_table (obj); + +if (!sgt) +return ERR_PTR (-EINVAL ); +else if (IS_ERR (sgt)) +return sgt;if (!dma_map_sg_attrs (attach->dev, sgt->sgl, sgt->nents, dir,DMA_ATTR_SKIP_CPU_SYNC )) {
include/drm/drm_drv.h +4 -81
131 lines not on this page · raw message
Signature · 1 line
2.28.0
Re: [PATCH 20/20] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
Hi Thomas.
Quoted 5 lines · Thomas Zimmermann
Several GEM and PRIME callbacks have been deprecated in favor of per-instance GEM object functions. Remove the callbacks as they are now unused. The only exception is .gem_prime_mmap, which is still in use by several drivers.
Quoted 7 lines
What is also gone is
gem_vm_opsin structdrm_driver. All drivers now use struct drm_gem_object_funcs.vm_ops instead.While at it, the patch also improves error handling around calls to .free and .get_sg_table callbacks.
Signed-off-by Thomas Zimmermann <[email protected]>
After this following entry in todo.rst is done?
"
struct drm_gem_object_funcs
---------------------------
GEM objects can now have a function table instead of having the callbacks on the DRM driver struct. This is now the preferred way and drivers can be moved over.
We also need a 2nd version of the CMA define that doesn't require the vmapping to be present (different hook for prime importing). Plus this needs to be rolled out to all drivers using their own implementations, too. "
If yes, then delete it too.
Sam
Quoted 346 lines
--- drivers/gpu/drm/drm_gem.c | 35 +++--------- drivers/gpu/drm/drm_gem_cma_helper.c | 6 +- drivers/gpu/drm/drm_prime.c | 17 +++--- include/drm/drm_drv.h | 85 ++-------------------------- 4 files changed, 23 insertions(+), 120 deletions(-)drivers/gpu/drm/drm_gem.c +8
-27@@ -247,12 +247,9 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) {struct drm_file *file_priv = data;struct drm_gem_object *obj = ptr; -struct drm_device *dev = obj->dev;if (obj->funcs && obj->funcs->close) obj->funcs->close (obj, file_priv); -else if (dev->driver->gem_close_object) - dev->driver->gem_close_object (obj, file_priv);drm_gem_remove_prime_handles (obj, file_priv);drm_vma_node_revoke (&obj->vma_node, file_priv);@@ -407,10 +404,6 @@ drm_gem_handle_create_tail(struct drm_file *file_priv, ret = obj->funcs->open (obj, file_priv);if (ret) goto err_revoke; - }else if (dev->driver->gem_open_object) { - ret = dev->driver->gem_open_object (obj, file_priv); -if (ret) - goto err_revoke; } *handlep = handle;@@ -982,12 +975,11 @@ drm_gem_object_free(struct kref *kref) {struct drm_gem_object *obj = container_of(kref, struct drm_gem_object, refcount); -struct drm_device *dev = obj->dev; -if (obj->funcs) - obj->funcs->free (obj); -else if (dev->driver->gem_free_object_unlocked) - dev->driver->gem_free_object_unlocked (obj); +if (drm_WARN_ON_ONCE (obj->dev, !obj->funcs || !obj->funcs->free)) +return ; + + obj->funcs->free (obj); }EXPORT_SYMBOL (drm_gem_object_free);@@ -1049,9 +1041,9 @@ EXPORT_SYMBOL(drm_gem_vm_close);* @obj_size: the object size to be mapped, in bytes * @vma: VMA for the area to be mapped * -* Set up the VMA to prepare mapping of the GEM object using the gem_vm_ops -* provided by the driver. Depending on their requirements, drivers can either -* provide a fault handler in their gem_vm_ops (in which case any accesses to +* Set up the VMA to prepare mapping of the GEM object using the GEM object's +* vm_ops. Depending on their requirements, GEM objects can either +* provide a fault handler in their vm_ops (in which case any accesses to * the object will be trapped, to perform migration, GTT binding, surface * register allocation, or performance monitoring), or mmap the buffer memory * synchronously after calling drm_gem_mmap_obj. @@ -1065,12 +1057,11 @@ EXPORT_SYMBOL(drm_gem_vm_close);* callers must verify access restrictions before calling this helper. * * Return 0 or success or -EINVAL if the object size is smaller than the VMA -* size, or if no gem_vm_ops are provided. +* size, or if no vm_ops are provided. */ int drm_gem_mmap_obj (struct drm_gem_object *obj,unsigned long obj_size,struct vm_area_struct *vma) { -struct drm_device *dev = obj->dev;int ret;/* Check for valid size. */ @@ -1095,8 +1086,6 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, }else {if (obj->funcs && obj->funcs->vm_ops) vma->vm_ops = obj->funcs->vm_ops; -else if (dev->driver->gem_vm_ops) - vma->vm_ops = dev->driver->gem_vm_ops;else {drm_gem_object_put (obj);return -EINVAL ;@@ -1206,8 +1195,6 @@ int drm_gem_pin(struct drm_gem_object *obj) {if (obj->funcs && obj->funcs->pin)return obj->funcs->pin (obj); -else if (obj->dev->driver->gem_prime_pin) -return obj->dev->driver->gem_prime_pin (obj);else return 0 ; }@@ -1216,8 +1203,6 @@ void drm_gem_unpin(struct drm_gem_object *obj) {if (obj->funcs && obj->funcs->unpin) obj->funcs->unpin (obj); -else if (obj->dev->driver->gem_prime_unpin) - obj->dev->driver->gem_prime_unpin (obj); }void *drm_gem_vmap (struct drm_gem_object *obj)@@ -1226,8 +1211,6 @@ void *drm_gem_vmap(struct drm_gem_object *obj)if (obj->funcs && obj->funcs->vmap) vaddr = obj->funcs->vmap (obj); -else if (obj->dev->driver->gem_prime_vmap) - vaddr = obj->dev->driver->gem_prime_vmap (obj);else vaddr =ERR_PTR (-EOPNOTSUPP );@@ -1244,8 +1227,6 @@ void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr)if (obj->funcs && obj->funcs->vunmap) obj->funcs->vunmap (obj, vaddr); -else if (obj->dev->driver->gem_prime_vunmap) - obj->dev->driver->gem_prime_vunmap (obj, vaddr); }/** drivers/gpu/drm/drm_gem_cma_helper.c +3
-3@@ -419,7 +419,7 @@ EXPORT_SYMBOL(drm_gem_cma_print_info);* * This function exports a scatter/gather table suitable for PRIME usage by * calling the standard DMA mapping API. Drivers using the CMA helpers should -* set this as their &drm_driver.gem_prime_get_sg_table callback. +* set this as their &drm_gem_object_funcs.get_sg_table callback. * * Returns: * A pointer to the scatter/gather table of pinned pages or NULL on failure. @@ -542,7 +542,7 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_prime_mmap);* virtual address space. Since the CMA buffers are already mapped into the * kernel virtual address space this simply returns the cached virtual * address. Drivers using the CMA helpers should set this as their DRM -* driver's &drm_driver.gem_prime_vmap callback. +* driver's &drm_gem_object_funcs.vmap callback. * * Returns: * The kernel virtual address of the CMA GEM object's backing store. @@ -564,7 +564,7 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_prime_vmap);* This function removes a buffer exported via DRM PRIME from the kernel's * virtual address space. This is a no-op because CMA buffers cannot be * unmapped from kernel space. Drivers using the CMA helpers should set this -* as their &drm_driver.gem_prime_vunmap callback. +* as their &drm_gem_object_funcs.vunmap callback. */ void drm_gem_cma_prime_vunmap (struct drm_gem_object *obj,void *vaddr) {drivers/gpu/drm/drm_prime.c +8
-9@@ -386,10 +386,6 @@ 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 (obj, flags); -else - 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 @@ -419,7 +415,7 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev,* This is the PRIME export function which must be used mandatorily by GEM * drivers to ensure correct lifetime management of the underlying GEM object. * The actual exporting from GEM object to a dma-buf is done through the -* &drm_driver.gem_prime_export driver callback. +* &drm_gem_object_funcs.export callback. */ int drm_gem_prime_handle_to_fd(struct drm_device *dev, struct drm_file *file_priv, uint32_t handle,@@ -616,15 +612,18 @@ struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, enum dma_data_direction dir) {struct drm_gem_object *obj = attach->dmabuf->priv; -struct sg_table *sgt; +struct sg_table *sgt =NULL ;if (WARN_ON (dir ==DMA_NONE ))return ERR_PTR (-EINVAL ); -if (obj->funcs) +if (obj->funcs && obj->funcs->get_sg_table) sgt = obj->funcs->get_sg_table (obj); -else - sgt = obj->dev->driver->gem_prime_get_sg_table (obj); + +if (!sgt) +return ERR_PTR (-EINVAL ); +else if (IS_ERR (sgt)) +return sgt;if (!dma_map_sg_attrs (attach->dev, sgt->sgl, sgt->nents, dir,DMA_ATTR_SKIP_CPU_SYNC )) {include/drm/drm_drv.h +4
-81@@ -36,10 +36,12 @@ struct drm_file;struct drm_gem_object ;struct drm_master ;struct drm_minor ; +struct dma_buf ;struct dma_buf_attachment ;struct drm_display_mode ;struct drm_mode_create_dumb ;struct drm_printer ; +struct sg_table ;/** * enum drm_driver_feature - feature flags @@ -327,32 +329,6 @@ struct drm_driver {*/ void (*debugfs_init)(struct drm_minor *minor); -/** -* @gem_free_object_unlocked: deconstructor for drm_gem_objects -* -* This is deprecated and should not be used by new drivers. Use -* &drm_gem_object_funcs.free instead. -*/ -void (*gem_free_object_unlocked) (struct drm_gem_object *obj); - -/** -* @gem_open_object: -* -* This callback is deprecated in favour of &drm_gem_object_funcs.open. -* -* Driver hook called upon gem handle creation -*/ -int (*gem_open_object) (struct drm_gem_object *,struct drm_file *); - -/** -* @gem_close_object: -* -* This callback is deprecated in favour of &drm_gem_object_funcs.close. -* -* Driver hook called upon gem handle release -*/ -void (*gem_close_object) (struct drm_gem_object *,struct drm_file *); -/** * @gem_create_object: constructor for gem objects * @@ -361,6 +337,7 @@ struct drm_driver {*/ struct drm_gem_object *(*gem_create_object)(struct drm_device *dev,size_t size); +/** * @prime_handle_to_fd: * @@ -383,14 +360,7 @@ struct drm_driver {*/ int (*prime_fd_to_handle)(struct drm_device *dev,struct drm_file *file_priv,int prime_fd,uint32_t *handle); -/** -* @gem_prime_export: -* -* Export hook for GEM drivers. Deprecated in favour of -* &drm_gem_object_funcs.export. -*/ -struct dma_buf * (*gem_prime_export)(struct drm_gem_object *obj, -int flags); +/** * @gem_prime_import: * @@ -400,29 +370,6 @@ struct drm_driver {*/ struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,struct dma_buf *dma_buf); - -/** -* @gem_prime_pin: -* -* Deprecated hook in favour of &drm_gem_object_funcs.pin. -*/ -int (*gem_prime_pin)(struct drm_gem_object *obj); - -/** -* @gem_prime_unpin: -* -* Deprecated hook in favour of &drm_gem_object_funcs.unpin. -*/ -void (*gem_prime_unpin)(struct drm_gem_object *obj); - - -/** -* @gem_prime_get_sg_table: -* -* Deprecated hook in favour of &drm_gem_object_funcs.get_sg_table. -*/ -struct sg_table *(*gem_prime_get_sg_table)(struct drm_gem_object *obj); -/** * @gem_prime_import_sg_table: * @@ -433,22 +380,6 @@ struct drm_driver {struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sgt); -/** -* @gem_prime_vmap: -* -* Deprecated vmap hook for GEM drivers. Please use -* &drm_gem_object_funcs.vmap instead. -*/ -void *(*gem_prime_vmap)(struct drm_gem_object *obj); - -/** -* @gem_prime_vunmap: -* -* Deprecated vunmap hook for GEM drivers. Please use -* &drm_gem_object_funcs.vunmap instead. -*/ -void (*gem_prime_vunmap)(struct drm_gem_object *obj,void *vaddr); -/** * @gem_prime_mmap: * @@ -523,14 +454,6 @@ struct drm_driver {struct drm_device *dev, uint32_t handle); -/** -* @gem_vm_ops: Driver private ops for this object -* -* For GEM drivers this is deprecated in favour of -* &drm_gem_object_funcs.vm_ops. -*/ -const struct vm_operations_struct *gem_vm_ops; -/** @major: driver major number */ int major;/** @minor: driver minor number */ Signature · 1 line
2.28.0
Thomas Zimmermann
maintainerRe: [PATCH 20/20] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
Hi
Am 13.08.20 um 12:16 schrieb Sam Ravnborg:
Quoted 16 lines
Hi Thomas.
Quoted 5 lines · Thomas Zimmermann
Several GEM and PRIME callbacks have been deprecated in favor of per-instance GEM object functions. Remove the callbacks as they are now unused. The only exception is .gem_prime_mmap, which is still in use by several drivers.
Quoted 7 lines
What is also gone is
gem_vm_opsin structdrm_driver. All drivers now use struct drm_gem_object_funcs.vm_ops instead.While at it, the patch also improves error handling around calls to .free and .get_sg_table callbacks.
Signed-off-by Thomas Zimmermann <[email protected]>
Quoted 8 lines
After this following entry in
todo.rstis done?"
structdrm_gem_object_funcs
---------------------------GEM objects can now have a function table instead of having the callbacks on the DRM driver struct. This is now the preferred way and drivers can be moved over.
This should only say that .gem_prime_mmap() is left in struct drm_drivers for conversion.
Quoted 5 lines
We also need a 2nd version of the CMA define that doesn't require the vmapping to be present (different hook for prime importing). Plus this needs to be rolled out to all drivers using their own implementations, too. "
This sounds like it got fixed in the recent CMA clean-up series. There are CMA initializer macros for drivers with and without vmap. I have to take a closer look, but I think it can be removed.
Thanks for bringing this up.
Best regards
Thomas
Quoted 356 lines
If yes, then delete it too.
Sam
Quoted 346 lines
--- drivers/gpu/drm/drm_gem.c | 35 +++--------- drivers/gpu/drm/drm_gem_cma_helper.c | 6 +- drivers/gpu/drm/drm_prime.c | 17 +++--- include/drm/drm_drv.h | 85 ++-------------------------- 4 files changed, 23 insertions(+), 120 deletions(-)drivers/gpu/drm/drm_gem.c +8
-27@@ -247,12 +247,9 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) {struct drm_file *file_priv = data;struct drm_gem_object *obj = ptr; -struct drm_device *dev = obj->dev;if (obj->funcs && obj->funcs->close) obj->funcs->close (obj, file_priv); -else if (dev->driver->gem_close_object) - dev->driver->gem_close_object (obj, file_priv);drm_gem_remove_prime_handles (obj, file_priv);drm_vma_node_revoke (&obj->vma_node, file_priv);@@ -407,10 +404,6 @@ drm_gem_handle_create_tail(struct drm_file *file_priv, ret = obj->funcs->open (obj, file_priv);if (ret) goto err_revoke; - }else if (dev->driver->gem_open_object) { - ret = dev->driver->gem_open_object (obj, file_priv); -if (ret) - goto err_revoke; } *handlep = handle;@@ -982,12 +975,11 @@ drm_gem_object_free(struct kref *kref) {struct drm_gem_object *obj = container_of(kref, struct drm_gem_object, refcount); -struct drm_device *dev = obj->dev; -if (obj->funcs) - obj->funcs->free (obj); -else if (dev->driver->gem_free_object_unlocked) - dev->driver->gem_free_object_unlocked (obj); +if (drm_WARN_ON_ONCE (obj->dev, !obj->funcs || !obj->funcs->free)) +return ; + + obj->funcs->free (obj); }EXPORT_SYMBOL (drm_gem_object_free);@@ -1049,9 +1041,9 @@ EXPORT_SYMBOL(drm_gem_vm_close);* @obj_size: the object size to be mapped, in bytes * @vma: VMA for the area to be mapped * -* Set up the VMA to prepare mapping of the GEM object using the gem_vm_ops -* provided by the driver. Depending on their requirements, drivers can either -* provide a fault handler in their gem_vm_ops (in which case any accesses to +* Set up the VMA to prepare mapping of the GEM object using the GEM object's +* vm_ops. Depending on their requirements, GEM objects can either +* provide a fault handler in their vm_ops (in which case any accesses to * the object will be trapped, to perform migration, GTT binding, surface * register allocation, or performance monitoring), or mmap the buffer memory * synchronously after calling drm_gem_mmap_obj. @@ -1065,12 +1057,11 @@ EXPORT_SYMBOL(drm_gem_vm_close);* callers must verify access restrictions before calling this helper. * * Return 0 or success or -EINVAL if the object size is smaller than the VMA -* size, or if no gem_vm_ops are provided. +* size, or if no vm_ops are provided. */ int drm_gem_mmap_obj (struct drm_gem_object *obj,unsigned long obj_size,struct vm_area_struct *vma) { -struct drm_device *dev = obj->dev;int ret;/* Check for valid size. */ @@ -1095,8 +1086,6 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, }else {if (obj->funcs && obj->funcs->vm_ops) vma->vm_ops = obj->funcs->vm_ops; -else if (dev->driver->gem_vm_ops) - vma->vm_ops = dev->driver->gem_vm_ops;else {drm_gem_object_put (obj);return -EINVAL ;@@ -1206,8 +1195,6 @@ int drm_gem_pin(struct drm_gem_object *obj) {if (obj->funcs && obj->funcs->pin)return obj->funcs->pin (obj); -else if (obj->dev->driver->gem_prime_pin) -return obj->dev->driver->gem_prime_pin (obj);else return 0 ; }@@ -1216,8 +1203,6 @@ void drm_gem_unpin(struct drm_gem_object *obj) {if (obj->funcs && obj->funcs->unpin) obj->funcs->unpin (obj); -else if (obj->dev->driver->gem_prime_unpin) - obj->dev->driver->gem_prime_unpin (obj); }void *drm_gem_vmap (struct drm_gem_object *obj)@@ -1226,8 +1211,6 @@ void *drm_gem_vmap(struct drm_gem_object *obj)if (obj->funcs && obj->funcs->vmap) vaddr = obj->funcs->vmap (obj); -else if (obj->dev->driver->gem_prime_vmap) - vaddr = obj->dev->driver->gem_prime_vmap (obj);else vaddr =ERR_PTR (-EOPNOTSUPP );@@ -1244,8 +1227,6 @@ void drm_gem_vunmap(struct drm_gem_object *obj, void *vaddr)if (obj->funcs && obj->funcs->vunmap) obj->funcs->vunmap (obj, vaddr); -else if (obj->dev->driver->gem_prime_vunmap) - obj->dev->driver->gem_prime_vunmap (obj, vaddr); }/** drivers/gpu/drm/drm_gem_cma_helper.c +3
-3@@ -419,7 +419,7 @@ EXPORT_SYMBOL(drm_gem_cma_print_info);* * This function exports a scatter/gather table suitable for PRIME usage by * calling the standard DMA mapping API. Drivers using the CMA helpers should -* set this as their &drm_driver.gem_prime_get_sg_table callback. +* set this as their &drm_gem_object_funcs.get_sg_table callback. * * Returns: * A pointer to the scatter/gather table of pinned pages or NULL on failure. @@ -542,7 +542,7 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_prime_mmap);* virtual address space. Since the CMA buffers are already mapped into the * kernel virtual address space this simply returns the cached virtual * address. Drivers using the CMA helpers should set this as their DRM -* driver's &drm_driver.gem_prime_vmap callback. +* driver's &drm_gem_object_funcs.vmap callback. * * Returns: * The kernel virtual address of the CMA GEM object's backing store. @@ -564,7 +564,7 @@ EXPORT_SYMBOL_GPL(drm_gem_cma_prime_vmap);* This function removes a buffer exported via DRM PRIME from the kernel's * virtual address space. This is a no-op because CMA buffers cannot be * unmapped from kernel space. Drivers using the CMA helpers should set this -* as their &drm_driver.gem_prime_vunmap callback. +* as their &drm_gem_object_funcs.vunmap callback. */ void drm_gem_cma_prime_vunmap (struct drm_gem_object *obj,void *vaddr) {drivers/gpu/drm/drm_prime.c +8
-9@@ -386,10 +386,6 @@ 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 (obj, flags); -else - 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 @@ -419,7 +415,7 @@ static struct dma_buf *export_and_register_object(struct drm_device *dev,* This is the PRIME export function which must be used mandatorily by GEM * drivers to ensure correct lifetime management of the underlying GEM object. * The actual exporting from GEM object to a dma-buf is done through the -* &drm_driver.gem_prime_export driver callback. +* &drm_gem_object_funcs.export callback. */ int drm_gem_prime_handle_to_fd(struct drm_device *dev, struct drm_file *file_priv, uint32_t handle,@@ -616,15 +612,18 @@ struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, enum dma_data_direction dir) {struct drm_gem_object *obj = attach->dmabuf->priv; -struct sg_table *sgt; +struct sg_table *sgt =NULL ;if (WARN_ON (dir ==DMA_NONE ))return ERR_PTR (-EINVAL ); -if (obj->funcs) +if (obj->funcs && obj->funcs->get_sg_table) sgt = obj->funcs->get_sg_table (obj); -else - sgt = obj->dev->driver->gem_prime_get_sg_table (obj); + +if (!sgt) +return ERR_PTR (-EINVAL ); +else if (IS_ERR (sgt)) +return sgt;if (!dma_map_sg_attrs (attach->dev, sgt->sgl, sgt->nents, dir,DMA_ATTR_SKIP_CPU_SYNC )) {include/drm/drm_drv.h +4
-81@@ -36,10 +36,12 @@ struct drm_file;struct drm_gem_object ;struct drm_master ;struct drm_minor ; +struct dma_buf ;struct dma_buf_attachment ;struct drm_display_mode ;struct drm_mode_create_dumb ;struct drm_printer ; +struct sg_table ;/** * enum drm_driver_feature - feature flags @@ -327,32 +329,6 @@ struct drm_driver {*/ void (*debugfs_init)(struct drm_minor *minor); -/** -* @gem_free_object_unlocked: deconstructor for drm_gem_objects -* -* This is deprecated and should not be used by new drivers. Use -* &drm_gem_object_funcs.free instead. -*/ -void (*gem_free_object_unlocked) (struct drm_gem_object *obj); - -/** -* @gem_open_object: -* -* This callback is deprecated in favour of &drm_gem_object_funcs.open. -* -* Driver hook called upon gem handle creation -*/ -int (*gem_open_object) (struct drm_gem_object *,struct drm_file *); - -/** -* @gem_close_object: -* -* This callback is deprecated in favour of &drm_gem_object_funcs.close. -* -* Driver hook called upon gem handle release -*/ -void (*gem_close_object) (struct drm_gem_object *,struct drm_file *); -/** * @gem_create_object: constructor for gem objects * @@ -361,6 +337,7 @@ struct drm_driver {*/ struct drm_gem_object *(*gem_create_object)(struct drm_device *dev,size_t size); +/** * @prime_handle_to_fd: * @@ -383,14 +360,7 @@ struct drm_driver {*/ int (*prime_fd_to_handle)(struct drm_device *dev,struct drm_file *file_priv,int prime_fd,uint32_t *handle); -/** -* @gem_prime_export: -* -* Export hook for GEM drivers. Deprecated in favour of -* &drm_gem_object_funcs.export. -*/ -struct dma_buf * (*gem_prime_export)(struct drm_gem_object *obj, -int flags); +/** * @gem_prime_import: * @@ -400,29 +370,6 @@ struct drm_driver {*/ struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,struct dma_buf *dma_buf); - -/** -* @gem_prime_pin: -* -* Deprecated hook in favour of &drm_gem_object_funcs.pin. -*/ -int (*gem_prime_pin)(struct drm_gem_object *obj); - -/** -* @gem_prime_unpin: -* -* Deprecated hook in favour of &drm_gem_object_funcs.unpin. -*/ -void (*gem_prime_unpin)(struct drm_gem_object *obj); - - -/** -* @gem_prime_get_sg_table: -* -* Deprecated hook in favour of &drm_gem_object_funcs.get_sg_table. -*/ -struct sg_table *(*gem_prime_get_sg_table)(struct drm_gem_object *obj); -/** * @gem_prime_import_sg_table: * @@ -433,22 +380,6 @@ struct drm_driver {struct drm_device *dev, struct dma_buf_attachment *attach, struct sg_table *sgt); -/** -* @gem_prime_vmap: -* -* Deprecated vmap hook for GEM drivers. Please use -* &drm_gem_object_funcs.vmap instead. -*/ -void *(*gem_prime_vmap)(struct drm_gem_object *obj); - -/** -* @gem_prime_vunmap: -* -* Deprecated vunmap hook for GEM drivers. Please use -* &drm_gem_object_funcs.vunmap instead. -*/ -void (*gem_prime_vunmap)(struct drm_gem_object *obj,void *vaddr); -/** * @gem_prime_mmap: * @@ -523,14 +454,6 @@ struct drm_driver {struct drm_device *dev, uint32_t handle); -/** -* @gem_vm_ops: Driver private ops for this object -* -* For GEM drivers this is deprecated in favour of -* &drm_gem_object_funcs.vm_ops. -*/ -const struct vm_operations_struct *gem_vm_ops; -/** @major: driver major number */ int major;/** @minor: driver minor number */ Signature · 1 line
2.28.0_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kernel test robot
build botRe: [Intel-gfx] [PATCH 20/20] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
In reply to Thomas ZimmermannI love your patch! Yet something to improve:
Hi Thomas,
I love your patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on next-20200813]
[cannot apply to drm-intel/for-linux-next linux-arm/drm-armada-devel linux-arm/drm-armada-fixes v5.8] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200813-163944 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git dc06fe51d26efc100ac74121607c01a454867c91 config: arc-allmodconfig (attached as .config) compiler: arc-elf-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arc
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
drivers/gpu/drm/arm/malidp_planes.c: In function 'malidp_check_pages_threshold':
>> drivers/gpu/drm/arm/malidp_planes.c:349:28: error: 'struct drm_driver' has no member named 'gem_prime_get_sg_table'; did you mean 'gem_prime_import_sg_table'?
349 | sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
| ^~~~~~~~~~~~~~~~~~~~~~
| gem_prime_import_sg_tablevim +349 drivers/gpu/drm/arm/malidp_planes.c
1f23a56a46b81d Jamie Fox 2018-10-01 325
1f23a56a46b81d Jamie Fox 2018-10-01 326 /*
1f23a56a46b81d Jamie Fox 2018-10-01 327 * Check if the framebuffer is entirely made up of pages at least pgsize in
1f23a56a46b81d Jamie Fox 2018-10-01 328 * size. Only a heuristic: assumes that each scatterlist entry has been aligned
1f23a56a46b81d Jamie Fox 2018-10-01 329 * to the largest page size smaller than its length and that the MMU maps to
1f23a56a46b81d Jamie Fox 2018-10-01 330 * the largest page size possible.
1f23a56a46b81d Jamie Fox 2018-10-01 331 */
1f23a56a46b81d Jamie Fox 2018-10-01 332 static bool malidp_check_pages_threshold(struct malidp_plane_state *ms,
1f23a56a46b81d Jamie Fox 2018-10-01 333 u32 pgsize)
1f23a56a46b81d Jamie Fox 2018-10-01 334 {
1f23a56a46b81d Jamie Fox 2018-10-01 335 int i;
1f23a56a46b81d Jamie Fox 2018-10-01 336
1f23a56a46b81d Jamie Fox 2018-10-01 337 for (i = 0; i < ms->n_planes; i++) {
1f23a56a46b81d Jamie Fox 2018-10-01 338 struct drm_gem_object *obj;
1f23a56a46b81d Jamie Fox 2018-10-01 339 struct drm_gem_cma_object *cma_obj;
1f23a56a46b81d Jamie Fox 2018-10-01 340 struct sg_table *sgt;
1f23a56a46b81d Jamie Fox 2018-10-01 341 struct scatterlist *sgl;
1f23a56a46b81d Jamie Fox 2018-10-01 342
1f23a56a46b81d Jamie Fox 2018-10-01 343 obj = drm_gem_fb_get_obj(ms->base.fb, i);
1f23a56a46b81d Jamie Fox 2018-10-01 344 cma_obj = to_drm_gem_cma_obj(obj);
1f23a56a46b81d Jamie Fox 2018-10-01 345
1f23a56a46b81d Jamie Fox 2018-10-01 346 if (cma_obj->sgt)
1f23a56a46b81d Jamie Fox 2018-10-01 347 sgt = cma_obj->sgt;
1f23a56a46b81d Jamie Fox 2018-10-01 348 else
1f23a56a46b81d Jamie Fox 2018-10-01 @349 sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
1f23a56a46b81d Jamie Fox 2018-10-01 350
1f23a56a46b81d Jamie Fox 2018-10-01 351 if (!sgt)
1f23a56a46b81d Jamie Fox 2018-10-01 352 return false;
1f23a56a46b81d Jamie Fox 2018-10-01 353
1f23a56a46b81d Jamie Fox 2018-10-01 354 sgl = sgt->sgl;
1f23a56a46b81d Jamie Fox 2018-10-01 355
1f23a56a46b81d Jamie Fox 2018-10-01 356 while (sgl) {
1f23a56a46b81d Jamie Fox 2018-10-01 357 if (sgl->length < pgsize) {
1f23a56a46b81d Jamie Fox 2018-10-01 358 if (!cma_obj->sgt)
1f23a56a46b81d Jamie Fox 2018-10-01 359 kfree(sgt);
1f23a56a46b81d Jamie Fox 2018-10-01 360 return false;
1f23a56a46b81d Jamie Fox 2018-10-01 361 }
1f23a56a46b81d Jamie Fox 2018-10-01 362
1f23a56a46b81d Jamie Fox 2018-10-01 363 sgl = sg_next(sgl);
1f23a56a46b81d Jamie Fox 2018-10-01 364 }
1f23a56a46b81d Jamie Fox 2018-10-01 365 if (!cma_obj->sgt)
1f23a56a46b81d Jamie Fox 2018-10-01 366 kfree(sgt);
1f23a56a46b81d Jamie Fox 2018-10-01 367 }
1f23a56a46b81d Jamie Fox 2018-10-01 368
1f23a56a46b81d Jamie Fox 2018-10-01 369 return true;
1f23a56a46b81d Jamie Fox 2018-10-01 370 }
1f23a56a46b81d Jamie Fox 2018-10-01 371 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [Intel-gfx] [PATCH 20/20] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
In reply to Thomas ZimmermannI love your patch! Perhaps something to improve:
Hi Thomas,
I love your patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on next-20200813]
[cannot apply to drm-intel/for-linux-next linux-arm/drm-armada-devel linux-arm/drm-armada-fixes anholt/for-next v5.8] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200813-163944 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git dc06fe51d26efc100ac74121607c01a454867c91 config: i386-randconfig-m021-20200811 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
If you fix the issue, kindly add following tag as appropriate
New smatch warnings:drivers/gpu/drm/drm_prime.c:389 export_and_register_object() error: uninitialized symbol 'dmabuf'.
Old smatch warnings:drivers/gpu/drm/drm_prime.c:359 drm_gem_prime_fd_to_handle() warn: inconsistent returns 'dev->object_name_lock'.
vim +/dmabuf +389 drivers/gpu/drm/drm_prime.c
89177644a7b6306 Aaron Plattner 2013-01-15 374
319c933c71f3dbd Daniel Vetter 2013-08-15 375 static struct dma_buf *export_and_register_object(struct drm_device *dev,
319c933c71f3dbd Daniel Vetter 2013-08-15 376 struct drm_gem_object *obj,
319c933c71f3dbd Daniel Vetter 2013-08-15 377 uint32_t flags)
319c933c71f3dbd Daniel Vetter 2013-08-15 378 {
319c933c71f3dbd Daniel Vetter 2013-08-15 379 struct dma_buf *dmabuf;
319c933c71f3dbd Daniel Vetter 2013-08-15 380
319c933c71f3dbd Daniel Vetter 2013-08-15 381 /* prevent races with concurrent gem_close. */
319c933c71f3dbd Daniel Vetter 2013-08-15 382 if (obj->handle_count == 0) {
319c933c71f3dbd Daniel Vetter 2013-08-15 383 dmabuf = ERR_PTR(-ENOENT);
319c933c71f3dbd Daniel Vetter 2013-08-15 384 return dmabuf;
319c933c71f3dbd Daniel Vetter 2013-08-15 385 }
319c933c71f3dbd Daniel Vetter 2013-08-15 386
b39b5394fabc79a Noralf Trønnes 2018-11-10 387 if (obj->funcs && obj->funcs->export)
b39b5394fabc79a Noralf Trønnes 2018-11-10 388 dmabuf = obj->funcs->export(obj, flags);
319c933c71f3dbd Daniel Vetter 2013-08-15 @389 if (IS_ERR(dmabuf)) {
319c933c71f3dbd Daniel Vetter 2013-08-15 390 /* normally the created dma-buf takes ownership of the ref,
319c933c71f3dbd Daniel Vetter 2013-08-15 391 * but if that fails then drop the ref
319c933c71f3dbd Daniel Vetter 2013-08-15 392 */
319c933c71f3dbd Daniel Vetter 2013-08-15 393 return dmabuf;
319c933c71f3dbd Daniel Vetter 2013-08-15 394 }
319c933c71f3dbd Daniel Vetter 2013-08-15 395
319c933c71f3dbd Daniel Vetter 2013-08-15 396 /*
319c933c71f3dbd Daniel Vetter 2013-08-15 397 * Note that callers do not need to clean up the export cache
319c933c71f3dbd Daniel Vetter 2013-08-15 398 * since the check for obj->handle_count guarantees that someone
319c933c71f3dbd Daniel Vetter 2013-08-15 399 * will clean it up.
319c933c71f3dbd Daniel Vetter 2013-08-15 400 */
319c933c71f3dbd Daniel Vetter 2013-08-15 401 obj->dma_buf = dmabuf;
319c933c71f3dbd Daniel Vetter 2013-08-15 402 get_dma_buf(obj->dma_buf);
319c933c71f3dbd Daniel Vetter 2013-08-15 403
319c933c71f3dbd Daniel Vetter 2013-08-15 404 return dmabuf;
319c933c71f3dbd Daniel Vetter 2013-08-15 405 }
319c933c71f3dbd Daniel Vetter 2013-08-15 406 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Convert all remaining drivers to GEM object functions
In reply to Thomas Zimmermann== Series Details ==
== Series Details ==
Series: Convert all remaining drivers to GEM object functions
URL : https://patchwork.freedesktop.org/series/80593/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 3432354b0aba drm/amdgpu: Introduce GEM object functions a6636204e871 drm/armada: Introduce GEM object functions 419237bb45ec drm/etnaviv: Introduce GEM object functions 5ac6227c35a6 drm/exynos: Introduce GEM object functions bece754b7d5e drm/gma500: Introduce GEM object functions 975a7cc97edf drm/i915: Introduce GEM object functions 8f9c261ff43a drm/mediatek: Introduce GEM object functions 8901932a7d0b drm/msm: Introduce GEM object funcs 8e0a96b9b934 drm/nouveau: Introduce GEM object functions 6db00555b27f drm/omapdrm: Introduce GEM object functions 9f951cff95de drm/pl111: Introduce GEM object functions d35bbda1b7a0 drm/radeon: Introduce GEM object functions -:85: WARNING:AVOID_EXTERNS: externs should be avoided in .c files #85: FILE: drivers/gpu/drm/radeon/radeon_object.c:48: +void radeon_gem_object_free(struct drm_gem_object *obj);
-:86: WARNING:AVOID_EXTERNS: externs should be avoided in .c files #86: FILE: drivers/gpu/drm/radeon/radeon_object.c:49:
+int radeon_gem_object_open(struct drm_gem_object *obj,
-:87: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #87: FILE: drivers/gpu/drm/radeon/radeon_object.c:50:
+int radeon_gem_object_open(struct drm_gem_object *obj,
+ struct drm_file *file_priv);
-:88: WARNING:AVOID_EXTERNS: externs should be avoided in .c files #88: FILE: drivers/gpu/drm/radeon/radeon_object.c:51:
+void radeon_gem_object_close(struct drm_gem_object *obj,
-:89: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #89: FILE: drivers/gpu/drm/radeon/radeon_object.c:52:
+void radeon_gem_object_close(struct drm_gem_object *obj,
+ struct drm_file *file_priv);
-:93: WARNING:AVOID_EXTERNS: externs should be avoided in .c files #93: FILE: drivers/gpu/drm/radeon/radeon_object.c:56:
+int radeon_gem_prime_pin(struct drm_gem_object *obj);
-:94: WARNING:AVOID_EXTERNS: externs should be avoided in .c files #94: FILE: drivers/gpu/drm/radeon/radeon_object.c:57:
+void radeon_gem_prime_unpin(struct drm_gem_object *obj);
-:96: WARNING:AVOID_EXTERNS: externs should be avoided in .c files #96: FILE: drivers/gpu/drm/radeon/radeon_object.c:59:
+void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
total: 0 errors, 6 warnings, 2 checks, 101 lines checked 67f82bee99a9 drm/rockchip: Convert to drm_gem_object_funcs dabc081c2725 drm/tegra: Introduce GEM object functions082439f00666 drm/vc4: Introduce GEM object functionsfff50ea99db8 drm/vgem: Introduce GEM object functions700a27560ff8 drm/vkms: Introduce GEM object functionse7063ad8ca7d drm/xen: Introduce GEM object functions57a3d52d4eaf drm/xlnx: Initialize DRM driver instance with CMA helper macro f887ba13ff85 drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Convert all remaining drivers to GEM object functions
In reply to Thomas Zimmermann== Series Details ==
== Series Details ==
Series: Convert all remaining drivers to GEM object functions
URL : https://patchwork.freedesktop.org/series/80593/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8880 -> Patchwork_18353
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18353 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18353, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18353:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_fence@basic-busy@rcs0:
- fi-blb-e6850: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-blb-e6850/igt@gem_exec_fence@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-blb-e6850/igt@gem_exec_fence@[email protected]
- fi-pnv-d510: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-pnv-d510/igt@gem_exec_fence@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-pnv-d510/igt@gem_exec_fence@[email protected]
* igt@gem_exec_fence@basic-busy@vcs0:
- fi-ivb-3770: [PASS][5] -> [DMESG-WARN][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-ivb-3770/igt@gem_exec_fence@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-ivb-3770/igt@gem_exec_fence@[email protected]
- fi-elk-e7500: [PASS][7] -> [DMESG-WARN][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-elk-e7500/igt@gem_exec_fence@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-elk-e7500/igt@gem_exec_fence@[email protected]
- fi-ilk-650: [PASS][9] -> [DMESG-WARN][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-ilk-650/igt@gem_exec_fence@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-ilk-650/igt@gem_exec_fence@[email protected]
- fi-byt-j1900: [PASS][11] -> [DMESG-WARN][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-byt-j1900/igt@gem_exec_fence@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-byt-j1900/igt@gem_exec_fence@[email protected]
* igt@gem_exec_fence@basic-busy@vecs0:
- fi-hsw-4770: [PASS][13] -> [DMESG-WARN][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-hsw-4770/igt@gem_exec_fence@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-hsw-4770/igt@gem_exec_fence@[email protected]
- fi-cml-u2: [PASS][15] -> [DMESG-WARN][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-cml-u2/igt@gem_exec_fence@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-cml-u2/igt@gem_exec_fence@[email protected]
- fi-skl-6700k2: [PASS][17] -> [DMESG-WARN][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-skl-6700k2/igt@gem_exec_fence@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-skl-6700k2/igt@gem_exec_fence@[email protected]
- fi-cfl-8700k: [PASS][19] -> [DMESG-WARN][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-cfl-8700k/igt@gem_exec_fence@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-cfl-8700k/igt@gem_exec_fence@[email protected]
- fi-tgl-u2: [PASS][21] -> [DMESG-WARN][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-tgl-u2/igt@gem_exec_fence@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-tgl-u2/igt@gem_exec_fence@[email protected]
- fi-bsw-n3050: [PASS][23] -> [DMESG-WARN][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-bsw-n3050/igt@gem_exec_fence@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bsw-n3050/igt@gem_exec_fence@[email protected]
- fi-skl-lmem: [PASS][25] -> [DMESG-WARN][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-skl-lmem/igt@gem_exec_fence@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-skl-lmem/igt@gem_exec_fence@[email protected]
- fi-kbl-soraka: [PASS][27] -> [DMESG-WARN][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-kbl-soraka/igt@gem_exec_fence@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-soraka/igt@gem_exec_fence@[email protected]
- fi-cml-s: [PASS][29] -> [DMESG-WARN][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-cml-s/igt@gem_exec_fence@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-cml-s/igt@gem_exec_fence@[email protected]
- fi-kbl-x1275: [PASS][31] -> [DMESG-WARN][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-kbl-x1275/igt@gem_exec_fence@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-x1275/igt@gem_exec_fence@[email protected]
- fi-bsw-kefka: [PASS][33] -> [DMESG-WARN][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-bsw-kefka/igt@gem_exec_fence@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bsw-kefka/igt@gem_exec_fence@[email protected]
- fi-kbl-r: [PASS][35] -> [DMESG-WARN][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-kbl-r/igt@gem_exec_fence@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-r/igt@gem_exec_fence@[email protected]
- fi-cfl-8109u: [PASS][37] -> [DMESG-WARN][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-cfl-8109u/igt@gem_exec_fence@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-cfl-8109u/igt@gem_exec_fence@[email protected]
- fi-icl-y: [PASS][39] -> [DMESG-WARN][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-icl-y/igt@gem_exec_fence@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-icl-y/igt@gem_exec_fence@[email protected]
- fi-kbl-guc: [PASS][41] -> [DMESG-WARN][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-kbl-guc/igt@gem_exec_fence@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-guc/igt@gem_exec_fence@[email protected]
- fi-bsw-nick: [PASS][43] -> [DMESG-WARN][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-bsw-nick/igt@gem_exec_fence@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bsw-nick/igt@gem_exec_fence@[email protected]
- fi-bdw-gvtdvm: [PASS][45] -> [DMESG-WARN][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-bdw-gvtdvm/igt@gem_exec_fence@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bdw-gvtdvm/igt@gem_exec_fence@[email protected]
- fi-bdw-5557u: [PASS][47] -> [DMESG-WARN][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-bdw-5557u/igt@gem_exec_fence@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bdw-5557u/igt@gem_exec_fence@[email protected]
- fi-kbl-7500u: [PASS][49] -> [DMESG-WARN][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-kbl-7500u/igt@gem_exec_fence@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-7500u/igt@gem_exec_fence@[email protected]
- fi-skl-6600u: [PASS][51] -> [DMESG-WARN][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-skl-6600u/igt@gem_exec_fence@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-skl-6600u/igt@gem_exec_fence@[email protected]
- fi-skl-guc: [PASS][53] -> [DMESG-WARN][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-skl-guc/igt@gem_exec_fence@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-skl-guc/igt@gem_exec_fence@[email protected]
* igt@runner@aborted:
- fi-ilk-650: NOTRUN -> [FAIL][55]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-ilk-650/igt@[email protected]
- fi-pnv-d510: NOTRUN -> [FAIL][56]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-pnv-d510/igt@[email protected]
- fi-kbl-x1275: NOTRUN -> [FAIL][57]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-x1275/igt@[email protected]
- fi-bsw-kefka: NOTRUN -> [FAIL][58]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bsw-kefka/igt@[email protected]
- fi-bdw-gvtdvm: NOTRUN -> [FAIL][59]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bdw-gvtdvm/igt@[email protected]
- fi-cfl-8700k: NOTRUN -> [FAIL][60]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-cfl-8700k/igt@[email protected]
- fi-skl-6600u: NOTRUN -> [FAIL][61]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-skl-6600u/igt@[email protected]
- fi-cfl-8109u: NOTRUN -> [FAIL][62]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-cfl-8109u/igt@[email protected]
- fi-bsw-nick: NOTRUN -> [FAIL][63]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bsw-nick/igt@[email protected]
- fi-snb-2520m: NOTRUN -> [FAIL][64]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-snb-2520m/igt@[email protected]
- fi-skl-lmem: NOTRUN -> [FAIL][65]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-skl-lmem/igt@[email protected]
- fi-kbl-r: NOTRUN -> [FAIL][66]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-r/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [FAIL][67]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bdw-5557u/igt@[email protected]
- fi-bwr-2160: NOTRUN -> [FAIL][68]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bwr-2160/igt@[email protected]
- fi-kbl-soraka: NOTRUN -> [FAIL][69]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-soraka/igt@[email protected]
- fi-hsw-4770: NOTRUN -> [FAIL][70]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-hsw-4770/igt@[email protected]
- fi-kbl-7500u: NOTRUN -> [FAIL][71]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-7500u/igt@[email protected]
- fi-kbl-guc: NOTRUN -> [FAIL][72]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-guc/igt@[email protected]
- fi-snb-2600: NOTRUN -> [FAIL][73]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-snb-2600/igt@[email protected]
- fi-cml-u2: NOTRUN -> [FAIL][74]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-cml-u2/igt@[email protected]
- fi-ivb-3770: NOTRUN -> [FAIL][75]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-ivb-3770/igt@[email protected]
- fi-byt-j1900: NOTRUN -> [FAIL][76]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-byt-j1900/igt@[email protected]
- fi-elk-e7500: NOTRUN -> [FAIL][77]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-elk-e7500/igt@[email protected]
- fi-cml-s: NOTRUN -> [FAIL][78]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-cml-s/igt@[email protected]
- fi-icl-y: NOTRUN -> [FAIL][79]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-icl-y/igt@[email protected]
- fi-skl-guc: NOTRUN -> [FAIL][80]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-skl-guc/igt@[email protected]
- fi-skl-6700k2: NOTRUN -> [FAIL][81]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-skl-6700k2/igt@[email protected]
- fi-bsw-n3050: NOTRUN -> [FAIL][82]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bsw-n3050/igt@[email protected]
- fi-blb-e6850: NOTRUN -> [FAIL][83]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-blb-e6850/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- fi-tgl-u2: [FAIL][84] ([i915#1233] / [i915#2110]) -> [FAIL][85]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-tgl-u2/igt@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-tgl-u2/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_exec_fence@basic-busy@vecs0:
- {fi-ehl-1}: [PASS][86] -> [DMESG-WARN][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-ehl-1/igt@gem_exec_fence@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-ehl-1/igt@gem_exec_fence@[email protected]
- {fi-tgl-dsi}: [PASS][88] -> [DMESG-WARN][89]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-tgl-dsi/igt@gem_exec_fence@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-tgl-dsi/igt@gem_exec_fence@[email protected]
- {fi-kbl-7560u}: [PASS][90] -> [DMESG-WARN][91]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-kbl-7560u/igt@gem_exec_fence@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-7560u/igt@gem_exec_fence@[email protected]
* igt@runner@aborted:
- {fi-tgl-dsi}: NOTRUN -> [FAIL][92]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-tgl-dsi/igt@[email protected]
- {fi-ehl-1}: NOTRUN -> [FAIL][93]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-ehl-1/igt@[email protected]
- {fi-kbl-7560u}: NOTRUN -> [FAIL][94]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-7560u/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_18353 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fence@basic-busy@vecs0:
- fi-apl-guc: [PASS][95] -> [DMESG-WARN][96] ([i915#1635])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-apl-guc/igt@gem_exec_fence@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-apl-guc/igt@gem_exec_fence@[email protected]
- fi-bxt-dsi: [PASS][97] -> [DMESG-WARN][98] ([i915#1635])
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-bxt-dsi/igt@gem_exec_fence@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-bxt-dsi/igt@gem_exec_fence@[email protected]
#### Warnings ####
* igt@debugfs_test@read_all_entries:
- fi-kbl-x1275: [DMESG-WARN][99] ([i915#62] / [i915#92]) -> [DMESG-WARN][100] ([i915#62] / [i915#92] / [i915#95])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8880/fi-kbl-x1275/igt@debugfs_test@read_all_entries.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/fi-kbl-x1275/igt@debugfs_test@read_all_entries.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1233]: https://gitlab.freedesktop.org/drm/intel/issues/1233
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#2110]: https://gitlab.freedesktop.org/drm/intel/issues/2110
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (44 -> 37)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_8880 -> Patchwork_18353
CI-20190529: 20190529
CI_DRM_8880: 105bb2602f98f6acb503ad62a5b6a86e1f454ca5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5769: 4e5f76be680b65780204668e302026cf638decc9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18353: f887ba13ff85dd6c3bfa8fff2b06fb5562bdcbe7 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f887ba13ff85 drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver 57a3d52d4eaf drm/xlnx: Initialize DRM driver instance with CMA helper macro e7063ad8ca7d drm/xen: Introduce GEM object functions700a27560ff8 drm/vkms: Introduce GEM object functionsfff50ea99db8 drm/vgem: Introduce GEM object functions082439f00666 drm/vc4: Introduce GEM object functionsdabc081c2725 drm/tegra: Introduce GEM object functions67f82bee99a9 drm/rockchip: Convert to drm_gem_object_funcs d35bbda1b7a0 drm/radeon: Introduce GEM object functions 9f951cff95de drm/pl111: Introduce GEM object functions6db00555b27f drm/omapdrm: Introduce GEM object functions 8e0a96b9b934 drm/nouveau: Introduce GEM object functions 8901932a7d0b drm/msm: Introduce GEM object funcs8f9c261ff43a drm/mediatek: Introduce GEM object functions 975a7cc97edf drm/i915: Introduce GEM object functionsbece754b7d5e drm/gma500: Introduce GEM object functions 5ac6227c35a6 drm/exynos: Introduce GEM object functions 419237bb45ec drm/etnaviv: Introduce GEM object functions a6636204e871 drm/armada: Introduce GEM object functions 3432354b0aba drm/amdgpu: Introduce GEM object functions
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18353/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx