Attachment 4665 Details for Bug 5942 – Guard use of mtrr_add/mtrr_del with #if __OS_HAS_MTRR

[patch] Guard use of mtrr_add/mtrr_del with #if __OS_HAS_MTRR

savage_mtrr.diff (text/plain), 1.63 KB, created by Felix Kühling on 2006-02-19 05:29:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Kühling

Created: 2006-02-19 05:29:49 UTC

Size: 1.63 KB

patch

obsolete

>Index: savage_bci.c
>===================================================================
>RCS file: /cvs/dri/drm/shared-core/savage_bci.c,v
>retrieving revision 1.19
>diff -u -r1.19 savage_bci.c
>--- savage_bci.c	2 Jan 2006 05:22:50 -0000	1.19
>+++ savage_bci.c	18 Feb 2006 18:23:57 -0000
>@@ -576,6 +576,7 @@
> 		mmio_base = fb_base + SAVAGE_FB_SIZE_S3;
> 		aper_rsrc = 0;
> 		aperture_base = fb_base + SAVAGE_APERTURE_OFFSET;
>+#if __OS_HAS_MTRR
> 		/* this should always be true */
> 		if (drm_get_resource_len(dev, 0) == 0x08000000) {
> 			/* Don't make MMIO write-cobining! We need 3
>@@ -599,6 +600,7 @@
> 			DRM_ERROR("strange pci_resource_len %08lx\n",
> 				  drm_get_resource_len(dev, 0));
> 		}
>+#endif
> 	} else if (dev_priv->chipset != S3_SUPERSAVAGE &&
> 		   dev_priv->chipset != S3_SAVAGE2000) {
> 		mmio_base = drm_get_resource_start(dev, 0);
>@@ -607,6 +609,7 @@
> 		fb_size = SAVAGE_FB_SIZE_S4;
> 		aper_rsrc = 1;
> 		aperture_base = fb_base + SAVAGE_APERTURE_OFFSET;
>+#if __OS_HAS_MTRR
> 		/* this should always be true */
> 		if (drm_get_resource_len(dev, 1) == 0x08000000) {
> 			/* Can use one MTRR to cover both fb and
>@@ -620,6 +623,7 @@
> 			DRM_ERROR("strange pci_resource_len %08lx\n",
> 				  drm_get_resource_len(dev, 1));
> 		}
>+#endif
> 	} else {
> 		mmio_base = drm_get_resource_start(dev, 0);
> 		fb_rsrc = 1;
>@@ -654,6 +658,7 @@
>  */
> void savage_driver_lastclose(drm_device_t *dev)
> {
>+#if __OS_HAS_MTRR
> 	drm_savage_private_t *dev_priv = dev->dev_private;
> 	int i;
> 
>@@ -662,6 +667,7 @@
> 			drm_mtrr_del(dev_priv->mtrr[i].handle,
> 				     dev_priv->mtrr[i].base,
> 				     dev_priv->mtrr[i].size, DRM_MTRR_WC);
>+#endif
> }
> 
> int savage_driver_unload(drm_device_t *dev)

Actions: View | Splinter Review

Attachments on bug 5942: 4665 | 4666

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.