diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-08-23 22:53:29 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-30 09:38:25 +1000 |
| commit | b3da8f7d2d1fa81fb65cb3f5d9e50dde40a83182 (patch) | |
| tree | 3fcc266b657a1b16f644eb214e3c774047fdea6f /drivers/gpu | |
| parent | fd2e7931cdefa8e9acf63f0a4efd61ae0f89e77b (diff) | |
| download | blackbird-obmc-linux-b3da8f7d2d1fa81fb65cb3f5d9e50dde40a83182.tar.gz blackbird-obmc-linux-b3da8f7d2d1fa81fb65cb3f5d9e50dde40a83182.zip | |
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, return -ENOMEM; } - if (ctx->handle != DRM_KERNEL_CONTEXT) { - if (dev->driver->context_ctor) - if (!dev->driver->context_ctor(dev, ctx->handle)) { - DRM_DEBUG("Running out of ctxs or memory.\n"); - return -ENOMEM; - } - } - ctx_entry = kmalloc(sizeof(*ctx_entry), GFP_KERNEL); if (!ctx_entry) { 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 = { .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR, .load = sis_driver_load, .unload = sis_driver_unload, - .context_dtor = NULL, .dma_quiescent = sis_idle, .reclaim_buffers = NULL, .reclaim_buffers_idlelocked = sis_reclaim_buffers_locked, |
