Attachment 2835 Details for Bug 3408 – Completely re-initialize DMA settings

[patch] Completely re-initialize DMA settings

mga_3408-02.patch (text/plain), 6.00 KB, created by Ian Romanick on 2005-06-06 10:06:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Romanick

Created: 2005-06-06 10:06:09 UTC

Size: 6.00 KB

patch

obsolete

>Index: linux-core/mga_drv.c
>===================================================================
>RCS file: /cvs/dri/drm/linux-core/mga_drv.c,v
>retrieving revision 1.52
>diff -u -d -r1.52 mga_drv.c
>--- linux-core/mga_drv.c	27 May 2005 23:42:11 -0000	1.52
>+++ linux-core/mga_drv.c	6 Jun 2005 16:59:08 -0000
>@@ -83,6 +83,7 @@
> 	    DRIVER_IRQ_VBL,
> 	.preinit = mga_driver_preinit,
> 	.postcleanup = mga_driver_postcleanup,
>+	.pretakedown = mga_driver_pretakedown,
> 	.dma_quiescent = mga_driver_dma_quiescent,
> 	.device_is_agp = mga_driver_device_is_agp,
> 	.vblank_wait = mga_driver_vblank_wait,
>Index: shared-core/mga_dma.c
>===================================================================
>RCS file: /cvs/dri/drm/shared-core/mga_dma.c,v
>retrieving revision 1.23
>diff -u -d -r1.23 mga_dma.c
>--- shared-core/mga_dma.c	3 Jun 2005 22:45:21 -0000	1.23
>+++ shared-core/mga_dma.c	6 Jun 2005 16:59:08 -0000
>@@ -440,38 +440,32 @@
> 
> 	if (!dev_priv->sarea) {
> 		DRM_ERROR("failed to find sarea!\n");
>-		mga_do_cleanup_dma(dev);
> 		return DRM_ERR(EINVAL);
> 	}
> 
> 	dev_priv->mmio = drm_core_findmap(dev, init->mmio_offset);
> 	if (!dev_priv->mmio) {
> 		DRM_ERROR("failed to find mmio region!\n");
>-		mga_do_cleanup_dma(dev);
> 		return DRM_ERR(EINVAL);
> 	}
> 	dev_priv->status = drm_core_findmap(dev, init->status_offset);
> 	if (!dev_priv->status) {
> 		DRM_ERROR("failed to find status page!\n");
>-		mga_do_cleanup_dma(dev);
> 		return DRM_ERR(EINVAL);
> 	}
> 	dev_priv->warp = drm_core_findmap(dev, init->warp_offset);
> 	if (!dev_priv->warp) {
> 		DRM_ERROR("failed to find warp microcode region!\n");
>-		mga_do_cleanup_dma(dev);
> 		return DRM_ERR(EINVAL);
> 	}
> 	dev_priv->primary = drm_core_findmap(dev, init->primary_offset);
> 	if (!dev_priv->primary) {
> 		DRM_ERROR("failed to find primary dma region!\n");
>-		mga_do_cleanup_dma(dev);
> 		return DRM_ERR(EINVAL);
> 	}
> 	dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
> 	if (!dev->agp_buffer_map) {
> 		DRM_ERROR("failed to find dma buffer region!\n");
>-		mga_do_cleanup_dma(dev);
> 		return DRM_ERR(EINVAL);
> 	}
> 
>@@ -486,21 +480,18 @@
> 	if (!dev_priv->warp->handle ||
> 	    !dev_priv->primary->handle || !dev->agp_buffer_map->handle) {
> 		DRM_ERROR("failed to ioremap agp regions!\n");
>-		mga_do_cleanup_dma(dev);
> 		return DRM_ERR(ENOMEM);
> 	}
> 
> 	ret = mga_warp_install_microcode(dev_priv);
> 	if (ret < 0) {
> 		DRM_ERROR("failed to install WARP ucode!\n");
>-		mga_do_cleanup_dma(dev);
> 		return ret;
> 	}
> 
> 	ret = mga_warp_init(dev_priv);
> 	if (ret < 0) {
> 		DRM_ERROR("failed to init WARP engine!\n");
>-		mga_do_cleanup_dma(dev);
> 		return ret;
> 	}
> 
>@@ -539,7 +530,6 @@
> 
> 	if (mga_freelist_init(dev, dev_priv) < 0) {
> 		DRM_ERROR("could not initialize freelist\n");
>-		mga_do_cleanup_dma(dev);
> 		return DRM_ERR(ENOMEM);
> 	}
> 
>@@ -564,10 +554,20 @@
> 			drm_core_ioremapfree(dev_priv->warp, dev);
> 		if (dev_priv->primary != NULL)
> 			drm_core_ioremapfree(dev_priv->primary, dev);
>-		if (dev->agp_buffer_map != NULL) {
>+		if (dev->agp_buffer_map != NULL)
> 			drm_core_ioremapfree(dev->agp_buffer_map, dev);
>-			dev->agp_buffer_map = NULL;
>-		}
>+
>+		dev_priv->warp = NULL;
>+		dev_priv->primary = NULL;
>+		dev_priv->mmio = NULL;
>+		dev_priv->status = NULL;
>+		dev_priv->sarea = NULL;
>+		dev_priv->sarea_priv = NULL;
>+		dev->agp_buffer_map = NULL;
>+
>+		memset(&dev_priv->prim, 0, sizeof(dev_priv->prim));
>+		dev_priv->warp_pipe = 0;
>+		memset(dev_priv->warp_pipe_phys, 0, sizeof(dev_priv->warp_pipe_phys));
> 
> 		if (dev_priv->head != NULL) {
> 			mga_freelist_cleanup(dev);
>@@ -581,6 +581,7 @@
> {
> 	DRM_DEVICE;
> 	drm_mga_init_t init;
>+	int err;
> 
> 	LOCK_TEST_WITH_RETURN(dev, filp);
> 
>@@ -589,7 +590,11 @@
> 
> 	switch (init.func) {
> 	case MGA_INIT_DMA:
>-		return mga_do_init_dma(dev, &init);
>+		err = mga_do_init_dma(dev, &init);
>+		if (err) {
>+			(void) mga_do_cleanup_dma(dev);
>+		}
>+		return err;
> 	case MGA_CLEANUP_DMA:
> 		return mga_do_cleanup_dma(dev);
> 	}
>@@ -717,19 +722,24 @@
> 	return ret;
> }
> 
>+/**
>+ * Called just before the module is unloaded.
>+ */
> int mga_driver_postcleanup(drm_device_t * dev)
> {
>-	int err;
>-	
>-	
>-	err = mga_do_cleanup_dma(dev);
>-	if (!err) {
>-		drm_free(dev->dev_private, sizeof(drm_mga_private_t),
>-			 DRM_MEM_DRIVER);
>-		dev->dev_private = NULL;
>-	}
>+	drm_free(dev->dev_private, sizeof(drm_mga_private_t),
>+		 DRM_MEM_DRIVER);
>+	dev->dev_private = NULL;
> 
>-	return err;
>+	return 0;
>+}
>+
>+/**
>+ * Called when the last opener of the device is closed.
>+ */
>+void mga_driver_pretakedown(drm_device_t * dev)
>+{
>+	mga_do_cleanup_dma(dev);
> }
> 
> int mga_driver_dma_quiescent(drm_device_t * dev)
>Index: shared-core/mga_drv.h
>===================================================================
>RCS file: /cvs/dri/drm/shared-core/mga_drv.h,v
>retrieving revision 1.18
>diff -u -d -r1.18 mga_drv.h
>--- shared-core/mga_drv.h	22 May 2005 04:36:33 -0000	1.18
>+++ shared-core/mga_drv.h	6 Jun 2005 16:59:08 -0000
>@@ -38,11 +38,11 @@
> 
> #define DRIVER_NAME		"mga"
> #define DRIVER_DESC		"Matrox G200/G400"
>-#define DRIVER_DATE		"20050520"
>+#define DRIVER_DATE		"20050606"
> 
> #define DRIVER_MAJOR		3
> #define DRIVER_MINOR		1
>-#define DRIVER_PATCHLEVEL	2
>+#define DRIVER_PATCHLEVEL	3
> 
> typedef struct drm_mga_primary_buffer {
> 	u8 *start;
>@@ -108,7 +108,6 @@
> 	drm_local_map_t *status;
> 	drm_local_map_t *warp;
> 	drm_local_map_t *primary;
>-	drm_local_map_t *buffers;
> 	drm_local_map_t *agp_textures;
> } drm_mga_private_t;
> 
>@@ -119,6 +118,7 @@
> extern int mga_dma_reset(DRM_IOCTL_ARGS);
> extern int mga_dma_buffers(DRM_IOCTL_ARGS);
> extern int mga_driver_postcleanup(drm_device_t * dev);
>+extern void mga_driver_pretakedown(drm_device_t * dev);
> extern int mga_driver_dma_quiescent(drm_device_t * dev);
> 
> extern int mga_do_wait_for_idle(drm_mga_private_t * dev_priv);
>Index: shared-core/mga_irq.c
>===================================================================
>RCS file: /cvs/dri/drm/shared-core/mga_irq.c,v
>retrieving revision 1.11
>diff -u -d -r1.11 mga_irq.c
>--- shared-core/mga_irq.c	30 Sep 2004 21:12:09 -0000	1.11
>+++ shared-core/mga_irq.c	6 Jun 2005 16:59:08 -0000
>@@ -98,4 +98,6 @@
> 
> 	/* Disable *all* interrupts */
> 	MGA_WRITE(MGA_IEN, 0);
>+	
>+	dev->irq_enabled = 0;
> }

Actions: View | Splinter Review

Attachments on bug 3408: 2817 | 2835

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.