drm/armada: 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 armada. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Christian König <christian.koenig@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200923102159.24084-3-tzimmermann@suse.de
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user