summaryrefslogtreecommitdiff
path: root/include/drm
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-08-29 14:12:30 +0400
committerDave Airlie <airlied@redhat.com>2014-09-10 11:39:50 +0400
commit71d39483de474d9513e23d9e21af7483684f4745 (patch)
tree8fef51a2ace8d9f7971f53b2e50a996c7a0f37b0 /include/drm
parent03decbe57ac6c9e632f7cde0f7d0a54bbcaf8464 (diff)
downloadlinux-71d39483de474d9513e23d9e21af7483684f4745.tar.xz
drm: move "struct drm_magic_entry" to drm_auth.c
In drm_release(), we currently call drm_remove_magic() if the drm_file has a drm-magic attached. Therefore, once drm_master_release() is called, the magic-list _must_ be empty. By dropping the no-op cleanup, we can move "struct drm_magic_entry" to drm_auth.c and avoid exposing it to all of DRM. Signed-off-by: David Herrmann <dh.herrmann@gmail.com> Reviewed-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drmP.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 11c357534581..0fdd813821cd 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -290,12 +290,6 @@ struct drm_ioctl_desc {
#define DRM_IOCTL_DEF_DRV(ioctl, _func, _flags) \
[DRM_IOCTL_NR(DRM_##ioctl)] = {.cmd = DRM_##ioctl, .func = _func, .flags = _flags, .cmd_drv = DRM_IOCTL_##ioctl, .name = #ioctl}
-struct drm_magic_entry {
- struct list_head head;
- struct drm_hash_item hash_item;
- struct drm_file *priv;
-};
-
/**
* DMA buffer.
*/