summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-01-14 19:36:10 +1000
committerDave Airlie <airlied@linux.ie>2008-01-14 19:38:41 +1000
commit62df4f0a48776e55443d7f61a41e1ed0fb77b6ed (patch)
treea196da57ca6f7e5b24100564bfa19ea2171e0b33
parent269d518008a20dc81231574f2d07d101553d3824 (diff)
fixup i915 compat resource allocation
-rw-r--r--linux-core/i915_compat.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/linux-core/i915_compat.c b/linux-core/i915_compat.c
index 58fb8418..f77260b1 100644
--- a/linux-core/i915_compat.c
+++ b/linux-core/i915_compat.c
@@ -21,6 +21,7 @@
static struct _i9xx_private_compat {
void __iomem *flush_page;
+ int resource_valid;
struct resource ifp_resource;
} i9xx_private;
@@ -57,16 +58,17 @@ static void intel_i915_setup_chipset_flush(struct pci_dev *pdev)
pci_read_config_dword(pdev, I915_IFPADDR, &temp);
if (!(temp & 0x1)) {
intel_alloc_chipset_flush_resource(pdev);
-
+ i9xx_private.resource_valid = 1;
pci_write_config_dword(pdev, I915_IFPADDR, (i9xx_private.ifp_resource.start & 0xffffffff) | 0x1);
} else {
temp &= ~1;
+ i9xx_private.resource_valid = 1;
i9xx_private.ifp_resource.start = temp;
i9xx_private.ifp_resource.end = temp + PAGE_SIZE;
ret = request_resource(&iomem_resource, &i9xx_private.ifp_resource);
if (ret) {
- i9xx_private.ifp_resource.start = 0;
+ i9xx_private.resource_valid = 0;
printk("Failed inserting resource into tree\n");
}
}
@@ -84,6 +86,7 @@ static void intel_i965_g33_setup_chipset_flush(struct pci_dev *pdev)
intel_alloc_chipset_flush_resource(pdev);
+ i9xx_private.resource_valid = 1;
pci_write_config_dword(pdev, I965_IFPADDR + 4,
upper_32_bits(i9xx_private.ifp_resource.start));
pci_write_config_dword(pdev, I965_IFPADDR, (i9xx_private.ifp_resource.start & 0xffffffff) | 0x1);
@@ -93,11 +96,12 @@ static void intel_i965_g33_setup_chipset_flush(struct pci_dev *pdev)
temp_lo &= ~0x1;
l64 = ((u64)temp_hi << 32) | temp_lo;
+ i9xx_private.resource_valid = 1;
i9xx_private.ifp_resource.start = l64;
i9xx_private.ifp_resource.end = l64 + PAGE_SIZE;
ret = request_resource(&iomem_resource, &i9xx_private.ifp_resource);
if (!ret) {
- i9xx_private.ifp_resource.start = 0;
+ i9xx_private.resource_valid = 0;
printk("Failed inserting resource into tree\n");
}
}
@@ -167,7 +171,9 @@ static void intel_i9xx_setup_flush(struct drm_device *dev)
static void intel_i9xx_fini_flush(struct drm_device *dev)
{
iounmap(i9xx_private.flush_page);
- release_resource(&i9xx_private.ifp_resource);
+ if (i9xx_private.resource_valid)
+ release_resource(&i9xx_private.ifp_resource);
+ i9xx_private.resource_valid = 0;
}
static void intel_i9xx_flush_page(struct drm_device *dev)