Convert all remaining drivers to GEM object functions
Subsystems (27)
Thomas Zimmermann
maintainerv2 cover 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 #16 and #18 to #19 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 #17 fixes virtgpu to use GEM object functions where possible. The driver recently introduced a function for one of the deprecated callbacks.
Patch #20 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 #21.
Further testing is welcome. I tested the drivers for which I have HW available. These are gma500, i915, nouveau, radeon and vc4. The console, Weston and Xorg apparently work with the patches applied.
v2:
* moved code in amdgpu and radeon
* made several functions static in various drivers
* updated TODO-list item
* fix virtgpu
Thomas Zimmermann (21):
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/virtgpu: Set PRIME export function in struct drm_gem_object_funcs 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
Documentation/gpu/todo.rst | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 -- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 5 -- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 + 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 | 21 ++++- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 - drivers/gpu/drm/i915/i915_drv.c | 4 - .../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 | 18 +++- drivers/gpu/drm/omapdrm/omap_gem.h | 2 - drivers/gpu/drm/pl111/pl111_drv.c | 5 +- drivers/gpu/drm/radeon/radeon_drv.c | 23 +---- drivers/gpu/drm/radeon/radeon_gem.c | 31 ++++++- 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/virtio/virtgpu_drv.c | 1 - drivers/gpu/drm/virtio/virtgpu_object.c | 1 + drivers/gpu/drm/vkms/vkms_drv.c | 8 -- drivers/gpu/drm/vkms/vkms_gem.c | 13 +++ drivers/gpu/drm/xen/xen_drm_front.c | 44 ++++------ 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 +------------------ 57 files changed, 319 insertions(+), 349 deletions(-)
--
2.28.0
Thomas Zimmermann
maintainerPATCH v2 1/21 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.
v2:
* move object-function instance to amdgpu_gem.c (Christian)
* set callbacks in amdgpu_gem_object_create() (Christian)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ------ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 5 ----- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 + 4 files changed, 19 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -6
@@ -1505,19 +1505,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_gem.c +18 -5
@@ -36,9 +36,12 @@#include "amdgpu.h" #include "amdgpu_display.h" +#include "amdgpu_dma_buf.h" #include "amdgpu_xgmi.h" -void amdgpu_gem_object_free (struct drm_gem_object *gobj) +static const struct drm_gem_object_funcs amdgpu_gem_object_funcs; + +static void amdgpu_gem_object_free (struct drm_gem_object *gobj) {struct amdgpu_bo *robj =gem_to_amdgpu_bo (gobj);
@@ -87,6 +90,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,return r; } *obj = &bo->tbo.base; + (*obj)->funcs = &amdgpu_gem_object_funcs;return 0 ; }
@@ -119,8 +123,8 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev)* Call from drm_gem_handle_create which appear in both new and open ioctl * case. */ -int amdgpu_gem_object_open (struct drm_gem_object *obj, -struct drm_file *file_priv) +static int amdgpu_gem_object_open (struct drm_gem_object *obj, +struct drm_file *file_priv) {struct amdgpu_bo *abo =gem_to_amdgpu_bo (obj);struct amdgpu_device *adev =amdgpu_ttm_adev (abo->tbo.bdev);
@@ -152,8 +156,8 @@ int amdgpu_gem_object_open(struct drm_gem_object *obj,return 0 ; } -void amdgpu_gem_object_close (struct drm_gem_object *obj, -struct drm_file *file_priv) +static void amdgpu_gem_object_close (struct drm_gem_object *obj, +struct drm_file *file_priv) {struct amdgpu_bo *bo =gem_to_amdgpu_bo (obj);struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev);
@@ -211,6 +215,15 @@ void amdgpu_gem_object_close(struct drm_gem_object *obj,ttm_eu_backoff_reservation (&ticket, &list); } +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, +}; +/* * GEM ioctls. */
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h +0 -5
@@ -33,11 +33,6 @@#define AMDGPU_GEM_DOMAIN_MAX 0x3#define gem_to_amdgpu_bo (gobj) container_of((gobj), struct amdgpu_bo, tbo.base) -void amdgpu_gem_object_free (struct drm_gem_object *obj); -int amdgpu_gem_object_open (struct drm_gem_object *obj, -struct drm_file *file_priv); -void amdgpu_gem_object_close (struct drm_gem_object *obj, -struct drm_file *file_priv);unsigned long amdgpu_gem_timeout (uint64_t timeout_ns);/*
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -0
@@ -561,6 +561,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, bo =kzalloc (sizeof (struct amdgpu_bo ),GFP_KERNEL );if (bo ==NULL )return -ENOMEM ; +drm_gem_private_object_init (adev_to_drm (adev), &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 v2 01/21] drm/amdgpu: Introduce GEM object functions
Am 15.09.20 um 16:59 schrieb Thomas Zimmermann:
Quoted 126 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.v2:
* move object-function instance toamdgpu_gem.c(Christian)
* set callbacks inamdgpu_gem_object_create()(Christian)Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ------ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 5 ----- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 + 4 files changed, 19 insertions(+), 16 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0
-6@@ -1505,19 +1505,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_gem.c +18
-5@@ -36,9 +36,12 @@#include "amdgpu.h" #include "amdgpu_display.h" +#include "amdgpu_dma_buf.h" #include "amdgpu_xgmi.h" -void amdgpu_gem_object_free (struct drm_gem_object *gobj) +static const struct drm_gem_object_funcs amdgpu_gem_object_funcs; + +static void amdgpu_gem_object_free (struct drm_gem_object *gobj) {struct amdgpu_bo *robj =gem_to_amdgpu_bo (gobj);@@ -87,6 +90,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,return r; } *obj = &bo->tbo.base; + (*obj)->funcs = &amdgpu_gem_object_funcs;return 0 ; }@@ -119,8 +123,8 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev)* Call from drm_gem_handle_create which appear in both new and open ioctl * case. */ -int amdgpu_gem_object_open (struct drm_gem_object *obj, -struct drm_file *file_priv) +static int amdgpu_gem_object_open (struct drm_gem_object *obj, +struct drm_file *file_priv) {struct amdgpu_bo *abo =gem_to_amdgpu_bo (obj);struct amdgpu_device *adev =amdgpu_ttm_adev (abo->tbo.bdev);@@ -152,8 +156,8 @@ int amdgpu_gem_object_open(struct drm_gem_object *obj,return 0 ; } -void amdgpu_gem_object_close (struct drm_gem_object *obj, -struct drm_file *file_priv) +static void amdgpu_gem_object_close (struct drm_gem_object *obj, +struct drm_file *file_priv) {struct amdgpu_bo *bo =gem_to_amdgpu_bo (obj);struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev);@@ -211,6 +215,15 @@ void amdgpu_gem_object_close(struct drm_gem_object *obj,ttm_eu_backoff_reservation (&ticket, &list); } +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, +}; +/* * GEM ioctls. */ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h +0
-5@@ -33,11 +33,6 @@#define AMDGPU_GEM_DOMAIN_MAX 0x3#define gem_to_amdgpu_bo (gobj) container_of((gobj), struct amdgpu_bo, tbo.base) -void amdgpu_gem_object_free (struct drm_gem_object *obj); -int amdgpu_gem_object_open (struct drm_gem_object *obj, -struct drm_file *file_priv); -void amdgpu_gem_object_close (struct drm_gem_object *obj, -struct drm_file *file_priv);unsigned long amdgpu_gem_timeout (uint64_t timeout_ns);/* drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c static int amdgpu_bo_do_create(struct amdgpu_device *adev, · line 564
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1
-0@@ -561,6 +561,7 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, bo =kzalloc (sizeof (struct amdgpu_bo ),GFP_KERNEL );if (bo ==NULL )return -ENOMEM ; +
The newline is not unrelated.
Apart from that the patch is Reviewed-by: Christian König <[email protected]>.
But I think we need some smoke testing of it.
Christian.
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c static int amdgpu_bo_do_create(struct amdgpu_device *adev, · line 567
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-0drm_gem_private_object_init (adev_to_drm (adev), &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
Thomas Zimmermann
maintainerRe: [PATCH v2 01/21] drm/amdgpu: Introduce GEM object functions
Hi
Am 15.09.20 um 17:05 schrieb Christian König:
Quoted 135 lines
Am 15.09.20 um 16:59 schrieb Thomas Zimmermann:
Quoted 126 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.v2:
* move object-function instance toamdgpu_gem.c(Christian)
* set callbacks inamdgpu_gem_object_create()(Christian)Signed-off-by Thomas Zimmermann <[email protected]>---
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ------ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 5 ----- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 + 4 files changed, 19 insertions(+), 16 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0
-6@@ -1505,19 +1505,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_gem.c +4
-0@@ -36,9 +36,12 @@ #include "amdgpu.h" #include "amdgpu_display.h" +#include "amdgpu_dma_buf.h" #include "amdgpu_xgmi.h" -void amdgpu_gem_object_free(struct drm_gem_object *gobj) +static const struct drm_gem_object_funcs amdgpu_gem_object_funcs; + +static void amdgpu_gem_object_free (struct drm_gem_object *gobj) { struct amdgpu_bo *robj = gem_to_amdgpu_bo(gobj);@@ -87,6 +90,7 @@ int amdgpu_gem_object_create(struct
amdgpu_device*adev, unsigned long size,
return r;
}
*obj =&bo->tbo.base;
+ (*obj)->funcs =&amdgpu_gem_object_funcs;
return 0;
}drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +0
-0@@ -119,8 +123,8 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev) * Call from drm_gem_handle_create which appear in both new and openioctl
* case.
*/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +2
-2-int amdgpu_gem_object_open (struct drm_gem_object *obj, - struct drm_file *file_priv) +static int amdgpu_gem_object_open (struct drm_gem_object *obj, + struct drm_file *file_priv){
structamdgpu_bo*abo =gem_to_amdgpu_bo(obj); structamdgpu_device*adev =amdgpu_ttm_adev(abo->tbo.bdev);drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +2
-1@@ -152,8 +156,8 @@ int amdgpu_gem_object_open(struct drm_gem_object *obj, return 0; } -void amdgpu_gem_object_close(struct drm_gem_object *obj, - struct drm_file *file_priv) +static void amdgpu_gem_object_close(struct drm_gem_object *obj, + struct drm_file *file_priv) { struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);struct
amdgpu_device*adev =amdgpu_ttm_adev(bo->tbo.bdev);drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +8
-0@@ -211,6 +215,15 @@ void amdgpu_gem_object_close(structdrm_gem_object *obj, ttm_eu_backoff_reservation(&ticket, &list); } +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, +}; + /** GEM ioctls. */
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h +0
-4@@ -33,11 +33,6 @@ #define AMDGPU_GEM_DOMAIN_MAX 0x3 #define gem_to_amdgpu_bo(gobj) container_of((gobj), struct amdgpu_bo, tbo.base) -void amdgpu_gem_object_free(struct drm_gem_object *obj); -int amdgpu_gem_object_open (struct drm_gem_object *obj, - struct drm_file *file_priv); -void amdgpu_gem_object_close (struct drm_gem_object *obj, - struct drm_file *file_priv); unsigned long amdgpu_gem_timeout(uint64_t timeout_ns); /*drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-0drivers/gpu/drm/amd/amdgpu/amdgpu_object.c static int amdgpu_bo_do_create(struct · line 565
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1
-0@@ -561,6 +561,7 @@ static int amdgpu_bo_do_create(structamdgpu_device *adev, bo = kzalloc(sizeof(struct amdgpu_bo), GFP_KERNEL); if (bo == NULL) return -ENOMEM; +The newline is not unrelated.
Quoted 4 lines
Apart from that the patch is Reviewed-by: Christian König <[email protected]>.
But I think we need some smoke testing of it.
I gave it a try on the HW/drivers that I listed in the cover letter. Appears to be working there. There was a bug reported by CI that will be fixed in the next iteration.
Best regards
Thomas
Quoted 12 lines
Christian.
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-0drm_gem_private_object_init(adev_to_drm(adev), &bo->tbo.base, size);
INIT_LIST_HEAD(&bo->shadow_list);
bo->vm_bo= NULL;_______________________________________________
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
Thomas Zimmermann
maintainerPATCH v2 2/21 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
Re: [PATCH v2 02/21] drm/armada: Introduce GEM object functions
Quoted 5 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 armada.Signed-off-by Thomas Zimmermann <[email protected]>
Thanks.
Quoted 85 lines
--- 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
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
Thomas Zimmermann
maintainerPATCH v2 3/21 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
@@ -171,7 +171,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;
@@ -561,6 +561,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) {
@@ -595,6 +611,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
Re: [PATCH v2 03/21] drm/etnaviv: Introduce GEM object functions
Quoted 80 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 etnaviv. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>--- 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 +6
-1@@ -171,7 +171,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;@@ -561,6 +561,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, +};
drivers/gpu/drm/etnaviv/etnaviv_gem.c void etnaviv_gem_obj_add(struct drm_device *dev, struct drm_gem_object *obj) · line 578
Quoted 10 lines
drivers/gpu/drm/etnaviv/etnaviv_gem.c +10
-0+ +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, +};
Quoted 15 lines
drivers/gpu/drm/etnaviv/etnaviv_gem.c +2
-0+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) {@@ -595,6 +611,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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerPATCH v2 4/21 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
Re: [PATCH v2 04/21] drm/exynos: Introduce GEM object functions
Quoted 49 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 exynos. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>--- 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 +0
-0
drivers/gpu/drm/exynos/exynos_drm_gem.c void exynos_drm_gem_destroy(struct exynos_drm_gem *exynos_gem) · line 135
Quoted 7 lines
drivers/gpu/drm/exynos/exynos_drm_gem.c +4
-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, +};
Hm moving the drm_gem_cma_vm_ops into drm_gem.h or so and maybe calling them drm_gem_simple_ops or so would remove a pile of these. But perhaps a quick follow up series.
Quoted 24 lines
drivers/gpu/drm/exynos/exynos_drm_gem.c +11
-0+ +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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerRe: [PATCH v2 04/21] drm/exynos: Introduce GEM object functions
Hi
Am 16.09.20 um 12:03 schrieb Daniel Vetter:
Quoted 53 lines · Thomas Zimmermann
Quoted 52 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 exynos. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>--- 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 +0
-0@@ -129,6 +129,19 @@ void exynos_drm_gem_destroy(struct exynos_drm_gem *exynos_gem)kfree (exynos_gem); }
Quoted 8 lines
drivers/gpu/drm/exynos/exynos_drm_gem.c void exynos_drm_gem_destroy(struct exynos_drm_gem *exynos_gem) · line 135
Quoted 4 lines
drivers/gpu/drm/exynos/exynos_drm_gem.c +4
-0+static const struct vm_operations_struct exynos_drm_gem_vm_ops = { + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +};Hm moving the
drm_gem_cma_vm_opsintodrm_gem.hor so and maybe calling themdrm_gem_simple_opsor so would remove a pile of these. But perhaps a quick follow up series.
Good idea. Several interfaces use the term 'default' in their name, so something like drm_gem_default_vm_ops seems appropriate.
BTW is there a reason why we have file operations like DEFINE_DRM_GEM_CMA_FOPS() in each module? It seems like this could also be provided by the rsp memory-manager library.
Best regards
Thomas
Quoted 28 lines
Reviewed-by Daniel Vetter <daniel.vetter-/[email protected]>Quoted 24 lines
drivers/gpu/drm/exynos/exynos_drm_gem.c +11
-0+ +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
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 v2 04/21] drm/exynos: Introduce GEM object functions
Quoted 65 lines · Thomas Zimmermann
Hi
Am 16.09.20 um 12:03 schrieb Daniel Vetter:
Quoted 53 lines · Thomas Zimmermann
Quoted 52 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 exynos. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>--- 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 +0
-0@@ -129,6 +129,19 @@ void exynos_drm_gem_destroy(struct exynos_drm_gem *exynos_gem)kfree (exynos_gem); }Quoted 8 lines
drivers/gpu/drm/exynos/exynos_drm_gem.c void exynos_drm_gem_destroy(struct exynos_drm_gem *exynos_gem) · line 135
Quoted 4 lines
drivers/gpu/drm/exynos/exynos_drm_gem.c +4
-0+static const struct vm_operations_struct exynos_drm_gem_vm_ops = { + .open = drm_gem_vm_open, + .close = drm_gem_vm_close, +};Hm moving the
drm_gem_cma_vm_opsintodrm_gem.hor so and maybe calling themdrm_gem_simple_opsor so would remove a pile of these. But perhaps a quick follow up series.
Quoted 2 lines
Good idea. Several interfaces use the term 'default' in their name, so something like
drm_gem_default_vm_opsseems appropriate.
Default sounds like a fine naming choice too.
Quoted 3 lines
BTW is there a reason why we have file operations like
DEFINE_DRM_GEM_CMA_FOPS()in each module? It seems like this could also be provided by the rsp memory-manager library.
It's for the module reference counting of the underlying file. So file_operations need this.
-Daniel
Quoted 41 lines
Best regards
ThomasQuoted 28 lines
Reviewed-by Daniel Vetter <daniel.vetter-/[email protected]>Quoted 24 lines
drivers/gpu/drm/exynos/exynos_drm_gem.c +11
-0+ +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.0Signature · 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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerPATCH v2 5/21 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
Re: [PATCH v2 05/21] drm/gma500: Introduce GEM object functions
Quoted 5 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 gma500.Signed-off-by Thomas Zimmermann <[email protected]>
Quoted 139 lines
--- 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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerPATCH v2 6/21 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.
v2:
* move object-function instance to i915_gem_object.c (Jani)
--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 21 ++++++++++++++++--- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 --- drivers/gpu/drm/i915/i915_drv.c | 4 ---- .../gpu/drm/i915/selftests/mock_gem_device.c | 3 --- 4 files changed, 18 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object.c +18 -3
@@ -39,9 +39,18 @@ static struct i915_global_object {struct kmem_cache *slab_objects; } global; +static const struct drm_gem_object_funcs i915_gem_object_funcs; +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)
@@ -101,7 +110,7 @@ void i915_gem_object_set_cache_coherency(struct drm_i915_gem_object *obj, !(obj->cache_coherent &I915_BO_CACHE_COHERENT_FOR_WRITE ); } -void i915_gem_close_object (struct drm_gem_object *gem,struct drm_file *file) +static void i915_gem_close_object (struct drm_gem_object *gem,struct drm_file *file) {struct drm_i915_gem_object *obj =to_intel_bo (gem);struct drm_i915_file_private *fpriv = file->driver_priv;
@@ -264,7 +273,7 @@ static void __i915_gem_free_work(struct work_struct *work)i915_gem_flush_free_objects (i915); } -void i915_gem_free_object (struct drm_gem_object *gem_obj) +static void i915_gem_free_object (struct drm_gem_object *gem_obj) {struct drm_i915_gem_object *obj =to_intel_bo (gem_obj);struct drm_i915_private *i915 =to_i915 (obj->base.dev);
@@ -403,6 +412,12 @@ int __init i915_global_objects_init(void)return 0 ; } +static 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, +}; +#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST )#include "selftests/huge_gem_object.c" #include "selftests/huge_pages.c"
drivers/gpu/drm/i915/gem/i915_gem_object.h +0 -3
@@ -38,9 +38,6 @@ void __i915_gem_object_release_shmem(struct drm_i915_gem_object *obj,int i915_gem_object_attach_phys (struct drm_i915_gem_object *obj,int align); -void i915_gem_close_object (struct drm_gem_object *gem,struct drm_file *file); -void i915_gem_free_object (struct drm_gem_object *obj); -void i915_gem_flush_free_objects (struct drm_i915_private *i915); struct sg_table *
drivers/gpu/drm/i915/i915_drv.c +0 -4
@@ -1750,12 +1750,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/selftests/mock_gem_device.c +0 -3
@@ -87,9 +87,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
Re: [PATCH v2 06/21] drm/i915: Introduce GEM object functions
Quoted 107 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.v2:
* move object-function instance toi915_gem_object.c(Jani)Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 21 ++++++++++++++++--- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 --- drivers/gpu/drm/i915/i915_drv.c | 4 ---- .../gpu/drm/i915/selftests/mock_gem_device.c | 3 --- 4 files changed, 18 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_object.c +18
-3@@ -39,9 +39,18 @@ static struct i915_global_object {struct kmem_cache *slab_objects; } global; +static const struct drm_gem_object_funcs i915_gem_object_funcs; +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)@@ -101,7 +110,7 @@ void i915_gem_object_set_cache_coherency(struct drm_i915_gem_object *obj, !(obj->cache_coherent &I915_BO_CACHE_COHERENT_FOR_WRITE ); } -void i915_gem_close_object (struct drm_gem_object *gem,struct drm_file *file) +static void i915_gem_close_object (struct drm_gem_object *gem,struct drm_file *file) {struct drm_i915_gem_object *obj =to_intel_bo (gem);struct drm_i915_file_private *fpriv = file->driver_priv;@@ -264,7 +273,7 @@ static void __i915_gem_free_work(struct work_struct *work)i915_gem_flush_free_objects (i915); } -void i915_gem_free_object (struct drm_gem_object *gem_obj) +static void i915_gem_free_object (struct drm_gem_object *gem_obj) {struct drm_i915_gem_object *obj =to_intel_bo (gem_obj);struct drm_i915_private *i915 =to_i915 (obj->base.dev);@@ -403,6 +412,12 @@ int __init i915_global_objects_init(void)return 0 ; } +static 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, +}; +#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST )#include "selftests/huge_gem_object.c" #include "selftests/huge_pages.c" drivers/gpu/drm/i915/gem/i915_gem_object.h +0
-3@@ -38,9 +38,6 @@ void __i915_gem_object_release_shmem(struct drm_i915_gem_object *obj,int i915_gem_object_attach_phys (struct drm_i915_gem_object *obj,int align); -void i915_gem_close_object (struct drm_gem_object *gem,struct drm_file *file); -void i915_gem_free_object (struct drm_gem_object *obj); -void i915_gem_flush_free_objects (struct drm_i915_private *i915); struct sg_table *drivers/gpu/drm/i915/i915_drv.c +0
-4@@ -1750,12 +1750,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/selftests/mock_gem_device.c +0
-0
drivers/gpu/drm/i915/selftests/mock_gem_device.c static struct drm_driver mock_driver = { · line 92
Quoted 9 lines
drivers/gpu/drm/i915/selftests/mock_gem_device.c +0
-3@@ -87,9 +87,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)
Looks obviously fine.
Regards,
Tvrtko
Thomas Zimmermann
maintainerPATCH v2 7/21 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
Re: [PATCH v2 07/21] drm/mediatek: Introduce GEM object functions
Quoted 70 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 mediatek. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>--- 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
Quoted 1 line
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerPATCH v2 8/21 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
@@ -978,12 +978,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,
@@ -1009,18 +1003,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
Re: [PATCH v2 08/21] drm/msm: Introduce GEM object funcs
Quoted 6 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 msm. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>
Quoted 101 lines
--- 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@@ -978,12 +978,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,@@ -1009,18 +1003,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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerPATCH v2 9/21 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,
@@ -186,6 +197,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
@@ -77,6 +77,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
Re: [PATCH v2 09/21] drm/nouveau: Introduce GEM object functions
Quoted 5 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 nouveau.Signed-off-by Thomas Zimmermann <[email protected]>
Hm ttm and gem mmap world still quite disjoint ... Anyway that's an entirely different thing.
Quoted 88 lines
--- 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,@@ -186,6 +197,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@@ -77,6 +77,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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerPATCH v2 10/21 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.
v2:
* make omap_gem_free_object() static (Tomi)
--- drivers/gpu/drm/omapdrm/omap_drv.c | 9 --------- drivers/gpu/drm/omapdrm/omap_gem.c | 18 ++++++++++++++++-- drivers/gpu/drm/omapdrm/omap_gem.h | 2 -- 3 files changed, 16 insertions(+), 13 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 +16 -2
@@ -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;
@@ -1089,7 +1089,7 @@ void omap_gem_describe_objects(struct list_head *list, struct seq_file *m)* Constructor & Destructor */ -void omap_gem_free_object (struct drm_gem_object *obj) +static void omap_gem_free_object (struct drm_gem_object *obj) {struct drm_device *dev = obj->dev;struct omap_drm_private *priv = dev->dev_private;
@@ -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 -2
@@ -48,7 +48,6 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm_device *dev, size_t size, struct sg_table *sgt);int omap_gem_new_handle (struct drm_device *dev,struct drm_file *file,union omap_gem_size gsize,u32 flags,u32 *handle); -void omap_gem_free_object (struct drm_gem_object *obj);void *omap_gem_vaddr (struct drm_gem_object *obj);/* Dumb Buffers Interface */
@@ -69,7 +68,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
Thomas Zimmermann
maintainerPATCH v2 11/21 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.
v2:
* use drm_gem_cma_create_object_default_funcs() (Eric)
--- drivers/gpu/drm/pl111/pl111_drv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/pl111/pl111_drv.c +1 -4
@@ -224,15 +224,12 @@ static struct drm_driver pl111_drm_driver = { .major = 1, .minor = 0, .patchlevel = 0, + .gem_create_object = drm_gem_cma_create_object_default_funcs, .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 v2 12/21 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.
v2:
* move object-function instance to radeon_gem.c (Christian)
* set callbacks in radeon_gem_object_create() (Christian)
--- drivers/gpu/drm/radeon/radeon_drv.c | 23 +-------------------- drivers/gpu/drm/radeon/radeon_gem.c | 31 +++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 26 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_gem.c +27 -4
@@ -35,7 +35,17 @@#include "radeon.h" -void radeon_gem_object_free (struct drm_gem_object *gobj) +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); + +static const struct drm_gem_object_funcs radeon_gem_object_funcs; + +static void radeon_gem_object_free (struct drm_gem_object *gobj) {struct radeon_bo *robj =gem_to_radeon_bo (gobj);
@@ -85,6 +95,7 @@ int radeon_gem_object_create(struct radeon_device *rdev, unsigned long size,return r; } *obj = &robj->tbo.base; + (*obj)->funcs = &radeon_gem_object_funcs; robj->pid =task_pid_nr (current);mutex_lock (&rdev->gem.mutex);
@@ -146,7 +157,7 @@ void radeon_gem_fini(struct radeon_device *rdev)* Call from drm_gem_handle_create which appear in both new and open ioctl * case. */ -int radeon_gem_object_open (struct drm_gem_object *obj,struct drm_file *file_priv) +static int radeon_gem_object_open (struct drm_gem_object *obj,struct drm_file *file_priv) {struct radeon_bo *rbo =gem_to_radeon_bo (obj);struct radeon_device *rdev = rbo->rdev;
@@ -176,8 +187,8 @@ int radeon_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_prireturn 0 ; } -void radeon_gem_object_close (struct drm_gem_object *obj, -struct drm_file *file_priv) +static void radeon_gem_object_close (struct drm_gem_object *obj, +struct drm_file *file_priv) {struct radeon_bo *rbo =gem_to_radeon_bo (obj);struct radeon_device *rdev = rbo->rdev;
@@ -216,6 +227,18 @@ static int radeon_gem_handle_lockup(struct radeon_device *rdev, int r)return r; } +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, +}; +/* * GEM ioctls. */
Signature · 1 line
2.28.0
Re: [PATCH v2 12/21] drm/radeon: Introduce GEM object functions
Am 15.09.20 um 16:59 schrieb Thomas Zimmermann:
Quoted 9 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.v2:
* move object-function instance toradeon_gem.c(Christian)
* set callbacks inradeon_gem_object_create()(Christian)Signed-off-by Thomas Zimmermann <[email protected]>
Quoted 130 lines
--- drivers/gpu/drm/radeon/radeon_drv.c | 23 +-------------------- drivers/gpu/drm/radeon/radeon_gem.c | 31 +++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 26 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_gem.c +20
-4@@ -35,7 +35,17 @@#include "radeon.h" -void radeon_gem_object_free (struct drm_gem_object *gobj) +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); + +static const struct drm_gem_object_funcs radeon_gem_object_funcs; + +static void radeon_gem_object_free (struct drm_gem_object *gobj) {struct radeon_bo *robj =gem_to_radeon_bo (gobj);@@ -85,6 +95,7 @@ int radeon_gem_object_create(struct radeon_device *rdev, unsigned long size,return r; } *obj = &robj->tbo.base; + (*obj)->funcs = &radeon_gem_object_funcs; robj->pid =task_pid_nr (current);mutex_lock (&rdev->gem.mutex);@@ -146,7 +157,7 @@ void radeon_gem_fini(struct radeon_device *rdev)* Call from drm_gem_handle_create which appear in both new and open ioctl * case. */ -int radeon_gem_object_open (struct drm_gem_object *obj,struct drm_file *file_priv) +static int radeon_gem_object_open (struct drm_gem_object *obj,struct drm_file *file_priv) {struct radeon_bo *rbo =gem_to_radeon_bo (obj);struct radeon_device *rdev = rbo->rdev;@@ -176,8 +187,8 @@ int radeon_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_prireturn 0 ; } -void radeon_gem_object_close (struct drm_gem_object *obj, -struct drm_file *file_priv) +static void radeon_gem_object_close (struct drm_gem_object *obj, +struct drm_file *file_priv) {struct radeon_bo *rbo =gem_to_radeon_bo (obj);struct radeon_device *rdev = rbo->rdev;@@ -216,6 +227,18 @@ static int radeon_gem_handle_lockup(struct radeon_device *rdev, int r)return r; } +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,
drivers/gpu/drm/radeon/radeon_gem.c static int radeon_gem_handle_lockup(struct radeon_device *rdev, int r) · line 244
Quoted 10 lines
drivers/gpu/drm/radeon/radeon_gem.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, +}; +/* * GEM ioctls. */
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Thomas Zimmermann
maintainerPATCH v2 13/21 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
@@ -296,6 +296,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) {
@@ -310,6 +318,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: [PATCH v2 13/21] 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 next-20200915]
[cannot apply to drm-intel/for-linux-next arm/drm-armada-devel linus/master arm/drm-armada-fixes anholt/for-next v5.9-rc5 v5.9-rc4 v5.9-rc3 v5.9-rc5] [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/20200915-230157 base: 6b02addb1d1748d21dd1261e46029b264be4e5a0 config: xtensa-allyesconfig (attached as .config) compiler: xtensa-linux-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=xtensa
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:304:13: error: 'drm_gem_cma_vm_ops' undeclared here (not in a function); did you mean 'drm_gem_mmap_obj'?
304 | .vm_ops = &drm_gem_cma_vm_ops,
| ^~~~~~~~~~~~~~~~~~
| drm_gem_mmap_obj# https://github.com/0day-ci/linux/commit/9516e471a1e5d73a108c0568243987a032c2e9e3
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157 git checkout 9516e471a1e5d73a108c0568243987a032c2e9e3
vim +304 drivers/gpu/drm/rockchip/rockchip_drm_gem.c
298
299 static const struct drm_gem_object_funcs rockchip_gem_object_funcs = {
300 .free = rockchip_gem_free_object,
301 .get_sg_table = rockchip_gem_prime_get_sg_table,
302 .vmap = rockchip_gem_prime_vmap,
303 .vunmap = rockchip_gem_prime_vunmap,
> 304 .vm_ops = &drm_gem_cma_vm_ops,
305 };
306
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH v2 13/21] drm/rockchip: Convert to drm_gem_object_funcs
In reply to Thomas ZimmermannQuoted 6 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 rockchip. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>
Quoted 56 lines
--- 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@@ -296,6 +296,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) {@@ -310,6 +318,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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerPATCH v2 14/21 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
Re: [PATCH v2 14/21] drm/tegra: Introduce GEM object functions
Quoted 9 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 tegra.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/tegra/drm.c | 4 ---- drivers/gpu/drm/tegra/gem.c | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-)
_______________________________________________
Freedreno mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Thomas Zimmermann
maintainerPATCH v2 15/21 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
@@ -799,7 +799,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 v2 16/21 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);
@@ -401,12 +405,20 @@ static int vgem_prime_mmap(struct drm_gem_object *obj,return 0 ; } +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 , .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,
@@ -415,13 +427,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
Re: [PATCH v2 16/21] drm/vgem: Introduce GEM object functions
Hi Thomas,
Quoted 6 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 vgem. The only exception isgem_prime_mmap, which is non-trivial to convert.Signed-off-by Thomas Zimmermann <[email protected]>
Thanks here again.
This drv file is little tumultuous to me.
I mean, I took a while to sort functions in my head.
However, finally, I got it, and the change looks good.
Quoted 70 lines
--- 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);@@ -401,12 +405,20 @@ static int vgem_prime_mmap(struct drm_gem_object *obj,return 0 ; } +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 , .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,@@ -415,13 +427,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 · 6 lines
2.28.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 17/21 drm/virtgpu: Set PRIME export function in struct drm_gem_object_funcs
In reply to Thomas ZimmermannGEM object functions deprecate several similar callback interfaces in struct drm_driver. This patch replaces virtgpu's per-driver PRIME export function with a per-object function.
--- drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - drivers/gpu/drm/virtio/virtgpu_object.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/virtio/virtgpu_drv.c +0 -1
@@ -203,7 +203,6 @@ static struct drm_driver driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_mmap = drm_gem_prime_mmap, - .gem_prime_export = virtgpu_gem_prime_export, .gem_prime_import = virtgpu_gem_prime_import, .gem_prime_import_sg_table = virtgpu_gem_prime_import_sg_table,
drivers/gpu/drm/virtio/virtgpu_object.c +1 -0
@@ -108,6 +108,7 @@ static const struct drm_gem_object_funcs virtio_gpu_shmem_funcs = { .close = virtio_gpu_gem_object_close, .print_info = drm_gem_shmem_print_info, + .export = virtgpu_gem_prime_export, .pin = drm_gem_shmem_pin, .unpin = drm_gem_shmem_unpin, .get_sg_table = drm_gem_shmem_get_sg_table,
Signature · 1 line
2.28.0
Re: [PATCH v2 17/21] drm/virtgpu: Set PRIME export function in struct drm_gem_object_funcs
Quoted 5 lines · Thomas Zimmermann
GEM object functions deprecate several similar callback interfaces in struct
drm_driver. This patch replaces virtgpu's per-driver PRIME export function with a per-object function.Signed-off-by Thomas Zimmermann <[email protected]>
Quoted 32 lines
--- drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - drivers/gpu/drm/virtio/virtgpu_object.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/virtio/virtgpu_drv.c +0
-1@@ -203,7 +203,6 @@ static struct drm_driver driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_mmap = drm_gem_prime_mmap, - .gem_prime_export = virtgpu_gem_prime_export, .gem_prime_import = virtgpu_gem_prime_import, .gem_prime_import_sg_table = virtgpu_gem_prime_import_sg_table,drivers/gpu/drm/virtio/virtgpu_object.c +1
-0@@ -108,6 +108,7 @@ static const struct drm_gem_object_funcs virtio_gpu_shmem_funcs = { .close = virtio_gpu_gem_object_close, .print_info = drm_gem_shmem_print_info, + .export = virtgpu_gem_prime_export, .pin = drm_gem_shmem_pin, .unpin = drm_gem_shmem_unpin, .get_sg_table = drm_gem_shmem_get_sg_table,Signature · 1 line
2.28.0
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerPATCH v2 18/21 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);
@@ -98,8 +92,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
Re: [PATCH v2 18/21] drm/vkms: Introduce GEM object functions
Hi Thomas,
Quoted 5 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 vkms.Signed-off-by Thomas Zimmermann <[email protected]>
Thanks! Looks fine.
Quoted 69 lines
--- 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);@@ -98,8 +92,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 · 6 lines
2.28.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 19/21 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.
v2:
* convert xen_drm_drv_free_object_unlocked() to static callback (Oleksandr)
--- drivers/gpu/drm/xen/xen_drm_front.c | 44 ++++++++++--------------- drivers/gpu/drm/xen/xen_drm_front.h | 2 ++ drivers/gpu/drm/xen/xen_drm_front_gem.c | 15 +++++++++ 3 files changed, 34 insertions(+), 27 deletions(-)
drivers/gpu/drm/xen/xen_drm_front.c +17 -27
@@ -381,6 +381,23 @@ void xen_drm_front_on_frame_done(struct xen_drm_front_info *front_info, fb_cookie); } +void xen_drm_front_gem_object_free (struct drm_gem_object *obj) +{ +struct xen_drm_front_drm_info *drm_info = obj->dev->dev_private; +int idx; + +if (drm_dev_enter (obj->dev, &idx)) { +xen_drm_front_dbuf_destroy (drm_info->front_info, +xen_drm_front_dbuf_to_cookie (obj)); +drm_dev_exit (idx); + }else { +dbuf_free (&drm_info->front_info->dbuf_list, +xen_drm_front_dbuf_to_cookie (obj)); + } + +xen_drm_front_gem_free_object_unlocked (obj); +} +static int xen_drm_drv_dumb_create (struct drm_file *filp,struct drm_device *dev,struct drm_mode_create_dumb *args)
@@ -435,23 +452,6 @@ 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) -{ -struct xen_drm_front_drm_info *drm_info = obj->dev->dev_private; -int idx; - -if (drm_dev_enter (obj->dev, &idx)) { -xen_drm_front_dbuf_destroy (drm_info->front_info, -xen_drm_front_dbuf_to_cookie (obj)); -drm_dev_exit (idx); - }else { -dbuf_free (&drm_info->front_info->dbuf_list, -xen_drm_front_dbuf_to_cookie (obj)); - } - -xen_drm_front_gem_free_object_unlocked (obj); -} -static void xen_drm_drv_release (struct drm_device *dev) {struct xen_drm_front_drm_info *drm_info = dev->dev_private;
@@ -483,22 +483,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_front_gem_object_free (struct drm_gem_object *obj); +#endif /* __XEN_DRM_FRONT_H_ */
drivers/gpu/drm/xen/xen_drm_front_gem.c +15 -0
@@ -57,6 +57,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_front_gem_object_free, + .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) {
@@ -67,6 +80,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
Thomas Zimmermann
maintainerPATCH v2 20/21 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.
v2:
* initialize with DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE (Laurent)
--- 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_WITH_DUMB_CREATE (zynqmp_dpsub_dumb_create), .fops = &zynqmp_dpsub_drm_fops,
Signature · 1 line
2.28.0
Re: [PATCH v2 20/21] drm/xlnx: Initialize DRM driver instance with CMA helper macro
Hi Thomas,
Thank you for the patch.
Quoted 5 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.
Quoted 7 lines
Two callbacks, .dumb_destroy and .gem_prime_import, were initialized to their default implementations, so they are just kept empty now.
v2:
* initialize withDRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(Laurent)Signed-off-by Thomas Zimmermann <[email protected]>
Quoted 29 lines
--- 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_WITH_DUMB_CREATE (zynqmp_dpsub_dumb_create), .fops = &zynqmp_dpsub_drm_fops,
Signature · 3 lines
Regards, Laurent Pinchart
Hyun Kwon
Reviewed-byRe: [PATCH v2 20/21] drm/xlnx: Initialize DRM driver instance with CMA helper macro
Hi Tomas,
Thanks for the patch.
Quoted 13 lines · Laurent Pinchart
Hi Thomas,
Thank you for the patch.
Quoted 8 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.
Quoted 7 lines
Quoted 4 lines
v2:
* initialize withDRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(Laurent)Signed-off-by Thomas Zimmermann <[email protected]>Reviewed-by Laurent Pinchart <[email protected]>
Thanks,
-hyun
Quoted 38 lines
Quoted 29 lines
--- 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_WITH_DUMB_CREATE (zynqmp_dpsub_dumb_create), .fops = &zynqmp_dpsub_drm_fops,Signature · 7 lines
Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 21/21 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.
v2:
* update related TODO item (Sam)
--- Documentation/gpu/todo.rst | 7 +-- 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 ++-------------------------- 5 files changed, 25 insertions(+), 125 deletions(-)
Documentation/gpu/todo.rst +2 -5
@@ -289,11 +289,8 @@ 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. +DRM driver struct. This is now the preferred way. Callbacks in drivers have been +converted, except for struct drm_driver.gem_prime_mmap. Level: Intermediate
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
kernel test robot
build botRe: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
I love your patch! Yet something to improve:
Hi Thomas,
I love your patch! Yet something to improve:
[auto build test ERROR on next-20200915]
[cannot apply to drm-intel/for-linux-next arm/drm-armada-devel linus/master arm/drm-armada-fixes anholt/for-next v5.9-rc5 v5.9-rc4 v5.9-rc3 v5.9-rc5] [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/20200915-230157 base: 6b02addb1d1748d21dd1261e46029b264be4e5a0 config: arm64-randconfig-r015-20200916 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 9e3842d60351f986d77dfe0a94f76e4fd895f188)
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
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All error/warnings (new ones prefixed by >>):
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:31:3: error: field designator 'gem_free_object_unlocked' does not refer to any field in type 'struct drm_driver'
.gem_free_object_unlocked = drm_gem_cma_free_object,
^
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:32:3: error: field designator 'gem_vm_ops' does not refer to any field in type 'struct drm_driver'
.gem_vm_ops = &drm_gem_cma_vm_ops,
^
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:38:3: error: field designator 'gem_prime_export' does not refer to any field in type 'struct drm_driver'; did you mean 'gem_prime_import'?
.gem_prime_export = drm_gem_prime_export,
^~~~~~~~~~~~~~~~
gem_prime_import
include/drm/drm_drv.h:370:28: note: 'gem_prime_import' declared here
struct drm_gem_object * (*gem_prime_import)(struct drm_device *dev,
^
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:38:22: error: incompatible function pointer types initializing 'struct drm_gem_object *(*)(struct drm_device *, struct dma_buf *)' with an expression of type 'struct dma_buf *(struct drm_gem_object *, int)' [-Werror,-Wincompatible-function-pointer-types]
.gem_prime_export = drm_gem_prime_export,
^~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:38:22: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
.gem_prime_export = drm_gem_prime_export,
^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:37:22: note: previous initialization is here
.gem_prime_import = drm_gem_prime_import,
^~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:39:3: error: field designator 'gem_prime_get_sg_table' does not refer to any field in type 'struct drm_driver'; did you mean 'gem_prime_import_sg_table'?
.gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
^~~~~~~~~~~~~~~~~~~~~~
gem_prime_import_sg_table
include/drm/drm_drv.h:378:27: note: 'gem_prime_import_sg_table' declared here
struct drm_gem_object *(*gem_prime_import_sg_table)(
^
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:39:28: error: incompatible function pointer types initializing 'struct drm_gem_object *(*)(struct drm_device *, struct dma_buf_attachment *, struct sg_table *)' with an expression of type 'struct sg_table *(struct drm_gem_object *)' [-Werror,-Wincompatible-function-pointer-types]
.gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:40:31: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
.gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:39:28: note: previous initialization is here
.gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:41:3: error: field designator 'gem_prime_vmap' does not refer to any field in type 'struct drm_driver'; did you mean 'gem_prime_mmap'?
.gem_prime_vmap = drm_gem_cma_prime_vmap,
^~~~~~~~~~~~~~
gem_prime_mmap
include/drm/drm_drv.h:391:8: note: 'gem_prime_mmap' declared here
int (*gem_prime_mmap)(struct drm_gem_object *obj,
^
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: error: incompatible function pointer types initializing 'int (*)(struct drm_gem_object *, struct vm_area_struct *)' with an expression of type 'void *(struct drm_gem_object *)' [-Werror,-Wincompatible-function-pointer-types]
.gem_prime_vmap = drm_gem_cma_prime_vmap,
^~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:42:3: error: field designator 'gem_prime_vunmap' does not refer to any field in type 'struct drm_driver'; did you mean 'gem_prime_mmap'? .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
^~~~~~~~~~~~~~~~
gem_prime_mmap
include/drm/drm_drv.h:391:8: note: 'gem_prime_mmap' declared here
int (*gem_prime_mmap)(struct drm_gem_object *obj,
^
drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: error: incompatible function pointer types initializing 'int (*)(struct drm_gem_object *, struct vm_area_struct *)' with an expression of type 'void (struct drm_gem_object *, void *)' [-Werror,-Wincompatible-function-pointer-types]
.gem_prime_vunmap = drm_gem_cma_prime_vunmap,
^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
.gem_prime_vunmap = drm_gem_cma_prime_vunmap,
^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: note: previous initialization is here
.gem_prime_vmap = drm_gem_cma_prime_vmap,
^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:43:21: warning: initializer overrides prior initialization of this subobject [-Winitializer-overrides]
.gem_prime_mmap = drm_gem_cma_prime_mmap,
^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: note: previous initialization is here
.gem_prime_vunmap = drm_gem_cma_prime_vunmap,
^~~~~~~~~~~~~~~~~~~~~~~~
4 warnings and 10 errors generated.
# https://github.com/0day-ci/linux/commit/84300c9d089d60d5dc528a7bd6e2870090201f0e
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157 git checkout 84300c9d089d60d5dc528a7bd6e2870090201f0e
vim +31 drivers/gpu/drm/imx/dcss/dcss-kms.c
9021c317b77024f Laurentiu Palcu 2020-07-31 28
9021c317b77024f Laurentiu Palcu 2020-07-31 29 static struct drm_driver dcss_kms_driver = {
9021c317b77024f Laurentiu Palcu 2020-07-31 30 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
9021c317b77024f Laurentiu Palcu 2020-07-31 @31 .gem_free_object_unlocked = drm_gem_cma_free_object,
9021c317b77024f Laurentiu Palcu 2020-07-31 @32 .gem_vm_ops = &drm_gem_cma_vm_ops,
9021c317b77024f Laurentiu Palcu 2020-07-31 33 .dumb_create = drm_gem_cma_dumb_create,
9021c317b77024f Laurentiu Palcu 2020-07-31 34
9021c317b77024f Laurentiu Palcu 2020-07-31 35 .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
9021c317b77024f Laurentiu Palcu 2020-07-31 36 .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
9021c317b77024f Laurentiu Palcu 2020-07-31 37 .gem_prime_import = drm_gem_prime_import,
9021c317b77024f Laurentiu Palcu 2020-07-31 @38 .gem_prime_export = drm_gem_prime_export,
9021c317b77024f Laurentiu Palcu 2020-07-31 @39 .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
9021c317b77024f Laurentiu Palcu 2020-07-31 40 .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
9021c317b77024f Laurentiu Palcu 2020-07-31 @41 .gem_prime_vmap = drm_gem_cma_prime_vmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 @42 .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 43 .gem_prime_mmap = drm_gem_cma_prime_mmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 44 .fops = &dcss_cma_fops,
9021c317b77024f Laurentiu Palcu 2020-07-31 45 .name = "imx-dcss",
9021c317b77024f Laurentiu Palcu 2020-07-31 46 .desc = "i.MX8MQ Display Subsystem",
9021c317b77024f Laurentiu Palcu 2020-07-31 47 .date = "20190917",
9021c317b77024f Laurentiu Palcu 2020-07-31 48 .major = 1,
9021c317b77024f Laurentiu Palcu 2020-07-31 49 .minor = 0,
9021c317b77024f Laurentiu Palcu 2020-07-31 50 .patchlevel = 0,
9021c317b77024f Laurentiu Palcu 2020-07-31 51 };9021c317b77024f Laurentiu Palcu 2020-07-31 52
---
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: [PATCH v2 21/21] 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 next-20200915]
[cannot apply to drm-intel/for-linux-next arm/drm-armada-devel linus/master arm/drm-armada-fixes anholt/for-next v5.9-rc5 v5.9-rc4 v5.9-rc3 v5.9-rc5] [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/20200915-230157 base: 6b02addb1d1748d21dd1261e46029b264be4e5a0 config: arm64-allyesconfig (attached as .config) compiler: aarch64-linux-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=arm64
If you fix the issue, kindly add following tag as appropriate
All error/warnings (new ones prefixed by >>):
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:31:3: error: 'struct drm_driver' has no member named 'gem_free_object_unlocked'
31 | .gem_free_object_unlocked = drm_gem_cma_free_object,
| ^~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:31:30: error: initialization of 'const struct drm_ioctl_desc *' from incompatible pointer type 'void (*)(struct drm_gem_object *)' [-Werror=incompatible-pointer-types]
31 | .gem_free_object_unlocked = drm_gem_cma_free_object,
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:31:30: note: (near initialization for 'dcss_kms_driver.ioctls')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:32:3: error: 'struct drm_driver' has no member named 'gem_vm_ops'
32 | .gem_vm_ops = &drm_gem_cma_vm_ops,
| ^~~~~~~~~~
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:32:17: warning: initialization of 'int' from 'const struct vm_operations_struct *' makes integer from pointer without a cast [-Wint-conversion]
32 | .gem_vm_ops = &drm_gem_cma_vm_ops,
| ^
drivers/gpu/drm/imx/dcss/dcss-kms.c:32:17: note: (near initialization for 'dcss_kms_driver.num_ioctls')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:32:17: error: initializer element is not computable at load time
drivers/gpu/drm/imx/dcss/dcss-kms.c:32:17: note: (near initialization for 'dcss_kms_driver.num_ioctls')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:38:3: error: 'struct drm_driver' has no member named 'gem_prime_export'; did you mean 'gem_prime_import'?
38 | .gem_prime_export = drm_gem_prime_export,
| ^~~~~~~~~~~~~~~~
| gem_prime_import
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:38:22: error: initialization of 'struct drm_gem_object * (*)(struct drm_device *, struct dma_buf_attachment *, struct sg_table *)' from incompatible pointer type 'struct dma_buf * (*)(struct drm_gem_object *, int)' [-Werror=incompatible-pointer-types]
38 | .gem_prime_export = drm_gem_prime_export,
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:38:22: note: (near initialization for 'dcss_kms_driver.gem_prime_import_sg_table')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:39:3: error: 'struct drm_driver' has no member named 'gem_prime_get_sg_table'; did you mean 'gem_prime_import_sg_table'?
39 | .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
| ^~~~~~~~~~~~~~~~~~~~~~
| gem_prime_import_sg_table
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:39:28: error: initialization of 'int (*)(struct drm_gem_object *, struct vm_area_struct *)' from incompatible pointer type 'struct sg_table * (*)(struct drm_gem_object *)' [-Werror=incompatible-pointer-types]
39 | .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:39:28: note: (near initialization for 'dcss_kms_driver.gem_prime_mmap')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:40:31: warning: initialized field overwritten [-Woverride-init]
40 | .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:40:31: note: (near initialization for 'dcss_kms_driver.gem_prime_import_sg_table')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:41:3: error: 'struct drm_driver' has no member named 'gem_prime_vmap'; did you mean 'gem_prime_mmap'?
41 | .gem_prime_vmap = drm_gem_cma_prime_vmap,
| ^~~~~~~~~~~~~~
| gem_prime_mmap
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: error: initialization of 'int (*)(struct drm_gem_object *, struct vm_area_struct *)' from incompatible pointer type 'void * (*)(struct drm_gem_object *)' [-Werror=incompatible-pointer-types]
41 | .gem_prime_vmap = drm_gem_cma_prime_vmap,
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: note: (near initialization for 'dcss_kms_driver.gem_prime_mmap')
drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: warning: initialized field overwritten [-Woverride-init]
drivers/gpu/drm/imx/dcss/dcss-kms.c:41:21: note: (near initialization for 'dcss_kms_driver.gem_prime_mmap')
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:42:3: error: 'struct drm_driver' has no member named 'gem_prime_vunmap'; did you mean 'gem_prime_mmap'?
42 | .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
| ^~~~~~~~~~~~~~~~
| gem_prime_mmap
>> drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: error: initialization of 'int (*)(struct drm_file *, struct drm_device *, struct drm_mode_create_dumb *)' from incompatible pointer type 'void (*)(struct drm_gem_object *, void *)' [-Werror=incompatible-pointer-types] 42 | .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: note: (near initialization for 'dcss_kms_driver.dumb_create') drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: warning: initialized field overwritten [-Woverride-init] drivers/gpu/drm/imx/dcss/dcss-kms.c:42:22: note: (near initialization for 'dcss_kms_driver.dumb_create') drivers/gpu/drm/imx/dcss/dcss-kms.c:43:21: warning: initialized field overwritten [-Woverride-init]
43 | .gem_prime_mmap = drm_gem_cma_prime_mmap,
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imx/dcss/dcss-kms.c:43:21: note: (near initialization for 'dcss_kms_driver.gem_prime_mmap')
cc1: some warnings being treated as errors
# https://github.com/0day-ci/linux/commit/84300c9d089d60d5dc528a7bd6e2870090201f0e
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157 git checkout 84300c9d089d60d5dc528a7bd6e2870090201f0e
vim +31 drivers/gpu/drm/imx/dcss/dcss-kms.c
9021c317b77024f Laurentiu Palcu 2020-07-31 28
9021c317b77024f Laurentiu Palcu 2020-07-31 29 static struct drm_driver dcss_kms_driver = {
9021c317b77024f Laurentiu Palcu 2020-07-31 30 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
9021c317b77024f Laurentiu Palcu 2020-07-31 @31 .gem_free_object_unlocked = drm_gem_cma_free_object,
9021c317b77024f Laurentiu Palcu 2020-07-31 @32 .gem_vm_ops = &drm_gem_cma_vm_ops,
9021c317b77024f Laurentiu Palcu 2020-07-31 33 .dumb_create = drm_gem_cma_dumb_create,
9021c317b77024f Laurentiu Palcu 2020-07-31 34
9021c317b77024f Laurentiu Palcu 2020-07-31 35 .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
9021c317b77024f Laurentiu Palcu 2020-07-31 36 .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
9021c317b77024f Laurentiu Palcu 2020-07-31 37 .gem_prime_import = drm_gem_prime_import,
9021c317b77024f Laurentiu Palcu 2020-07-31 @38 .gem_prime_export = drm_gem_prime_export,
9021c317b77024f Laurentiu Palcu 2020-07-31 @39 .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
9021c317b77024f Laurentiu Palcu 2020-07-31 @40 .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
9021c317b77024f Laurentiu Palcu 2020-07-31 @41 .gem_prime_vmap = drm_gem_cma_prime_vmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 @42 .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 43 .gem_prime_mmap = drm_gem_cma_prime_mmap,
9021c317b77024f Laurentiu Palcu 2020-07-31 44 .fops = &dcss_cma_fops,
9021c317b77024f Laurentiu Palcu 2020-07-31 45 .name = "imx-dcss",
9021c317b77024f Laurentiu Palcu 2020-07-31 46 .desc = "i.MX8MQ Display Subsystem",
9021c317b77024f Laurentiu Palcu 2020-07-31 47 .date = "20190917",
9021c317b77024f Laurentiu Palcu 2020-07-31 48 .major = 1,
9021c317b77024f Laurentiu Palcu 2020-07-31 49 .minor = 0,
9021c317b77024f Laurentiu Palcu 2020-07-31 50 .patchlevel = 0,
9021c317b77024f Laurentiu Palcu 2020-07-31 51 };9021c317b77024f Laurentiu Palcu 2020-07-31 52
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
In reply to Thomas ZimmermannQuoted 8 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.
What is also gone is
gem_vm_opsin structdrm_driver. All drivers now use struct drm_gem_object_funcs.vm_ops instead.
Quoted 7 lines
While at it, the patch also improves error handling around calls to .free and .get_sg_table callbacks.
v2:
* update related TODO item (Sam)Signed-off-by Thomas Zimmermann <[email protected]>
Nice work!
Quoted 366 lines
--- Documentation/gpu/todo.rst | 7 +-- 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 ++-------------------------- 5 files changed, 25 insertions(+), 125 deletions(-)Documentation/gpu/todo.rst +2
-5@@ -289,11 +289,8 @@ 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. +DRM driver struct. This is now the preferred way. Callbacks in drivers have been +converted, except for struct drm_driver.gem_prime_mmap. Level: Intermediatedrivers/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 @@ -326,32 +328,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 * @@ -360,6 +336,7 @@ struct drm_driver {*/ struct drm_gem_object *(*gem_create_object)(struct drm_device *dev,size_t size); +/** * @prime_handle_to_fd: * @@ -382,14 +359,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: * @@ -399,29 +369,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: * @@ -432,22 +379,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: * @@ -522,14 +453,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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Thomas Zimmermann
maintainerRe: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
In reply to Thomas ZimmermannAm 15.09.20 um 16:59 schrieb Thomas Zimmermann:
Quoted 194 lines
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.
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.
v2:
* update related TODO item (Sam)Signed-off-by Thomas Zimmermann <[email protected]>--- Documentation/gpu/todo.rst | 7 +-- 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 ++-------------------------- 5 files changed, 25 insertions(+), 125 deletions(-)Documentation/gpu/todo.rst +2
-5@@ -289,11 +289,8 @@ 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. +DRM driver struct. This is now the preferred way. Callbacks in drivers have been +converted, except for struct drm_driver.gem_prime_mmap. Level: Intermediatedrivers/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 +0
-0
drivers/gpu/drm/drm_prime.c static struct dma_buf *export_and_register_object(struct drm_device *dev, · line 393
Quoted 8 lines
drivers/gpu/drm/drm_prime.c +0
-4@@ -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);
Oops, these two lines were not supposed to be removed. They'll return in v3 of the patchset. That will also fix the error report that was posted by the CI. [1]
Best regards
Thomas
Quoted 178 lines
drivers/gpu/drm/drm_prime.c +0
-0if (IS_ERR (dmabuf)) {/* normally the created dma-buf takes ownership of the ref, drivers/gpu/drm/drm_prime.c +8
-5* 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 @@ -326,32 +328,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 * @@ -360,6 +336,7 @@ struct drm_driver {*/ struct drm_gem_object *(*gem_create_object)(struct drm_device *dev,size_t size); +/** * @prime_handle_to_fd: * @@ -382,14 +359,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: * @@ -399,29 +369,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: * @@ -432,22 +379,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: * @@ -522,14 +453,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 · 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
Re: [PATCH v2 21/21] drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver
In reply to Thomas ZimmermannHi Thomas,
url: https://github.com/0day-ci/linux/commits/Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157 base: 6b02addb1d1748d21dd1261e46029b264be4e5a0 config: i386-randconfig-m021-20200917 (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'.
# https://github.com/0day-ci/linux/commit/84300c9d089d60d5dc528a7bd6e2870090201f0e
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Zimmermann/Convert-all-remaining-drivers-to-GEM-object-functions/20200915-230157 git checkout 84300c9d089d60d5dc528a7bd6e2870090201f0e
vim +/dmabuf +389 drivers/gpu/drm/drm_prime.c
319c933c71f3db Daniel Vetter 2013-08-15 375 static struct dma_buf *export_and_register_object(struct drm_device *dev,
319c933c71f3db Daniel Vetter 2013-08-15 376 struct drm_gem_object *obj,
319c933c71f3db Daniel Vetter 2013-08-15 377 uint32_t flags)
319c933c71f3db Daniel Vetter 2013-08-15 378 {
319c933c71f3db Daniel Vetter 2013-08-15 379 struct dma_buf *dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 380
319c933c71f3db Daniel Vetter 2013-08-15 381 /* prevent races with concurrent gem_close. */
319c933c71f3db Daniel Vetter 2013-08-15 382 if (obj->handle_count == 0) {
319c933c71f3db Daniel Vetter 2013-08-15 383 dmabuf = ERR_PTR(-ENOENT);
319c933c71f3db Daniel Vetter 2013-08-15 384 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 385 }
319c933c71f3db Daniel Vetter 2013-08-15 386
b39b5394fabc79 Noralf Trønnes 2018-11-10 387 if (obj->funcs && obj->funcs->export)
b39b5394fabc79 Noralf Trønnes 2018-11-10 388 dmabuf = obj->funcs->export(obj, flags);dmabuf is not initialized on else path.
319c933c71f3db Daniel Vetter 2013-08-15 @389 if (IS_ERR(dmabuf)) {
^^^^^^^^^^^^^^
319c933c71f3db Daniel Vetter 2013-08-15 390 /* normally the created dma-buf takes ownership of the ref,
319c933c71f3db Daniel Vetter 2013-08-15 391 * but if that fails then drop the ref
319c933c71f3db Daniel Vetter 2013-08-15 392 */
319c933c71f3db Daniel Vetter 2013-08-15 393 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 394 }
319c933c71f3db Daniel Vetter 2013-08-15 395
319c933c71f3db Daniel Vetter 2013-08-15 396 /*
319c933c71f3db Daniel Vetter 2013-08-15 397 * Note that callers do not need to clean up the export cache
319c933c71f3db Daniel Vetter 2013-08-15 398 * since the check for obj->handle_count guarantees that someone
319c933c71f3db Daniel Vetter 2013-08-15 399 * will clean it up.
319c933c71f3db Daniel Vetter 2013-08-15 400 */
319c933c71f3db Daniel Vetter 2013-08-15 401 obj->dma_buf = dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 402 get_dma_buf(obj->dma_buf);
319c933c71f3db Daniel Vetter 2013-08-15 403
319c933c71f3db Daniel Vetter 2013-08-15 404 return dmabuf;
319c933c71f3db Daniel Vetter 2013-08-15 405 }---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Christian König
maintainerAdded my rb to the amdgpu and radeon patches.
Should we pick those up through the amd branches or do you want to push everything to drm-misc-next?
I think the later since this should result in much merge clash.
Christian.
Am 15.09.20 um 16:59 schrieb Thomas Zimmermann:
Quoted 118 lines
The GEM and PRIME related callbacks in struct
drm_driverare deprecated in favor of GEM object functions in structdrm_gem_object_funcs. This patchset converts the remaining drivers to object functions and removes most of the obsolete interfaces.Patches #1 to #16 and #18 to #19 convert DRM drivers to GEM object functions, one by one. Each patch moves existing callbacks from struct
drm_driverto an instance of structdrm_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 #17 fixes virtgpu to use GEM object functions where possible. The driver recently introduced a function for one of the deprecated callbacks.
Patch #20 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_driverand in the DRM core/helpers is being removed by patch #21.Further testing is welcome. I tested the drivers for which I have HW available. These are gma500, i915, nouveau, radeon and vc4. The console, Weston and Xorg apparently work with the patches applied.
v2:
* moved code in amdgpu and radeon
* made several functions static in various drivers
* updated TODO-list item
* fix virtgpuThomas Zimmermann (21):
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 todrm_gem_object_funcs
drm/tegra: Introduce GEM object functions
drm/vc4: Introduce GEM object functions
drm/vgem: Introduce GEM object functions
drm/virtgpu: Set PRIME export function in structdrm_gem_object_funcsdrm/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 structdrm_driverDocumentation/gpu/todo.rst | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 -- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 5 -- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 + 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 | 21 ++++- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 - drivers/gpu/drm/i915/i915_drv.c | 4 - .../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 | 18 +++- drivers/gpu/drm/omapdrm/omap_gem.h | 2 - drivers/gpu/drm/pl111/pl111_drv.c | 5 +- drivers/gpu/drm/radeon/radeon_drv.c | 23 +---- drivers/gpu/drm/radeon/radeon_gem.c | 31 ++++++- 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/virtio/virtgpu_drv.c | 1 - drivers/gpu/drm/virtio/virtgpu_object.c | 1 + drivers/gpu/drm/vkms/vkms_drv.c | 8 -- drivers/gpu/drm/vkms/vkms_gem.c | 13 +++ drivers/gpu/drm/xen/xen_drm_front.c | 44 ++++------ 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 +------------------ 57 files changed, 319 insertions(+), 349 deletions(-)--
2.28.0
Thomas Zimmermann
maintainerHi
Am 15.09.20 um 17:25 schrieb Christian König:
Quoted 6 lines
Added my rb to the amdgpu and radeon patches.
Should we pick those up through the amd branches or do you want to push everything to drm-misc-next?
I think the later since this should result in much merge clash.
Yes, preferable, I'd merge it all through drm-misc.
Best regards
Thomas
Quoted 133 lines
Christian.
Am 15.09.20 um 16:59 schrieb Thomas Zimmermann:
Quoted 128 lines
The GEM and PRIME related callbacks in struct
drm_driverare deprecated in
favor of GEM object functions in structdrm_gem_object_funcs. This patchset
converts the remaining drivers to object functions and removes most of the
obsolete interfaces.Patches #1 to #16 and #18 to #19 convert DRM drivers to GEM object functions,
one by one. Each patch moves existing callbacks from structdrm_driverto an
instance of structdrm_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 #17 fixes virtgpu to use GEM object functions where possible. The driver recently introduced a function for one of the deprecated callbacks.
Patch #20 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 structdrm_driverand in the DRM core/helpers is being removed by patch
#21.Further testing is welcome. I tested the drivers for which I have HW available. These are gma500, i915, nouveau, radeon and vc4. The console, Weston and Xorg apparently work with the patches applied.
v2:
* moved code in amdgpu and radeon
* made several functions static in various drivers
* updated TODO-list item
* fix virtgpuThomas Zimmermann (21):
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 todrm_gem_object_funcs
drm/tegra: Introduce GEM object functions
drm/vc4: Introduce GEM object functions
drm/vgem: Introduce GEM object functions
drm/virtgpu: Set PRIME export function in structdrm_gem_object_funcsdrm/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 structdrm_driverDocumentation/gpu/todo.rst | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 -- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 5 -- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 + 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 | 21 ++++- drivers/gpu/drm/i915/gem/i915_gem_object.h | 3 - drivers/gpu/drm/i915/i915_drv.c | 4 - .../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 | 18 +++- drivers/gpu/drm/omapdrm/omap_gem.h | 2 -drivers/gpu/drm/pl111/pl111_drv.c | 5 +- drivers/gpu/drm/radeon/radeon_drv.c | 23 +---- drivers/gpu/drm/radeon/radeon_gem.c | 31 ++++++- 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/virtio/virtgpu_drv.c | 1 - drivers/gpu/drm/virtio/virtgpu_object.c | 1 + drivers/gpu/drm/vkms/vkms_drv.c | 8 -- drivers/gpu/drm/vkms/vkms_gem.c | 13 +++ drivers/gpu/drm/xen/xen_drm_front.c | 44 ++++------ 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 +------------------
57 files changed, 319 insertions(+), 349 deletions(-)Signature · 1 line
2.28.0
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
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Convert all remaining drivers to GEM object functions (rev2)
In reply to Thomas Zimmermann== Series Details ==
== Series Details ==
Series: Convert all remaining drivers to GEM object functions (rev2)
URL : https://patchwork.freedesktop.org/series/80593/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 3975f25bdb58 drm/amdgpu: Introduce GEM object functions c6ad3a511161 drm/armada: Introduce GEM object functions c8098f5d6e95 drm/etnaviv: Introduce GEM object functions a81e48db00e5 drm/exynos: Introduce GEM object functions 53210f7f0722 drm/gma500: Introduce GEM object functions dbfefd13964e drm/i915: Introduce GEM object functions ba32f8dd23b5 drm/mediatek: Introduce GEM object functions 504106e74ccc drm/msm: Introduce GEM object funcs 324848fd8dc0 drm/nouveau: Introduce GEM object functions a37cb8db61ac drm/omapdrm: Introduce GEM object functions a40c13d7fe1c drm/pl111: Introduce GEM object functions 8cfbfcdfaf7b drm/radeon: Introduce GEM object functions -:97: WARNING:AVOID_EXTERNS: externs should be avoided in .c files #97: FILE: drivers/gpu/drm/radeon/radeon_gem.c:41: +int radeon_gem_prime_pin(struct drm_gem_object *obj);
-:98: WARNING:AVOID_EXTERNS: externs should be avoided in .c files #98: FILE: drivers/gpu/drm/radeon/radeon_gem.c:42:
+void radeon_gem_prime_unpin(struct drm_gem_object *obj);
-:100: WARNING:AVOID_EXTERNS: externs should be avoided in .c files #100: FILE: drivers/gpu/drm/radeon/radeon_gem.c:44:
+void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
total: 0 errors, 3 warnings, 0 checks, 118 lines checked
376266125805 drm/rockchip: Convert to drm_gem_object_funcs 4b77e1b2c5a8 drm/tegra: Introduce GEM object functionscd6d5c4922a9 drm/vc4: Introduce GEM object functions716d7874560f drm/vgem: Introduce GEM object functions8bbc5ccb9b19 drm/virtgpu: Set PRIME export function in struct drm_gem_object_funcs ac18c0a1f4e6 drm/vkms: Introduce GEM object functions0e96620ce337 drm/xen: Introduce GEM object functions308dcf21fda5 drm/xlnx: Initialize DRM driver instance with CMA helper macro cab017216e88 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.SPARSE: warning for Convert all remaining drivers to GEM object functions (rev2)
In reply to Thomas Zimmermann== Series Details ==
== Series Details ==
Series: Convert all remaining drivers to GEM object functions (rev2)
URL : https://patchwork.freedesktop.org/series/80593/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1019:47: expected unsigned int [addressable] [usertype] ulClockParams +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1019:47: got restricted __le32 [usertype] +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1019:47: warning: incorrect type in assignment (different base types) +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1028:50: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1029:49: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:1037:47: warning: too many warnings +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:184:44: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:283:14: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:320:14: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:323:14: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:326:14: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:329:18: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:330:26: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:338:30: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:340:38: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:342:30: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:346:30: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:348:30: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:353:33: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:367:43: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:369:38: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:374:67: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:375:53: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:378:66: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:389:80: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:395:57: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:402:69: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:403:53: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:406:66: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:414:66: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:423:69: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:424:69: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:473:30: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:476:45: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:477:45: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:484:54: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:52:28: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:531:35: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:53:29: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:533:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:54:26: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:55:27: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:56:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:57:26: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:577:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:581:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:58:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:583:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:586:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:590:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:59:26: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:598:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:600:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:617:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:621:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:623:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:630:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:632:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:644:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:648:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:650:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:657:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:659:21: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:662:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:664:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:676:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:688:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:691:47: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:697:25: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:796:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:797:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:800:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:801:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:804:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:805:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:812:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:813:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:816:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:817:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:820:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:821:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:828:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:829:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:832:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:833:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:836:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:837:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:844:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:845:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:848:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:849:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:852:46: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:853:40: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:916:47: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:918:49: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:920:52: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:934:47: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:936:49: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:938:52: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:956:47: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:958:49: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c:960:52: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:328:34: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:365:34: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:395:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:397:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:404:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:418:40: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:441:40: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:44:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:482:53: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:486:33: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:489:61: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:490:64: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:492:54: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:518:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:521:21: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:64:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:80:17: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:80:17: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:80:17: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:85:30: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:86:24: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c:98:39: warning: cast to restricted __le16 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:222:29: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:226:37: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:226:37: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:226:37: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:227:37: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:233:43: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:236:44: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:239:51: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:458:41: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:458:41: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:458:41: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:464:39: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:465:30: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:466:39: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c:468:24: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:140:26: expected unsigned long long [usertype] *chunk_array_user +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:140:26: got void [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:140:26: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:141:41: expected void const [noderef] __user *from +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:141:41: got unsigned long long [usertype] *chunk_array_user +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:141:41: warning: incorrect type in argument 2 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:160:27: expected struct drm_amdgpu_cs_chunk [noderef] __user **chunk_ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:160:27: got void [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:160:27: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:161:49: expected void const [noderef] __user *from +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:161:49: got struct drm_amdgpu_cs_chunk [noderef] __user **chunk_ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:161:49: warning: incorrect type in argument 2 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1624:21: expected struct drm_amdgpu_fence *fences_user +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1624:21: got void [noderef] __user * +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1624:21: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1625:36: expected void const [noderef] __user *from +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1625:36: got struct drm_amdgpu_fence *fences_user +drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c:1625:36: warning: incorrect type in argument 2 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1364:25: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1364:25: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1364:25: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1365:17: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1365:17: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1365:17: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1424:17: error: incompatible types in comparison expression (different address spaces): +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1424:17: struct dma_fence * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:1424:17: struct dma_fence [noderef] __rcu * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:143:17: expected restricted __poll_t ( *poll )( ... ) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:143:17: got unsigned int ( * )( ... ) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:143:17: warning: incorrect type in initializer (different base types) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: expected void const volatile [noderef] __user *ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:266:29: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:268:29: expected void const volatile [noderef] __user *ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:268:29: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:268:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:268:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:268:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:268:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:268:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:268:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:268:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:268:29: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:268:29: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: expected void const volatile [noderef] __user *ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:359:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:417:21: expected void const volatile [noderef] __user *ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:417:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:417:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:417:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:417:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:417:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:417:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:417:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:417:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:417:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:417:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: expected void const volatile [noderef] __user *ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:478:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:536:21: expected void const volatile [noderef] __user *ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:536:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:536:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:536:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:536:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:536:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:536:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:536:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:536:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:536:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:536:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: expected void const volatile [noderef] __user *ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:597:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:655:21: expected void const volatile [noderef] __user *ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:655:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:655:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:655:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:655:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:655:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:655:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:655:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:655:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:655:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:655:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:752:21: expected void const volatile [noderef] __user *ptr +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:752:21: got unsigned int [usertype] * +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:752:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:752:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:752:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:752:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:752:21: warning: cast removes address space '__user' of expression +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:752:21: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c:752:21: warning: too many warnings +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1697:65: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1705:55: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1706:50: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1707:50: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1708:56: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1710:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1711:45: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1712:51: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1713:55: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1714:57: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1716:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1717:53: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1719:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1721:25: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1722:46: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1726:73: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1728:33: warning: cast to restricted __le32 +drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:1730:33: warning: cast to restricted __l
_______________________________________________
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 (rev2)
In reply to Thomas Zimmermann== Series Details ==
== Series Details ==
Series: Convert all remaining drivers to GEM object functions (rev2)
URL : https://patchwork.freedesktop.org/series/80593/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9012 -> Patchwork_18503
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18503 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18503, 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_18503/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18503:
### 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_9012/fi-blb-e6850/igt@gem_exec_fence@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/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_9012/fi-pnv-d510/igt@gem_exec_fence@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/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_9012/fi-ivb-3770/igt@gem_exec_fence@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/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_9012/fi-elk-e7500/igt@gem_exec_fence@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/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_9012/fi-ilk-650/igt@gem_exec_fence@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/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_9012/fi-byt-j1900/igt@gem_exec_fence@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/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_9012/fi-hsw-4770/igt@gem_exec_fence@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-hsw-4770/igt@gem_exec_fence@[email protected]
- fi-icl-u2: [PASS][15] -> [DMESG-WARN][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-icl-u2/igt@gem_exec_fence@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-icl-u2/igt@gem_exec_fence@[email protected]
- fi-cml-u2: [PASS][17] -> [DMESG-WARN][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-cml-u2/igt@gem_exec_fence@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-cml-u2/igt@gem_exec_fence@[email protected]
- fi-skl-6700k2: [PASS][19] -> [DMESG-WARN][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-skl-6700k2/igt@gem_exec_fence@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-skl-6700k2/igt@gem_exec_fence@[email protected]
- fi-cfl-8700k: [PASS][21] -> [DMESG-WARN][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-cfl-8700k/igt@gem_exec_fence@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-cfl-8700k/igt@gem_exec_fence@[email protected]
- fi-tgl-u2: [PASS][23] -> [DMESG-WARN][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-tgl-u2/igt@gem_exec_fence@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-tgl-u2/igt@gem_exec_fence@[email protected]
- fi-bsw-n3050: [PASS][25] -> [DMESG-WARN][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-bsw-n3050/igt@gem_exec_fence@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-bsw-n3050/igt@gem_exec_fence@[email protected]
- fi-skl-lmem: [PASS][27] -> [DMESG-WARN][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-skl-lmem/igt@gem_exec_fence@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-skl-lmem/igt@gem_exec_fence@[email protected]
- fi-kbl-soraka: [PASS][29] -> [DMESG-WARN][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-kbl-soraka/igt@gem_exec_fence@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-kbl-soraka/igt@gem_exec_fence@[email protected]
- fi-cml-s: [PASS][31] -> [DMESG-WARN][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-cml-s/igt@gem_exec_fence@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-cml-s/igt@gem_exec_fence@[email protected]
- fi-kbl-x1275: [PASS][33] -> [DMESG-WARN][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-kbl-x1275/igt@gem_exec_fence@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-kbl-x1275/igt@gem_exec_fence@[email protected]
- fi-cfl-guc: [PASS][35] -> [DMESG-WARN][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-cfl-guc/igt@gem_exec_fence@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-cfl-guc/igt@gem_exec_fence@[email protected]
- fi-tgl-y: [PASS][37] -> [DMESG-WARN][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-tgl-y/igt@gem_exec_fence@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-tgl-y/igt@gem_exec_fence@[email protected]
- fi-bsw-kefka: [PASS][39] -> [DMESG-WARN][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-bsw-kefka/igt@gem_exec_fence@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-bsw-kefka/igt@gem_exec_fence@[email protected]
- fi-glk-dsi: [PASS][41] -> [DMESG-WARN][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-glk-dsi/igt@gem_exec_fence@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-glk-dsi/igt@gem_exec_fence@[email protected]
- fi-kbl-r: [PASS][43] -> [DMESG-WARN][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-kbl-r/igt@gem_exec_fence@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-kbl-r/igt@gem_exec_fence@[email protected]
- fi-cfl-8109u: [PASS][45] -> [DMESG-WARN][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-cfl-8109u/igt@gem_exec_fence@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-cfl-8109u/igt@gem_exec_fence@[email protected]
- fi-icl-y: [PASS][47] -> [DMESG-WARN][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-icl-y/igt@gem_exec_fence@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-icl-y/igt@gem_exec_fence@[email protected]
- fi-kbl-guc: [PASS][49] -> [DMESG-WARN][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-kbl-guc/igt@gem_exec_fence@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-kbl-guc/igt@gem_exec_fence@[email protected]
- fi-bsw-nick: [PASS][51] -> [DMESG-WARN][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-bsw-nick/igt@gem_exec_fence@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-bsw-nick/igt@gem_exec_fence@[email protected]
- fi-bdw-gvtdvm: [PASS][53] -> [DMESG-WARN][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-bdw-gvtdvm/igt@gem_exec_fence@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-bdw-gvtdvm/igt@gem_exec_fence@[email protected]
- fi-bdw-5557u: [PASS][55] -> [DMESG-WARN][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-bdw-5557u/igt@gem_exec_fence@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-bdw-5557u/igt@gem_exec_fence@[email protected]
- fi-kbl-7500u: [PASS][57] -> [DMESG-WARN][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-kbl-7500u/igt@gem_exec_fence@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-kbl-7500u/igt@gem_exec_fence@[email protected]
- fi-skl-6600u: [PASS][59] -> [DMESG-WARN][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-skl-6600u/igt@gem_exec_fence@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-skl-6600u/igt@gem_exec_fence@[email protected]
- fi-skl-guc: [PASS][61] -> [DMESG-WARN][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-skl-guc/igt@gem_exec_fence@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-skl-guc/igt@gem_exec_fence@[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][63] -> [DMESG-WARN][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-ehl-1/igt@gem_exec_fence@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-ehl-1/igt@gem_exec_fence@[email protected]
- {fi-tgl-dsi}: [PASS][65] -> [DMESG-WARN][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-tgl-dsi/igt@gem_exec_fence@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-tgl-dsi/igt@gem_exec_fence@[email protected]
- {fi-kbl-7560u}: [PASS][67] -> [DMESG-WARN][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-kbl-7560u/igt@gem_exec_fence@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-kbl-7560u/igt@gem_exec_fence@[email protected]
Known issues
------------
Here are the changes found in Patchwork_18503 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fence@basic-busy@vecs0:
- fi-apl-guc: [PASS][69] -> [DMESG-WARN][70] ([i915#1635])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-apl-guc/igt@gem_exec_fence@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-apl-guc/igt@gem_exec_fence@[email protected]
- fi-bxt-dsi: [PASS][71] -> [DMESG-WARN][72] ([i915#1635])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-bxt-dsi/igt@gem_exec_fence@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-bxt-dsi/igt@gem_exec_fence@[email protected]
#### Warnings ####
* igt@debugfs_test@read_all_entries:
- fi-kbl-x1275: [DMESG-WARN][73] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][74] ([i915#62] / [i915#92])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-kbl-x1275/igt@debugfs_test@read_all_entries.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-kbl-x1275/igt@debugfs_test@read_all_entries.html
* igt@runner@aborted:
- fi-tgl-u2: [FAIL][75] ([i915#2045] / [i915#2439]) -> [FAIL][76] ([i915#2439])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9012/fi-tgl-u2/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/fi-tgl-u2/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#2045]: https://gitlab.freedesktop.org/drm/intel/issues/2045
[i915#2439]: https://gitlab.freedesktop.org/drm/intel/issues/2439
[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 (47 -> 40)
------------------------------
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_9012 -> Patchwork_18503
CI-20190529: 20190529
CI_DRM_9012: c6d96868b6c7dca0492e5e46382ea323aaf46fd9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5785: ee01acab0b6cee7be5cc4278e5d7527ec3e358ba @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18503: cab017216e88ef64bba31798f888a68b1aab88dc @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
cab017216e88 drm: Remove obsolete GEM and PRIME callbacks from struct drm_driver 308dcf21fda5 drm/xlnx: Initialize DRM driver instance with CMA helper macro 0e96620ce337 drm/xen: Introduce GEM object functionsac18c0a1f4e6 drm/vkms: Introduce GEM object functions8bbc5ccb9b19 drm/virtgpu: Set PRIME export function in struct drm_gem_object_funcs 716d7874560f drm/vgem: Introduce GEM object functionscd6d5c4922a9 drm/vc4: Introduce GEM object functions4b77e1b2c5a8 drm/tegra: Introduce GEM object functions
376266125805 drm/rockchip: Convert to drm_gem_object_funcs 8cfbfcdfaf7b drm/radeon: Introduce GEM object functionsa40c13d7fe1c drm/pl111: Introduce GEM object functionsa37cb8db61ac drm/omapdrm: Introduce GEM object functions324848fd8dc0 drm/nouveau: Introduce GEM object functions504106e74ccc drm/msm: Introduce GEM object funcsba32f8dd23b5 drm/mediatek: Introduce GEM object functions dbfefd13964e drm/i915: Introduce GEM object functions53210f7f0722 drm/gma500: Introduce GEM object functionsa81e48db00e5 drm/exynos: Introduce GEM object functionsc8098f5d6e95 drm/etnaviv: Introduce GEM object functionsc6ad3a511161 drm/armada: Introduce GEM object functions3975f25bdb58 drm/amdgpu: Introduce GEM object functions
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18503/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx