diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-08-23 16:53:25 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-08-29 19:38:12 -0400 |
commit | 23ddc0243d7313942b94f1a2e44e6394f7bb996e (patch) | |
tree | 33519710bd456a48fb8f7a7e572618d5ddc8471b | |
parent | be72ae26b11478c00c64858c86b647b438791671 (diff) |
drm: kill dma_ready callbacks
Not used by any driver. So drop it.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/drm_lock.c | 3 | ||||
-rw-r--r-- | include/drm/drmP.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 609f2d504f72..d9146f240d33 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c | |||
@@ -124,9 +124,6 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) | |||
124 | block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask); | 124 | block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask); |
125 | } | 125 | } |
126 | 126 | ||
127 | if (dev->driver->dma_ready && (lock->flags & _DRM_LOCK_READY)) | ||
128 | dev->driver->dma_ready(dev); | ||
129 | |||
130 | if (dev->driver->dma_quiescent && (lock->flags & _DRM_LOCK_QUIESCENT)) | 127 | if (dev->driver->dma_quiescent && (lock->flags & _DRM_LOCK_QUIESCENT)) |
131 | { | 128 | { |
132 | if (dev->driver->dma_quiescent(dev)) { | 129 | if (dev->driver->dma_quiescent(dev)) { |
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 0d7af3f39652..d5a2b8869246 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -699,7 +699,6 @@ struct drm_driver { | |||
699 | int (*suspend) (struct drm_device *, pm_message_t state); | 699 | int (*suspend) (struct drm_device *, pm_message_t state); |
700 | int (*resume) (struct drm_device *); | 700 | int (*resume) (struct drm_device *); |
701 | int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv); | 701 | int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv); |
702 | void (*dma_ready) (struct drm_device *); | ||
703 | int (*dma_quiescent) (struct drm_device *); | 702 | int (*dma_quiescent) (struct drm_device *); |
704 | int (*context_ctor) (struct drm_device *dev, int context); | 703 | int (*context_ctor) (struct drm_device *dev, int context); |
705 | int (*context_dtor) (struct drm_device *dev, int context); | 704 | int (*context_dtor) (struct drm_device *dev, int context); |