summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-05-07 14:58:02 -0700
committerEric Anholt <eric@anholt.net>2009-05-12 14:38:30 -0700
commit52367847087206b92f18c40d356d36ab9ee89d39 (patch)
tree0875041e2d93461ed12186edfe677f8f5c2781ad
parentff7494b4c4b1bd8bb6f169402a9edbe9780787bb (diff)
Load i915 and fbcon when checking for KMS
Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--src/i830_driver.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 0f66d63f..aaf5a20e 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1009,6 +1009,14 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
busIdString = DRICreatePCIBusID(PciInfo);
ret = drmCheckModesettingSupported(busIdString);
+ if (ret)
+ if (xf86LoadKernelModule("i915")) {
+ ret = drmCheckModesettingSupported(busIdString);
+
+ /* Be nice to the user and load fbcon too */
+ if (!ret)
+ (void) xf86LoadKernelModule("fbcon");
+ }
xfree(busIdString);
if (ret)
return FALSE;