Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Browse source

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

...

This commit is contained in:

Linus Torvalds 2012-10-31 15:40:21 -07:00

parent 296bac30f6 4936b172d6

commit ed48c06c32

11 changed files with 83 additions and 68 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

drivers/gpu/drm/nouveau/core/core/mm.c

View file

1

drivers/gpu/drm/nouveau/core/include/core/mm.h

View file

10

drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c

View file

2

drivers/gpu/drm/nouveau/core/subdev/i2c/base.c

View file

36

drivers/gpu/drm/nouveau/nouveau_display.c

View file

36

drivers/gpu/drm/nouveau/nouveau_drm.c

View file

2

drivers/gpu/drm/nouveau/nouveau_drm.h

View file

16

drivers/gpu/drm/nouveau/nouveau_irq.c

View file

16

drivers/gpu/drm/nouveau/nv04_dac.c

View file

14

drivers/gpu/drm/nouveau/nv04_dfp.c

View file

9

drivers/gpu/drm/nouveau/nv04_tv.c

View file