1 files changed, 24 insertions, 53 deletions

diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c
index f4194688..934fa0b9 100644
--- a/linux-core/radeon_drv.c
+++ b/linux-core/radeon_drv.c
@@ -37,68 +37,52 @@
 #include "drm_pciids.h"
 
 int radeon_no_wb;
-int radeon_dynclks = -1;
-int radeon_r4xx_atom = 0;
-int radeon_agpmode = 0;
 
 MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers\n");
 module_param_named(no_wb, radeon_no_wb, int, 0444);
 
-int radeon_modeset = 0;
-module_param_named(modeset, radeon_modeset, int, 0400);
-
-MODULE_PARM_DESC(dynclks, "Disable/Enable dynamic clocks");
-module_param_named(dynclks, radeon_dynclks, int, 0444);
-
-MODULE_PARM_DESC(r4xx_atom, "Enable ATOMBIOS modesetting for R4xx");
-module_param_named(r4xx_atom, radeon_r4xx_atom, int, 0444);
-
-MODULE_PARM_DESC(agpmode, "AGP Mode (-1 == PCI)");
-module_param_named(agpmode, radeon_agpmode, int, 0444);
-
-
 static int dri_library_name(struct drm_device * dev, char * buf)
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
-	int family;
-
-	if (!dev_priv)
-		return 0;
+	int family = dev_priv->flags & RADEON_FAMILY_MASK;
 
-	family = dev_priv->flags & RADEON_FAMILY_MASK;
 	return snprintf(buf, PAGE_SIZE, "%s\n",
 		(family < CHIP_R200) ? "radeon" :
 		((family < CHIP_R300) ? "r200" :
 		"r300"));
 }
 
+static int radeon_suspend(struct drm_device *dev, pm_message_t state)
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+
+	/* Disable *all* interrupts */
+	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690)
+		RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
+	RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);
+	return 0;
+}
+
+static int radeon_resume(struct drm_device *dev)
+{
+	drm_radeon_private_t *dev_priv = dev->dev_private;
+
+	/* Restore interrupt registers */
+	if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690)
+		RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
+	RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
+	return 0;
+}
+
 static struct pci_device_id pciidlist[] = {
 	radeon_PCI_IDS
 };
 
-extern struct drm_fence_driver radeon_fence_driver;
-
-static uint32_t radeon_mem_prios[] = {DRM_BO_MEM_VRAM, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
-static uint32_t radeon_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
-
-static struct drm_bo_driver radeon_bo_driver = {
-	.mem_type_prio = radeon_mem_prios,
-	.mem_busy_prio = radeon_busy_prios,
-	.num_mem_type_prio = sizeof(radeon_mem_prios)/sizeof(uint32_t),
-	.num_mem_busy_prio = sizeof(radeon_busy_prios)/sizeof(uint32_t),
-	.create_ttm_backend_entry = radeon_create_ttm_backend_entry,
-	.fence_type = radeon_fence_types,
-	.invalidate_caches = radeon_invalidate_caches,
-	.init_mem_type = radeon_init_mem_type,
-	.move = radeon_move,
-	.evict_flags = radeon_evict_flags,
-};
-
 static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static struct drm_driver driver = {
 	.driver_features =
 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
-	    DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED | DRIVER_GEM,
+	    DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED,
 	.dev_priv_size = sizeof(drm_radeon_buf_priv_t),
 	.load = radeon_driver_load,
 	.firstopen = radeon_driver_firstopen,
@@ -121,13 +105,7 @@ static struct drm_driver driver = {
 	.get_map_ofs = drm_core_get_map_ofs,
 	.get_reg_ofs = drm_core_get_reg_ofs,
 	.ioctls = radeon_ioctls,
-	.gem_init_object = radeon_gem_init_object,
-	.gem_free_object = radeon_gem_free_object,
 	.dma_ioctl = radeon_cp_buffers,
-	.master_create = radeon_master_create,
-	.master_destroy = radeon_master_destroy,
-	.proc_init = radeon_gem_proc_init,
-	.proc_cleanup = radeon_gem_proc_cleanup,
 	.fops = {
 		.owner = THIS_MODULE,
 		.open = drm_open,
@@ -147,9 +125,6 @@ static struct drm_driver driver = {
 		.remove = __devexit_p(drm_cleanup_pci),
 	},
 
-	.fence_driver = &radeon_fence_driver,
-	.bo_driver = &radeon_bo_driver,
-
 	.name = DRIVER_NAME,
 	.desc = DRIVER_DESC,
 	.date = DRIVER_DATE,
@@ -166,10 +141,6 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 static int __init radeon_init(void)
 {
 	driver.num_ioctls = radeon_max_ioctl;
-
-	if (radeon_modeset == 1)
-		driver.driver_features |= DRIVER_MODESET;
-
 	return drm_init(&driver, pciidlist);
 }