Commit b76b85b7 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/vkms: 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 vkms.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarMelissa Wen <melissa.srw@gmail.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200923102159.24084-20-tzimmermann@suse.de
parent c6069a02

drivers/gpu/drm/vkms/vkms_drv.c

+0 −8
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE