diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-08-23 16:53:29 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-29 19:38:25 -0400 |
| commit | b3da8f7d2d1fa81fb65cb3f5d9e50dde40a83182 (patch) | |
| tree | 3fcc266b657a1b16f644eb214e3c774047fdea6f /drivers/gpu | |
| parent | fd2e7931cdefa8e9acf63f0a4efd61ae0f89e77b (diff) | |
drm: kill context_ctor callback
It's not used by any driver. The destructor callback is unfortunately
used by the via driver in a rather convoluted piece of code used
to reimplement something resembling broken futexes. I didn't dare
to touch this code. But at least kill the needless NULL assignemt
in the sis driver.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_context.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/sis/sis_drv.c | 1 |
2 files changed, 0 insertions, 9 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, |
