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

Browse source

"Nothing overly exciting here aside from calim's fermi/kepler vram
compression patches.  The rest is misc fixes I gathered from the list.

Most of the stuff from me is fixing issues that have come up from the
work on kepler PM, as well as a commit moving all the old-school
modesetting out of the way (no code changes here).  There's other
patches to go on top of that, but, it'll have to wait until I can rip
out the old PM code, it's a bit tangled."

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (38 commits)
  drm/nouveau/fifo: implement channel creation event generation
  drm/nouveau/core: allow non-maskable events
  drm/nouveau/timer: allow alarms to be cancelled
  drm/nouveau/device: tweak the device/subdev relationship a little
  drm/nouveau/device: enable proper constructor/destructor
  drm/nouveau/device: have engine object initialised before creation
  drm/nouveau/device: convert to engine, rather than subdev
  drm/nv50-/disp: use self as parent for subobjects
  drm/nv50-/fifo: use parent as self for subobjects
  drm/nv20-nv30/gr: use parent as self for subobjects
  drm/nvc0-/gr: use self as parent for subobjects
  drm/nv04-nv40/instmem: use self as parent for subobjects
  drm/nv04-nv40/vm: use self as parent for subobjects
  drm/nv50-/bar: use self as parent for subobjects
  drm/nv04-nv40/instmem: remove parent deref hack
  drm/nouveau/i2c: remove parent deref hack
  drm/nouveau/core: rebase object ref/use counts after ctor/init/fini events
  drm/nv50/disp: inform core when we're not creating a new context
  drm/nouveau/therm: send some messages to debug level
  drm/nve0/gr: add handling for a bunch of PGRAPH traps
  ...

...

This commit is contained in:

Dave Airlie 2013-04-26 15:42:02 +10:00

parent a90b590e95 893e90c554

commit 36d9b1541c

129 changed files with 10207 additions and 9535 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

25

drivers/gpu/drm/nouveau/Makefile

View file

7

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

View file

4

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

View file

12

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

View file

19

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

View file

8

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

View file

183

drivers/gpu/drm/nouveau/core/subdev/device/base.c → drivers/gpu/drm/nouveau/core/engine/device/base.c

View file

2

drivers/gpu/drm/nouveau/core/subdev/device/nv04.c → drivers/gpu/drm/nouveau/core/engine/device/nv04.c

View file

2

drivers/gpu/drm/nouveau/core/subdev/device/nv10.c → drivers/gpu/drm/nouveau/core/engine/device/nv10.c

View file

2

drivers/gpu/drm/nouveau/core/subdev/device/nv20.c → drivers/gpu/drm/nouveau/core/engine/device/nv20.c

View file

2

drivers/gpu/drm/nouveau/core/subdev/device/nv30.c → drivers/gpu/drm/nouveau/core/engine/device/nv30.c

View file

2

drivers/gpu/drm/nouveau/core/subdev/device/nv40.c → drivers/gpu/drm/nouveau/core/engine/device/nv40.c

View file

20

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

View file

30

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

View file

2

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

View file

2

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

View file

5

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

View file

3

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

View file

7

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

View file

18

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

View file

22

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

View file

9

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

View file

7

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

View file

51

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

View file

13

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

View file

5

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

View file

3

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

View file

2

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

View file

2

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

View file

2

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

View file

2

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

View file

2

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

View file

2

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

View file

10

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

View file

10

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

View file

31

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

View file

3

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

View file

230

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

View file

29

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

View file

6

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

View file

4

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

View file

1

drivers/gpu/drm/nouveau/core/include/subdev/device.h → drivers/gpu/drm/nouveau/core/include/engine/device.h

View file

3

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

View file

4

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

View file

7

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

View file

28

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

View file

1

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

View file

1

drivers/gpu/drm/nouveau/core/os.h

View file

22

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

View file

14

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

View file

56

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

View file

72

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

View file

6

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

View file

20

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

View file

1

drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h

View file

12

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

View file

129

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

View file

60

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

1

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

View file

2

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

View file

181

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

View file

221

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

View file

2

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

View file

2

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

View file

3

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

View file

14

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

View file

13

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

View file

2

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

View file

2

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

View file

2

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

View file

58

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

View file

10

drivers/gpu/drm/nouveau/dispnv04/Makefile

View file

2

drivers/gpu/drm/nouveau/nouveau_calc.c → drivers/gpu/drm/nouveau/dispnv04/arb.c

View file

5

drivers/gpu/drm/nouveau/nv04_crtc.c → drivers/gpu/drm/nouveau/dispnv04/crtc.c

View file

3

drivers/gpu/drm/nouveau/nv04_cursor.c → drivers/gpu/drm/nouveau/dispnv04/cursor.c

View file

2

drivers/gpu/drm/nouveau/nv04_dac.c → drivers/gpu/drm/nouveau/dispnv04/dac.c

View file

2

drivers/gpu/drm/nouveau/nv04_dfp.c → drivers/gpu/drm/nouveau/dispnv04/dfp.c

View file

2

drivers/gpu/drm/nouveau/nv04_display.c → drivers/gpu/drm/nouveau/dispnv04/disp.c

View file

0

drivers/gpu/drm/nouveau/nv04_display.h → drivers/gpu/drm/nouveau/dispnv04/disp.h

View file

2

drivers/gpu/drm/nouveau/nouveau_hw.c → drivers/gpu/drm/nouveau/dispnv04/hw.c

View file

3

drivers/gpu/drm/nouveau/nouveau_hw.h → drivers/gpu/drm/nouveau/dispnv04/hw.h

View file

0

drivers/gpu/drm/nouveau/nvreg.h → drivers/gpu/drm/nouveau/dispnv04/nvreg.h

View file

4

drivers/gpu/drm/nouveau/nv17_tv_modes.c → drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c

View file

2

drivers/gpu/drm/nouveau/nv04_tv.c → drivers/gpu/drm/nouveau/dispnv04/tvnv04.c

View file

4

drivers/gpu/drm/nouveau/nv17_tv.c → drivers/gpu/drm/nouveau/dispnv04/tvnv17.c

View file

0

drivers/gpu/drm/nouveau/nv17_tv.h → drivers/gpu/drm/nouveau/dispnv04/tvnv17.h

View file

12

drivers/gpu/drm/nouveau/nouveau_abi16.c

View file

3

drivers/gpu/drm/nouveau/nouveau_backlight.c

View file

2

drivers/gpu/drm/nouveau/nouveau_bios.c

View file

2

drivers/gpu/drm/nouveau/nouveau_bios.h

View file

2

drivers/gpu/drm/nouveau/nouveau_connector.c

View file

2

drivers/gpu/drm/nouveau/nouveau_display.c

View file

23

drivers/gpu/drm/nouveau/nouveau_drm.c

View file

13

drivers/gpu/drm/nouveau/nouveau_drm.h

View file

2

drivers/gpu/drm/nouveau/nouveau_encoder.h

View file

76

drivers/gpu/drm/nouveau/nouveau_irq.c

View file

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