History

drm/cma-helper: Pass GEM CMA object in public interfaces

Change all GEM CMA object functions that receive a GEM object of type struct drm_gem_object to expect an object of type struct drm_gem_cma_object instead. This change reduces the number of upcasts from struct drm_gem_object by moving them into callers. The C compiler can now verify that the GEM CMA functions are called with the correct type. For consistency, the patch also renames drm_gem_cma_free_object to drm_gem_cma_free. It further updates documentation for a number of functions.

Thomas Zimmermann committed 5 years ago

Commit e580ea21 parent 05b1de53 files · +48 −47Browse files

Showing the changes to include (1 of 3 files). Show all

Unified · Split

include/drm/drm_gem_cma_helper.h+22−17
@@ -32,28 +32,23 @@ struct drm_gem_cma_object { · 31 unmodified lines
32#define to_drm_gem_cma_obj(gem_obj) \32#define to_drm_gem_cma_obj(gem_obj) \
33 container_of(gem_obj, struct drm_gem_cma_object, base)33 container_of(gem_obj, struct drm_gem_cma_object, base)
34 34
35/* free GEM object */
36void drm_gem_cma_free_object(struct drm_gem_object *gem_obj);
37
38/* allocate physical memory */
39struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm,35struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm,
40 size_t size);36 size_t size);
37void drm_gem_cma_free(struct drm_gem_cma_object *cma_obj);
38void drm_gem_cma_print_info(const struct drm_gem_cma_object *cma_obj,
39 struct drm_printer *p, unsigned int indent);
40struct sg_table *drm_gem_cma_get_sg_table(struct drm_gem_cma_object *cma_obj);
41int drm_gem_cma_vmap(struct drm_gem_cma_object *cma_obj, struct dma_buf_map *map);
42int drm_gem_cma_mmap(struct drm_gem_cma_object *cma_obj, struct vm_area_struct *vma);
41 43
42extern const struct vm_operations_struct drm_gem_cma_vm_ops;44extern const struct vm_operations_struct drm_gem_cma_vm_ops;
43 45
44void drm_gem_cma_print_info(struct drm_printer *p, unsigned int indent,
45 const struct drm_gem_object *obj);
46
47struct sg_table *drm_gem_cma_get_sg_table(struct drm_gem_object *obj);
48int drm_gem_cma_vmap(struct drm_gem_object *obj, struct dma_buf_map *map);
49int drm_gem_cma_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
50
51/*46/*
52 * GEM object functions47 * GEM object functions
53 */48 */
54 49
55/**50/**
56 * drm_gem_cma_object_free - GEM object function for drm_gem_cma_free_object()51 * drm_gem_cma_object_free - GEM object function for drm_gem_cma_free()
57 * @obj: GEM object to free52 * @obj: GEM object to free
58 *53 *
59 * This function wraps drm_gem_cma_free_object(). Drivers that employ the CMA helpers54 * This function wraps drm_gem_cma_free_object(). Drivers that employ the CMA helpers
@@ -61,7 +56,9 @@ int drm_gem_cma_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); · 1 unmodified line
61 */56 */
62static inline void drm_gem_cma_object_free(struct drm_gem_object *obj)57static inline void drm_gem_cma_object_free(struct drm_gem_object *obj)
63{58{
64 drm_gem_cma_free_object(obj);59 struct drm_gem_cma_object *cma_obj = to_drm_gem_cma_obj(obj);
60
61 drm_gem_cma_free(cma_obj);
65}62}
66 63
67/**64/**
@@ -76,7 +73,9 @@ static inline void drm_gem_cma_object_free(struct drm_gem_object *obj) · 8 unmodified lines
76static inline void drm_gem_cma_object_print_info(struct drm_printer *p, unsigned int indent,73static inline void drm_gem_cma_object_print_info(struct drm_printer *p, unsigned int indent,
77 const struct drm_gem_object *obj)74 const struct drm_gem_object *obj)
78{75{
79 drm_gem_cma_print_info(p, indent, obj);76 const struct drm_gem_cma_object *cma_obj = to_drm_gem_cma_obj(obj);
77
78 drm_gem_cma_print_info(cma_obj, p, indent);
80}79}
81 80
82/**81/**
@@ -91,7 +90,9 @@ static inline void drm_gem_cma_object_print_info(struct drm_printer *p, unsigned · 8 unmodified lines
91 */90 */
92static inline struct sg_table *drm_gem_cma_object_get_sg_table(struct drm_gem_object *obj)91static inline struct sg_table *drm_gem_cma_object_get_sg_table(struct drm_gem_object *obj)
93{92{
94 return drm_gem_cma_get_sg_table(obj);93 struct drm_gem_cma_object *cma_obj = to_drm_gem_cma_obj(obj);
94
95 return drm_gem_cma_get_sg_table(cma_obj);
95}96}
96 97
97/*98/*
@@ -107,7 +108,9 @@ static inline struct sg_table *drm_gem_cma_object_get_sg_table(struct drm_gem_ob · 9 unmodified lines
107 */108 */
108static inline int drm_gem_cma_object_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)109static inline int drm_gem_cma_object_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)
109{110{
110 return drm_gem_cma_vmap(obj, map);111 struct drm_gem_cma_object *cma_obj = to_drm_gem_cma_obj(obj);
112
113 return drm_gem_cma_vmap(cma_obj, map);
111}114}
112 115
113/**116/**
@@ -123,7 +126,9 @@ static inline int drm_gem_cma_object_vmap(struct drm_gem_object *obj, struct dma · 9 unmodified lines
123 */126 */
124static inline int drm_gem_cma_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)127static inline int drm_gem_cma_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
125{128{
126 return drm_gem_cma_mmap(obj, vma);129 struct drm_gem_cma_object *cma_obj = to_drm_gem_cma_obj(obj);
130
131 return drm_gem_cma_mmap(cma_obj, vma);
127}132}
128 133
129/*134/*

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t