aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-01-25 01:26:54 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-01-26 04:46:00 -0500
commit0683c0ab1640229cea9e47e75c33cfb192c6aca8 (patch)
tree02986b13fb3d163f86d42319e14639db2458d693
parent9b5dd047eb5662e55b881be077df235217456372 (diff)
drm/moc: Mark legacy fields in drm_driver as such
No point in documenting these, they only confuse. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170125062657.19270-13-daniel.vetter@ffwll.ch
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c1
-rw-r--r--include/drm/drm_drv.h13
2 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 8cb937b2bfcc..567bc93baeb5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -679,7 +679,6 @@ static struct drm_driver kms_driver = {
679 DRIVER_USE_AGP | 679 DRIVER_USE_AGP |
680 DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | 680 DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
681 DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET, 681 DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET,
682 .dev_priv_size = 0,
683 .load = amdgpu_driver_load_kms, 682 .load = amdgpu_driver_load_kms,
684 .open = amdgpu_driver_open_kms, 683 .open = amdgpu_driver_open_kms,
685 .preclose = amdgpu_driver_preclose_kms, 684 .preclose = amdgpu_driver_preclose_kms,
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index 8391135b95f2..732e85652d1e 100644
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -81,7 +81,6 @@ struct drm_driver {
81 * Zero on success, non-zero value on failure. 81 * Zero on success, non-zero value on failure.
82 */ 82 */
83 int (*load) (struct drm_device *, unsigned long flags); 83 int (*load) (struct drm_device *, unsigned long flags);
84 int (*firstopen) (struct drm_device *);
85 int (*open) (struct drm_device *, struct drm_file *); 84 int (*open) (struct drm_device *, struct drm_file *);
86 void (*preclose) (struct drm_device *, struct drm_file *file_priv); 85 void (*preclose) (struct drm_device *, struct drm_file *file_priv);
87 void (*postclose) (struct drm_device *, struct drm_file *); 86 void (*postclose) (struct drm_device *, struct drm_file *);
@@ -103,9 +102,6 @@ struct drm_driver {
103 * 102 *
104 */ 103 */
105 void (*unload) (struct drm_device *); 104 void (*unload) (struct drm_device *);
106 int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
107 int (*dma_quiescent) (struct drm_device *);
108 int (*context_dtor) (struct drm_device *dev, int context);
109 int (*set_busid)(struct drm_device *dev, struct drm_master *master); 105 int (*set_busid)(struct drm_device *dev, struct drm_master *master);
110 106
111 /** 107 /**
@@ -413,13 +409,20 @@ struct drm_driver {
413 char *date; 409 char *date;
414 410
415 u32 driver_features; 411 u32 driver_features;
416 int dev_priv_size;
417 const struct drm_ioctl_desc *ioctls; 412 const struct drm_ioctl_desc *ioctls;
418 int num_ioctls; 413 int num_ioctls;
419 const struct file_operations *fops; 414 const struct file_operations *fops;
420 415
416 /* Everything below here is for legacy driver, never use! */
417 /* private: */
418
421 /* List of devices hanging off this driver with stealth attach. */ 419 /* List of devices hanging off this driver with stealth attach. */
422 struct list_head legacy_dev_list; 420 struct list_head legacy_dev_list;
421 int (*firstopen) (struct drm_device *);
422 int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
423 int (*dma_quiescent) (struct drm_device *);
424 int (*context_dtor) (struct drm_device *dev, int context);
425 int dev_priv_size;
423}; 426};
424 427
425extern __printf(6, 7) 428extern __printf(6, 7)