@@ -758,7 +758,7 @@ void drm_send_event(struct drm_device *dev, struct drm_pending_event *e)
EXPORT_SYMBOL(drm_send_event);
/**
- * mock_drm_getfile - Create a new struct file for the drm device
+ * drm_minor_create_anonfile - Create a new struct file for the drm device
* @minor: drm minor to wrap (e.g. #drm_device.primary)
* @flags: file creation mode (O_RDWR etc)
*
@@ -771,7 +771,8 @@ EXPORT_SYMBOL(drm_send_event);
* RETURNS:
* Pointer to newly created struct file, ERR_PTR on failure.
*/
-struct file *mock_drm_getfile(struct drm_minor *minor, unsigned int flags)
+struct file *
+drm_minor_create_anonfile(struct drm_minor *minor, unsigned int flags)
{
struct drm_device *dev = minor->dev;
struct drm_file *priv;
@@ -795,4 +796,4 @@ struct file *mock_drm_getfile(struct drm_minor *minor, unsigned int flags)
return file;
}
-EXPORT_SYMBOL_FOR_TESTS_ONLY(mock_drm_getfile);
+EXPORT_SYMBOL(drm_minor_create_anonfile);
@@ -19,7 +19,7 @@ unsigned long igt_mmap_node(struct drm_i915_private *i915,
int err;
/* Pretend to open("/dev/dri/card0") */
- file = mock_drm_getfile(i915->drm.primary, O_RDWR);
+ file = drm_minor_create_anonfile(i915->drm.primary, O_RDWR);
if (IS_ERR(file))
return PTR_ERR(file);
@@ -34,7 +34,7 @@ struct file;
static inline struct file *mock_file(struct drm_i915_private *i915)
{
- return mock_drm_getfile(i915->drm.primary, O_RDWR);
+ return drm_minor_create_anonfile(i915->drm.primary, O_RDWR);
}
static inline struct drm_file *to_drm_file(struct file *f)
@@ -388,6 +388,7 @@ void drm_event_cancel_free(struct drm_device *dev,
void drm_send_event_locked(struct drm_device *dev, struct drm_pending_event *e);
void drm_send_event(struct drm_device *dev, struct drm_pending_event *e);
-struct file *mock_drm_getfile(struct drm_minor *minor, unsigned int flags);
+struct file *drm_minor_create_anonfile(struct drm_minor *minor,
+ unsigned int flags);
#endif /* _DRM_FILE_H_ */
Export the routine for creating an anonymous file for wrapping the drm_device. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/drm_file.c | 7 ++++--- drivers/gpu/drm/i915/selftests/igt_mmap.c | 2 +- drivers/gpu/drm/i915/selftests/mock_drm.h | 2 +- include/drm/drm_file.h | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-)