Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next

Browse source

- Various fixes that make surviving concurrent piglit more possible.
- Buffer object deletion no longer synchronous
- Context/register initialisation updates that have been reported to
solve some stability issues (particularly on some problematic GF119
chips)
- Kernel side support for VP2 video decoding engines

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (44 commits)
  drm/nvd0-/disp: handle case where display engine is missing/disabled
  drm/gr/nvc0-: merge nvc0/nve0 ucode, and use cpp instead of m4
  drm/nouveau/bsp/nv84: initial vp2 engine implementation
  drm/nouveau/vp/nv84: initial vp2 engine implementation
  drm/nouveau/core: xtensa engine base class implementation
  drm/nouveau/vdec: fork vp3 implementations from vp2
  drm/nouveau/core: move falcon class to engine/
  drm/nouveau/kms: don't fail if there's no dcb table entries
  drm/nouveau: remove limit on gart
  drm/nouveau/vm: perform a bar flush when flushing vm
  drm/nvc0/gr: cleanup register lists, and add nvce/nvcf to switches
  drm/nvc8/gr: update initial register/context values
  drm/nvc4/gr: update initial register/context values
  drm/nvc1/gr: update initial register/context values
  drm/nvc3/gr: update initial register/context values
  drm/nvc0/gr: update initial register/context values
  drm/nvd9/gr: update initial register/context values
  drm/nve4/gr: update initial register/context values
  drm/nvc0-/gr: bump maximum gpc/tpc limits
  drm/nvf0/gr: initial register/context setup
  ...

...

This commit is contained in:

Dave Airlie 2013-07-01 14:10:20 +10:00

parent c344ee6809 791dc143ed

commit f7d452f4fd

141 changed files with 7740 additions and 6131 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

18

drivers/gpu/drm/nouveau/Makefile

View file

1

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

View file

27

drivers/gpu/drm/nouveau/core/engine/bsp/nv84.c

View file

93

drivers/gpu/drm/nouveau/core/engine/bsp/nv98.c

View file

3

drivers/gpu/drm/nouveau/core/engine/bsp/nvc0.c

View file

3

drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c

View file

4

drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc.h

View file

4

drivers/gpu/drm/nouveau/core/engine/copy/fuc/nvc0.fuc.h

View file

21

drivers/gpu/drm/nouveau/core/engine/copy/nva3.c

View file

10

drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c

View file

47

drivers/gpu/drm/nouveau/core/engine/copy/nve0.c

View file

4

drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc.h

View file

8

drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c

View file

10

drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c

View file

36

drivers/gpu/drm/nouveau/core/engine/device/nv50.c

View file

16

drivers/gpu/drm/nouveau/core/engine/device/nvc0.c

View file

11

drivers/gpu/drm/nouveau/core/engine/device/nve0.c

View file

6

drivers/gpu/drm/nouveau/core/engine/disp/nv50.c

View file

14

drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c

View file

3

drivers/gpu/drm/nouveau/core/engine/disp/nve0.c

View file

3

drivers/gpu/drm/nouveau/core/engine/disp/nvf0.c

View file

3

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

View file

2

drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c

View file

4

drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c

View file

53

drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c

View file

609

drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c

View file

401

drivers/gpu/drm/nouveau/core/engine/graph/ctxnve0.c

View file

73

drivers/gpu/drm/nouveau/core/engine/graph/fuc/nvc0.fuc → drivers/gpu/drm/nouveau/core/engine/graph/fuc/com.fuc

View file

369

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc

View file

444

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc

View file

114

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h

View file

427

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc

View file

80

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc.h

View file

755

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hub.fuc

View file

792

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc

View file

1104

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h

View file

770

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc

View file

1091

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnve0.fuc.h

View file

53

drivers/gpu/drm/nouveau/core/engine/graph/fuc/macros.fuc

View file

400

drivers/gpu/drm/nouveau/core/engine/graph/fuc/nve0.fuc

View file

7

drivers/gpu/drm/nouveau/core/engine/graph/fuc/os.h

View file

18

drivers/gpu/drm/nouveau/core/engine/graph/nv50.c

View file

593

drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c

View file

6

drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h

View file

384

drivers/gpu/drm/nouveau/core/engine/graph/nve0.c

View file

8

drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c

View file

1

drivers/gpu/drm/nouveau/core/engine/mpeg/nv84.c

View file

3

drivers/gpu/drm/nouveau/core/engine/ppp/nvc0.c

View file

27

drivers/gpu/drm/nouveau/core/engine/vp/nv84.c

View file

93

drivers/gpu/drm/nouveau/core/engine/vp/nv98.c

View file

3

drivers/gpu/drm/nouveau/core/engine/vp/nvc0.c

View file

3

drivers/gpu/drm/nouveau/core/engine/vp/nve0.c

View file

170

drivers/gpu/drm/nouveau/core/engine/xtensa.c

View file

5

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

View file

2

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

View file

1

drivers/gpu/drm/nouveau/core/include/engine/bsp.h

View file

1

drivers/gpu/drm/nouveau/core/include/engine/copy.h

View file

0

drivers/gpu/drm/nouveau/core/include/core/falcon.h → drivers/gpu/drm/nouveau/core/include/engine/falcon.h

View file

1

drivers/gpu/drm/nouveau/core/include/engine/mpeg.h

View file

1

drivers/gpu/drm/nouveau/core/include/engine/vp.h

View file

38

drivers/gpu/drm/nouveau/core/include/engine/xtensa.h

View file

2

drivers/gpu/drm/nouveau/core/include/subdev/clock.h

View file

21

drivers/gpu/drm/nouveau/core/include/subdev/devinit.h

View file

95

drivers/gpu/drm/nouveau/core/include/subdev/fb.h

View file

5

drivers/gpu/drm/nouveau/core/include/subdev/vm.h

View file

13

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

View file

10

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

View file

6

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

View file

7

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

View file

274

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

View file

1

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

View file

45

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

View file

37

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

View file

36

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

View file

4

drivers/gpu/drm/nouveau/core/subdev/clock/pll.h

View file

17

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

View file

18

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

View file

23

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

View file

335

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

View file

3

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

View file

3

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

View file

4

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

View file

5

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

View file

78

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

View file

87

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

View file

90

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

View file

25

drivers/gpu/drm/nouveau/core/subdev/devinit/priv.h

View file

125

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

View file

54

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

View file

20

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

View file

32

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

View file

26

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

View file

9

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

View file

9

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

View file

9

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

View file

9

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

View file

25

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

View file

23

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

View file

22

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

View file

7

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

View file

Some files were not shown because too many files have changed in this diff Show more