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

Browse source

Pull drm fixes from Dave Airlie:
 "Three nouveau fixes, all user visible issues, and one radeon
  regression fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: enforce use of radeon_get_ib_value when reading user cmd
  drm/nouveau: add lockdep annotations
  drm/nv50/fb: Fix nullptr-deref on IGPs
  drm/nouveau: use different register to wait for secret scrubber

...

This commit is contained in:

Linus Torvalds 2013-02-12 08:17:35 -08:00

parent 836dc9e3fb de0babd60d

commit 211b0cdc7d

8 changed files with 81 additions and 71 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

7

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

View file

2

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

View file

7

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

View file

4

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

View file

5

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

View file

3

drivers/gpu/drm/nouveau/nouveau_drm.c

View file

86

drivers/gpu/drm/radeon/evergreen_cs.c

View file

38

drivers/gpu/drm/radeon/r600_cs.c

View file