diff options
-rw-r--r-- | drivers/gpu/drm/drm_context.c | 8 | ||||
-rw-r--r-- | drivers/gpu/drm/sis/sis_drv.c | 1 | ||||
-rw-r--r-- | include/drm/drmP.h | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c index 2607753a320b..6d440fb894cf 100644 --- a/drivers/gpu/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c | |||
@@ -333,14 +333,6 @@ int drm_addctx(struct drm_device *dev, void *data, | |||
333 | return -ENOMEM; | 333 | return -ENOMEM; |
334 | } | 334 | } |
335 | 335 | ||
336 | if (ctx->handle != DRM_KERNEL_CONTEXT) { | ||
337 | if (dev->driver->context_ctor) | ||
338 | if (!dev->driver->context_ctor(dev, ctx->handle)) { | ||
339 | DRM_DEBUG("Running out of ctxs or memory.\n"); | ||
340 | return -ENOMEM; | ||
341 | } | ||
342 | } | ||
343 | |||
344 | ctx_entry = kmalloc(sizeof(*ctx_entry), GFP_KERNEL); | 336 | ctx_entry = kmalloc(sizeof(*ctx_entry), GFP_KERNEL); |
345 | if (!ctx_entry) { | 337 | if (!ctx_entry) { |
346 | DRM_DEBUG("out of memory\n"); | 338 | DRM_DEBUG("out of memory\n"); |
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c index 776bf9e9ea1a..2d1292131500 100644 --- a/drivers/gpu/drm/sis/sis_drv.c +++ b/drivers/gpu/drm/sis/sis_drv.c | |||
@@ -67,7 +67,6 @@ static struct drm_driver driver = { | |||
67 | .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR, | 67 | .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR, |
68 | .load = sis_driver_load, | 68 | .load = sis_driver_load, |
69 | .unload = sis_driver_unload, | 69 | .unload = sis_driver_unload, |
70 | .context_dtor = NULL, | ||
71 | .dma_quiescent = sis_idle, | 70 | .dma_quiescent = sis_idle, |
72 | .reclaim_buffers = NULL, | 71 | .reclaim_buffers = NULL, |
73 | .reclaim_buffers_idlelocked = sis_reclaim_buffers_locked, | 72 | .reclaim_buffers_idlelocked = sis_reclaim_buffers_locked, |
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 6dbdbf45cd1a..eb4f7edcc314 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -700,7 +700,6 @@ struct drm_driver { | |||
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 | int (*dma_quiescent) (struct drm_device *); | 702 | int (*dma_quiescent) (struct drm_device *); |
703 | int (*context_ctor) (struct drm_device *dev, int context); | ||
704 | int (*context_dtor) (struct drm_device *dev, int context); | 703 | int (*context_dtor) (struct drm_device *dev, int context); |
705 | 704 | ||
706 | /** | 705 | /** |