summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@tungstengraphics.com>2008-11-12 18:40:04 +0100
committerJakob Bornecrantz <jakob@tungstengraphics.com>2008-11-12 18:40:04 +0100
commit1ead45c8f02e7c51cfe977383726d20479385688 (patch)
tree70adf739fa7dc10653b266dc542fb65e0ee82086 /linux-core
parent13948c635d83285909e25ffd5285165789a598b2 (diff)
mode: Remove hotplug support from ioctl interface
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_crtc.c10
-rw-r--r--linux-core/drm_drv.c2
-rw-r--r--linux-core/drm_irq.c52
3 files changed, 0 insertions, 64 deletions
diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c
index bc385dce..255cc8c2 100644
--- a/linux-core/drm_crtc.c
+++ b/linux-core/drm_crtc.c
@@ -844,16 +844,6 @@ void drm_mode_config_cleanup(struct drm_device *dev)
}
EXPORT_SYMBOL(drm_mode_config_cleanup);
-int drm_mode_hotplug_ioctl(struct drm_device *dev,
- void *data, struct drm_file *file_priv)
-{
- struct drm_mode_hotplug *arg = data;
-
- arg->counter = dev->mode_config.hotplug_counter;
-
- return 0;
-}
-
/**
* drm_crtc_convert_to_umode - convert a drm_display_mode into a modeinfo
* @out: drm_mode_modeinfo struct to return to the user
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 11044bff..a8b17f1d 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -138,8 +138,6 @@ static struct drm_ioctl_desc drm_ioctls[] = {
DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_mode_attachmode_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_mode_detachmode_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl, DRM_MASTER | DRM_CONTROL_ALLOW),
- DRM_IOCTL_DEF(DRM_IOCTL_MODE_HOTPLUG, drm_mode_hotplug_ioctl, DRM_CONTROL_ALLOW),
- DRM_IOCTL_DEF(DRM_IOCTL_WAIT_HOTPLUG, drm_wait_hotplug, 0),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_REPLACEFB, drm_mode_replacefb, DRM_MASTER|DRM_ROOT_ONLY|DRM_CONTROL_ALLOW),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETENCODER, drm_mode_getencoder, DRM_MASTER|DRM_CONTROL_ALLOW),
diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c
index b317d863..103f3e2b 100644
--- a/linux-core/drm_irq.c
+++ b/linux-core/drm_irq.c
@@ -192,58 +192,6 @@ err:
}
EXPORT_SYMBOL(drm_vblank_init);
-int drm_wait_hotplug(struct drm_device *dev, void *data,
- struct drm_file *file_priv)
-{
- union drm_wait_hotplug *hotplugwait = data;
- struct timeval now;
- int ret = 0;
- unsigned int flags;
-
- if ((!dev->irq) || (!dev->irq_enabled))
- return -EINVAL;
-
- flags = hotplugwait->request.type;
-
- if (flags & _DRM_HOTPLUG_SIGNAL) {
- unsigned long irqflags;
- struct list_head *hotplug_sigs = dev->hotplug_sigs;
- struct drm_hotplug_sig *hotplug_sig;
-
- hotplug_sig = drm_calloc(1, sizeof(struct drm_hotplug_sig),
- DRM_MEM_DRIVER);
- if (!hotplug_sig)
- return -ENOMEM;
-
- atomic_inc(&dev->hotplug_signal_pending);
-
- hotplug_sig->info.si_signo = hotplugwait->request.signal;
- hotplug_sig->task = current;
- hotplug_sig->counter =
- hotplugwait->reply.counter =
- dev->mode_config.hotplug_counter;
-
- spin_lock_irqsave(&dev->hotplug_lock, irqflags);
-
- list_add_tail(&hotplug_sig->head, hotplug_sigs);
-
- spin_unlock_irqrestore(&dev->hotplug_lock, irqflags);
- } else {
- int cur_hotplug = dev->mode_config.hotplug_counter;
-
- DRM_WAIT_ON(ret, dev->hotplug_queue, 3 * DRM_HZ,
- dev->mode_config.hotplug_counter > cur_hotplug);
-
- do_gettimeofday(&now);
-
- hotplugwait->reply.tval_sec = now.tv_sec;
- hotplugwait->reply.tval_usec = now.tv_usec;
- hotplugwait->reply.counter = dev->mode_config.hotplug_counter;
- }
-
- return ret;
-}
-
static void drm_hotplug_cleanup(struct drm_device *dev)
{
if (dev->hotplug_sigs)