diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-02-01 09:36:24 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-02-01 09:36:24 +0000 |
| commit | ebd80b941c72f9da9ffd54de70cc094b0511f26f (patch) | |
| tree | 6e17ed7bc6158d103fbe558b5ec84c292021d9f9 /drivers/gpu/drm/nouveau/nouveau_mxm.c | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
| parent | a9d993882008a1ae2c953064f0c2ca7e604b1333 (diff) | |
Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nv50/pm: signedness bug in nv50_pm_clocks_pre()
drm/nouveau/gem: fix fence_sync race / oops
drm/nouveau: fix typo on mxmdcb option
drm/nouveau/mxm: pretend to succeed, even if we can't shadow the MXM-SIS
drm/nouveau/disp: check that panel power gpio is enabled at init time
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_mxm.c')
| -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 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; +#else + return 0; +#endif } MXM_MSG(dev, "MXMS Version %d.%d\n", |