diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-08-23 16:53:32 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-29 19:44:54 -0400 |
| commit | df8fcb09667c1b2c9dcf65de23f0bfa851e8138e (patch) | |
| tree | c49982905d4f9e7bffb24b9ca8d54b47c406302e | |
| parent | 89c372647d1d698a96e2189ef4312a977b939839 (diff) | |
drm: kill dev->timer
Totally unused.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_drv.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_stub.c | 1 | ||||
| -rw-r--r-- | include/drm/drmP.h | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index a35a41002c33..5ff75a3a6b9d 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
| @@ -180,8 +180,6 @@ int drm_lastclose(struct drm_device * dev) | |||
| 180 | 180 | ||
| 181 | mutex_lock(&dev->struct_mutex); | 181 | mutex_lock(&dev->struct_mutex); |
| 182 | 182 | ||
| 183 | del_timer(&dev->timer); | ||
| 184 | |||
| 185 | /* Clear AGP information */ | 183 | /* Clear AGP information */ |
| 186 | if (drm_core_has_AGP(dev) && dev->agp && | 184 | if (drm_core_has_AGP(dev) && dev->agp && |
| 187 | !drm_core_check_feature(dev, DRIVER_MODESET)) { | 185 | !drm_core_check_feature(dev, DRIVER_MODESET)) { |
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index f797ae9da77c..cdc89ee042cc 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c | |||
| @@ -241,7 +241,6 @@ int drm_fill_in_dev(struct drm_device *dev, | |||
| 241 | 241 | ||
| 242 | spin_lock_init(&dev->count_lock); | 242 | spin_lock_init(&dev->count_lock); |
| 243 | spin_lock_init(&dev->event_lock); | 243 | spin_lock_init(&dev->event_lock); |
| 244 | init_timer(&dev->timer); | ||
| 245 | mutex_init(&dev->struct_mutex); | 244 | mutex_init(&dev->struct_mutex); |
| 246 | mutex_init(&dev->ctxlist_mutex); | 245 | mutex_init(&dev->ctxlist_mutex); |
| 247 | 246 | ||
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index ffe6035cf471..757b63a23b14 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
| @@ -964,7 +964,6 @@ struct drm_device { | |||
| 964 | __volatile__ long context_flag; /**< Context swapping flag */ | 964 | __volatile__ long context_flag; /**< Context swapping flag */ |
| 965 | __volatile__ long interrupt_flag; /**< Interruption handler flag */ | 965 | __volatile__ long interrupt_flag; /**< Interruption handler flag */ |
| 966 | __volatile__ long dma_flag; /**< DMA dispatch flag */ | 966 | __volatile__ long dma_flag; /**< DMA dispatch flag */ |
| 967 | struct timer_list timer; /**< Timer for delaying ctx switch */ | ||
| 968 | wait_queue_head_t context_wait; /**< Processes waiting on ctx switch */ | 967 | wait_queue_head_t context_wait; /**< Processes waiting on ctx switch */ |
| 969 | int last_checked; /**< Last context checked for DMA */ | 968 | int last_checked; /**< Last context checked for DMA */ |
| 970 | int last_context; /**< Last current context */ | 969 | int last_context; /**< Last current context */ |
