diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2009-05-18 13:53:33 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyuw@linux.intel.com> | 2009-07-01 10:15:45 +0800 |
| commit | 50392ac8234d643c8a99e1753bdb196c0062a891 (patch) | |
| tree | f2a0a1f36ea1d1d8959c9c93045cabebe7500805 | |
| parent | 058ad9e6ab4a00ff66046d94c2129056011ebee9 (diff) | |
Load fbcon too if kernel mode setting is checked on
If i915 module has already been loaded and kms check is true,
it would be nice to load fbcon module too.
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
| -rw-r--r-- | src/i830_driver.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 40255cd3..45a8aee6 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1012,14 +1012,13 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn) busIdString = DRICreatePCIBusID(PciInfo); ret = drmCheckModesettingSupported(busIdString); - if (ret) - if (xf86LoadKernelModule("i915")) { + if (ret) { + if (xf86LoadKernelModule("i915")) ret = drmCheckModesettingSupported(busIdString); - - /* Be nice to the user and load fbcon too */ - if (!ret) - (void) xf86LoadKernelModule("fbcon"); - } + } + /* Be nice to the user and load fbcon too */ + if (!ret) + (void) xf86LoadKernelModule("fbcon"); xfree(busIdString); if (ret) return FALSE; |