path: root/drivers/gpu
diff options
authorBen Skeggs <>2012-02-01 15:08:59 +1000
committerBen Skeggs <>2012-02-01 15:23:58 +1000
commitce2e7895faba8fabaa917f52293126e5f4174fa9 (patch)
tree45d262375909f6e23187f419fd206d8403f68e4e /drivers/gpu
parent7df898b1a70b13c3a8892625f4ead929d9554293 (diff)
drm/nouveau/mxm: pretend to succeed, even if we can't shadow the MXM-SIS
There's at least one known case where our shadowing code is buggy, and we fail init. Until we can be confident we're doing all this correctly, lets succeed and risk crazy bios tables rather than failing for perfectly valid configs too. Signed-off-by: Ben Skeggs <>
Diffstat (limited to 'drivers/gpu')
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_mxm.c b/drivers/gpu/drm/nouveau/nouveau_mxm.c
index 8bccddf4eff0..e5a64f0f4cb7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mxm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mxm.c
@@ -656,7 +656,16 @@ nouveau_mxm_init(struct drm_device *dev)
if (mxm_shadow(dev, mxm[0])) {
MXM_MSG(dev, "failed to locate valid SIS\n");
+#if 0
+ /* we should, perhaps, fall back to some kind of limited
+ * mode here if the x86 vbios hasn't already done the
+ * work for us (so we prevent loading with completely
+ * whacked vbios tables).
+ */
return -EINVAL;
+ return 0;
MXM_MSG(dev, "MXMS Version %d.%d\n",