diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-02-01 15:08:59 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-02-01 15:23:58 +1000 |
| commit | ce2e7895faba8fabaa917f52293126e5f4174fa9 (patch) | |
| tree | 45d262375909f6e23187f419fd206d8403f68e4e /drivers/gpu | |
| parent | 7df898b1a70b13c3a8892625f4ead929d9554293 (diff) | |
| download | op-kernel-dev-ce2e7895faba8fabaa917f52293126e5f4174fa9.zip op-kernel-dev-ce2e7895faba8fabaa917f52293126e5f4174fa9.tar.gz | |
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 <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_mxm.c | 9 |
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 8bccddf..e5a64f0 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; +#else + return 0; +#endif } MXM_MSG(dev, "MXMS Version %d.%d\n", |
