From da99f318df22b179a3b4f26bf7fe390e01a27186 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 23 Aug 2010 22:53:29 +0200
Subject: [PATCH] --- yaml --- r: 217871 b: refs/heads/master c:
 b3da8f7d2d1fa81fb65cb3f5d9e50dde40a83182 h: refs/heads/master i:   217869:
 6aeae724b8ded5ce0542a0effa4499356381263b   217867:
 03ba5ed87f61070282b9c632b758498ec32b5c98   217863:
 a33d836ae4ffebe6a9e94e1a843774453dd00e93   217855:
 be1545db0f53f55d1f7ddae86f3b9f0fb13d8377 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/gpu/drm/drm_context.c | 8 --------
 trunk/drivers/gpu/drm/sis/sis_drv.c | 1 -
 trunk/include/drm/drmP.h            | 1 -
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index f06c26638c79..4ca5380e0916 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd2e7931cdefa8e9acf63f0a4efd61ae0f89e77b
+refs/heads/master: b3da8f7d2d1fa81fb65cb3f5d9e50dde40a83182
diff --git a/trunk/drivers/gpu/drm/drm_context.c b/trunk/drivers/gpu/drm/drm_context.c
index 2607753a320b..6d440fb894cf 100644
--- a/trunk/drivers/gpu/drm/drm_context.c
+++ b/trunk/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/trunk/drivers/gpu/drm/sis/sis_drv.c b/trunk/drivers/gpu/drm/sis/sis_drv.c
index 776bf9e9ea1a..2d1292131500 100644
--- a/trunk/drivers/gpu/drm/sis/sis_drv.c
+++ b/trunk/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,
diff --git a/trunk/include/drm/drmP.h b/trunk/include/drm/drmP.h
index 6dbdbf45cd1a..eb4f7edcc314 100644
--- a/trunk/include/drm/drmP.h
+++ b/trunk/include/drm/drmP.h
@@ -700,7 +700,6 @@ struct drm_driver {
 	int (*resume) (struct drm_device *);
 	int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
 	int (*dma_quiescent) (struct drm_device *);
-	int (*context_ctor) (struct drm_device *dev, int context);
 	int (*context_dtor) (struct drm_device *dev, int context);
 
 	/**