aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-09-04 09:57:27 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-06 18:09:53 -0400
commitdf51e7aa2cf204e3a65657a1d60b96cfda133e9b (patch)
tree758a3630b9e6b76a4cab9acefe034c62c12309bd /drivers/char
parent9f82d23846146990d475f6753be733e55788d88d (diff)
agp/intel: Promote warning about failure to setup flush to error.
Make sure we always detect when we fail to correctly allocate the Isoch Flush Page and print an error to warn the user about the likely memory corruption that will result in invalid rendering or worse. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: stable@kernel.org
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/intel-gtt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index d22ffb811bf2..ce536e68b6c6 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -1068,11 +1068,11 @@ static void intel_i9xx_setup_flush(void)
1068 intel_i915_setup_chipset_flush(); 1068 intel_i915_setup_chipset_flush();
1069 } 1069 }
1070 1070
1071 if (intel_private.ifp_resource.start) { 1071 if (intel_private.ifp_resource.start)
1072 intel_private.i9xx_flush_page = ioremap_nocache(intel_private.ifp_resource.start, PAGE_SIZE); 1072 intel_private.i9xx_flush_page = ioremap_nocache(intel_private.ifp_resource.start, PAGE_SIZE);
1073 if (!intel_private.i9xx_flush_page) 1073 if (!intel_private.i9xx_flush_page)
1074 dev_info(&intel_private.pcidev->dev, "can't ioremap flush page - no chipset flushing"); 1074 dev_err(&intel_private.pcidev->dev,
1075 } 1075 "can't ioremap flush page - no chipset flushing\n");
1076} 1076}
1077 1077
1078static int intel_i9xx_configure(void) 1078static int intel_i9xx_configure(void)