diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-01 02:40:21 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-01 02:40:21 +0400 |
| commit | ed48c06c321e8569e417db99f116ca15b9900529 (patch) | |
| tree | 651dab9414cf8cdf42d1a8b968971a4ef62c14fa /drivers/gpu/drm/nouveau/nouveau_drm.h | |
| parent | 296bac30f6b62e1e985d3e7c0bd9c92b971b2dab (diff) | |
| parent | 4936b172d699434547addbe452c2d600ea6a4baf (diff) | |
| download | linux-ed48c06c321e8569e417db99f116ca15b9900529.tar.xz | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull nouveau fixes from Dave Airlie:
"Just a nouveau set, since we have a couple of reports on lkml and
dri-devel of regressions that this should fix I sent it along on its
own."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nouveau: headless mode by default if pci class != vga display
drm/nouveau: resurrect headless mode since rework
drm/nv50/fb: prevent oops on chipsets without compression tags
drm/nouveau: allow creation of zero-sized mm
drm/nouveau/i2c: fix typo when checking nvio i2c port validity
drm/nouveau: silence modesetting spam on pre-gf8 chipsets
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h index 819471217546..a10169927086 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h @@ -141,4 +141,6 @@ int nouveau_drm_resume(struct pci_dev *); nv_info((cli), fmt, ##args); \ } while (0) +extern int nouveau_modeset; + #endif |