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

Browse source

Nothing major ready for merging yet, so mostly bug fixes below, in addition to VP3 enablement from Ilia.

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau: fix command submission to use vmalloc for big allocations
  drm/nouveau/bios/therm: handle vbioses with duplicate entries (mostly nva5)
  drm/nouveau: use MSI interrupts
  drm/nv50-/kms: assume analog display connected if load on any pin
  drm/nv50/disp: prevent false output detection on the original nv50
  drm/nouveau/i2c: pass the function pointers in at creation time
  drm/nouveau/therm: survive to suspend/resume cycles
  drm/nouveau/timer: add a way to cancel alarms
  drm/nouveau/timer: restore the time on resume
  drm/nouveau/fan: restore pwm value on resume when in manual/auto mode
  drm/nouveau/therm: Set the correct pwm_mode upon resume
  drm/nouveau: require contiguous bo for framebuffer
  drm/nv50-/disp: use the number of dac, sor, pior rather than hardcoded values
  drm/nouveau: remove duplicate copy of nv44_graph_class
  drm/nouveau/vdec: implement support for VP3 engines
  drm/nouveau/core: get rid of math.h, replace log2i with order_base_2

...

This commit is contained in:

Dave Airlie 2013-09-04 14:28:53 +10:00

parent ef25bd84ed c859074e7d

commit d30645ae18

37 changed files with 323 additions and 145 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

3

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

View file

52

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

View file

15

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

View file

34

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

View file

3

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

View file

5

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

View file

3

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

View file

3

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

View file

3

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

View file

52

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

View file

47

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

View file

16

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

View file

8

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

View file

1

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

View file

2

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

View file

4

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

View file

3

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

View file

10

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

View file

2

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

View file

4

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

View file

4

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

View file

4

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

View file

8

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

View file

4

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

View file

10

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

View file

24

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

View file

3

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

View file

19

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

View file

20

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

View file

4

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

View file

21

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

View file

7

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

View file

35

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

View file

1

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

View file

5

drivers/gpu/drm/nouveau/nouveau_display.c

View file

27

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

2

drivers/gpu/drm/nouveau/nv50_display.c

View file