Skip to content

Commit

Permalink
drm/vkms: Introduce GEM object functions
Browse files Browse the repository at this point in the history
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 <tzimmermann@suse.de>
Reviewed-by: Melissa Wen <melissa.srw@gmail.com>
Acked-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200923102159.24084-20-tzimmermann@suse.de
  • Loading branch information
Thomas Zimmermann committed Sep 25, 2020
1 parent c6069a0 commit b76b85b
Showing 2 changed files with 13 additions and 8 deletions.
8 changes: 0 additions & 8 deletions drivers/gpu/drm/vkms/vkms_drv.c
Original file line number Diff line number Diff line change
@@ -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,

13 changes: 13 additions & 0 deletions drivers/gpu/drm/vkms/vkms_gem.c
Original file line number Diff line number Diff line change
@@ -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) {

0 comments on commit b76b85b

Please sign in to comment.