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
3232 #define to_drm_gem_cma_obj(gem_obj) \
3333 container_of(gem_obj, struct drm_gem_cma_object, base)
3434
35−/* free GEM object */
36−void drm_gem_cma_free_object(struct drm_gem_object *gem_obj);
37−
38−/* allocate physical memory */
3935 struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm,
4036 size_t size);
37+void drm_gem_cma_free(struct drm_gem_cma_object *cma_obj);
38+void drm_gem_cma_print_info(const struct drm_gem_cma_object *cma_obj,
39+ struct drm_printer *p, unsigned int indent);
40+struct sg_table *drm_gem_cma_get_sg_table(struct drm_gem_cma_object *cma_obj);
41+int drm_gem_cma_vmap(struct drm_gem_cma_object *cma_obj, struct dma_buf_map *map);
42+int drm_gem_cma_mmap(struct drm_gem_cma_object *cma_obj, struct vm_area_struct *vma);
4143
4244 extern const struct vm_operations_struct drm_gem_cma_vm_ops;
4345
44−void drm_gem_cma_print_info(struct drm_printer *p, unsigned int indent,
45− const struct drm_gem_object *obj);
46−
47−struct sg_table *drm_gem_cma_get_sg_table(struct drm_gem_object *obj);
48−int drm_gem_cma_vmap(struct drm_gem_object *obj, struct dma_buf_map *map);
49−int drm_gem_cma_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
50−
5146 /*
5247 * GEM object functions
5348 */
5449
5550 /**
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()
5752 * @obj: GEM object to free
5853 *
5954 * 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
6156 */
6257 static inline void drm_gem_cma_object_free(struct drm_gem_object *obj)
6358 {
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);
6562 }
6663
6764 /**
@@ -76,7 +73,9 @@ static inline void drm_gem_cma_object_free(struct drm_gem_object *obj) · 8 unmodified lines
7673 static inline void drm_gem_cma_object_print_info(struct drm_printer *p, unsigned int indent,
7774 const struct drm_gem_object *obj)
7875 {
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);
8079 }
8180
8281 /**
@@ -91,7 +90,9 @@ static inline void drm_gem_cma_object_print_info(struct drm_printer *p, unsigned · 8 unmodified lines
9190 */
9291 static inline struct sg_table *drm_gem_cma_object_get_sg_table(struct drm_gem_object *obj)
9392 {
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);
9596 }
9697
9798 /*
@@ -107,7 +108,9 @@ static inline struct sg_table *drm_gem_cma_object_get_sg_table(struct drm_gem_ob · 9 unmodified lines
107108 */
108109 static inline int drm_gem_cma_object_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)
109110 {
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);
111114 }
112115
113116 /**
@@ -123,7 +126,9 @@ static inline int drm_gem_cma_object_vmap(struct drm_gem_object *obj, struct dma · 9 unmodified lines
123126 */
124127 static inline int drm_gem_cma_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
125128 {
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);
127132 }
128133
129134 /*

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