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

Browse source

* 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2.6: (353 commits)
  drm/nouveau: remove allocations from gart populate() hook
  drm/nvc0/fb: slightly improve PMFB intr handling, move out of nvc0_graph.c
  drm/nvc0/fifo: avoid touching missing subfifos
  drm/nvd9/disp: bail out of mode_set_base if no fb bound to crtc
  drm/nvd9/disp: stub some more api hooks so we don't oops on resume
  drm/nouveau: fix printk typo in ioremap failure path
  drm/nvc0/pm: minor clock readback fixes
  drm/nv40/pm: execute memory reset script from vbios
  drm/nv50/gr: refactor initialisation
  drm/nouveau: if requested, try harder at disabling sysmem pushbufs
  drm/nv50/gr: enable ctxprog xfer only when we need it to save power
  drm/nouveau/dp: add support for displayport table 0x30
  drm/nouveau/dp: return master dp table pointer too when looking up encoder
  drm/nouveau/bios: simplify U/d table hash matching func to just match
  drm/nouveau/dp: preserve non-pattern bits in DP_TRAINING_PATTERN_SET
  drm/nvc0/gr: remove MODULE_FIRMWARE() lines
  drm/nouveau/dp: use alternate lane mask for nvaf
  drm/nouveau/dp: link rate scripts are selected with a comparison table
  drm/nv40/pm: write nv40-specific reclocking routines
  drm/nv40/pm: parse geometric delta clock from vbios
  ...

...

This commit is contained in:

Dave Airlie 2011-09-20 09:35:22 +01:00

parent fcf4de5acf a0d9a8feb9

commit b2d108ba33

282 changed files with 6515 additions and 2803 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

5

drivers/base/regmap/regmap.c

View file

12

drivers/bcma/main.c

View file

1

drivers/bluetooth/ath3k.c

View file

13

drivers/bluetooth/btusb.c

View file

34

drivers/clocksource/sh_cmt.c

View file

42

drivers/dma/ste_dma40.c

View file

1

drivers/gpu/drm/drm_fb_helper.c

View file

9

drivers/gpu/drm/nouveau/Makefile

View file

169

drivers/gpu/drm/nouveau/nouveau_backlight.c

View file

275

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_bo.c

View file

16

drivers/gpu/drm/nouveau/nouveau_channel.c

View file

52

drivers/gpu/drm/nouveau/nouveau_connector.c

View file

3

drivers/gpu/drm/nouveau/nouveau_crtc.h

View file

9

drivers/gpu/drm/nouveau/nouveau_display.c

View file

1033

drivers/gpu/drm/nouveau/nouveau_dp.c

View file

2

drivers/gpu/drm/nouveau/nouveau_drv.c

View file

121

drivers/gpu/drm/nouveau/nouveau_drv.h

View file

27

drivers/gpu/drm/nouveau/nouveau_encoder.h

View file

5

drivers/gpu/drm/nouveau/nouveau_fence.c

View file

56

drivers/gpu/drm/nouveau/nouveau_i2c.c

View file

282

drivers/gpu/drm/nouveau/nouveau_mem.c

View file

87

drivers/gpu/drm/nouveau/nouveau_mm.c

View file

5

drivers/gpu/drm/nouveau/nouveau_mm.h

View file

18

drivers/gpu/drm/nouveau/nouveau_object.c

View file

118

drivers/gpu/drm/nouveau/nouveau_perf.c

View file

100

drivers/gpu/drm/nouveau/nouveau_pm.c

View file

15

drivers/gpu/drm/nouveau/nouveau_pm.h

View file

11

drivers/gpu/drm/nouveau/nouveau_reg.h

View file

67

drivers/gpu/drm/nouveau/nouveau_sgdma.c

View file

210

drivers/gpu/drm/nouveau/nouveau_state.c

View file

40

drivers/gpu/drm/nouveau/nouveau_vm.c

View file

2

drivers/gpu/drm/nouveau/nouveau_vm.h

View file

46

drivers/gpu/drm/nouveau/nouveau_volt.c

View file

15

drivers/gpu/drm/nouveau/nv04_crtc.c

View file

23

drivers/gpu/drm/nouveau/nv04_display.c

View file

4

drivers/gpu/drm/nouveau/nv04_pm.c

View file

84

drivers/gpu/drm/nouveau/nv04_timer.c

View file

89

drivers/gpu/drm/nouveau/nv40_mpeg.c → drivers/gpu/drm/nouveau/nv31_mpeg.c

View file

338

drivers/gpu/drm/nouveau/nv40_pm.c

View file

14

drivers/gpu/drm/nouveau/nv50_crtc.c

View file

18

drivers/gpu/drm/nouveau/nv50_cursor.c

View file

76

drivers/gpu/drm/nouveau/nv50_display.c

View file

31

drivers/gpu/drm/nouveau/nv50_gpio.c

View file

116

drivers/gpu/drm/nouveau/nv50_graph.c

View file

11

drivers/gpu/drm/nouveau/nv50_grctx.c

View file

8

drivers/gpu/drm/nouveau/nv50_pm.c

View file

42

drivers/gpu/drm/nouveau/nv50_sor.c

View file

4

drivers/gpu/drm/nouveau/nv50_vram.c

View file

414

drivers/gpu/drm/nouveau/nva3_pm.c

View file

27

drivers/gpu/drm/nouveau/nvc0_fb.c

View file

2

drivers/gpu/drm/nouveau/nvc0_fifo.c

View file

40

drivers/gpu/drm/nouveau/nvc0_graph.c

View file

1

drivers/gpu/drm/nouveau/nvc0_graph.h

View file

13

drivers/gpu/drm/nouveau/nvc0_grctx.c

View file

8

drivers/gpu/drm/nouveau/nvc0_grgpc.fuc

View file

29

drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h

View file

3

drivers/gpu/drm/nouveau/nvc0_grhub.fuc

View file

16

drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h

View file

155

drivers/gpu/drm/nouveau/nvc0_pm.c

View file

50

drivers/gpu/drm/nouveau/nvc0_vram.c

View file

1473

drivers/gpu/drm/nouveau/nvd0_display.c

View file

27

drivers/gpu/drm/radeon/evergreen.c

View file

3

drivers/gpu/drm/radeon/ni.c

View file

3

drivers/gpu/drm/radeon/radeon_clocks.c

View file

37

drivers/gpu/drm/radeon/radeon_connectors.c

View file

19

drivers/gpu/drm/radeon/radeon_display.c

View file

1

drivers/hid/hid-ids.h

View file

66

drivers/hid/hid-magicmouse.c

View file

22

drivers/hid/hid-wacom.c

View file

1

drivers/hid/usbhid/hid-quirks.c

View file

2

drivers/hwmon/max16065.c

View file

6

drivers/hwmon/pmbus/ucd9000.c

View file

6

drivers/hwmon/pmbus/ucd9200.c

View file

5

drivers/i2c/busses/i2c-pxa-pci.c

View file

58

drivers/i2c/busses/i2c-tegra.c

View file

18

drivers/iommu/amd_iommu.c

View file

2

drivers/md/linear.h

View file

28

drivers/md/md.c

View file

14

drivers/md/raid1.c

View file

47

drivers/md/raid10.c

View file

2

drivers/md/raid5.c

View file

26

drivers/media/dvb/dvb-usb/vp7045.c

View file

45

drivers/media/rc/nuvoton-cir.c

View file

1

drivers/media/rc/nuvoton-cir.h

View file

22

drivers/media/video/gspca/ov519.c

View file

6

drivers/media/video/gspca/sonixj.c

View file

2

drivers/media/video/pwc/pwc-v4l.c

View file

2

drivers/media/video/via-camera.c

View file

35

drivers/mmc/core/core.c

View file

12

drivers/mmc/core/host.c

View file

8

drivers/mmc/core/host.h

View file

81

drivers/mmc/core/sd.c

View file

1

drivers/mmc/host/sdhci-esdhc-imx.c

View file

2

drivers/mmc/host/sdhci-s3c.c

View file

4

drivers/mmc/host/sh_mobile_sdhi.c

View file

2

drivers/mtd/ubi/debug.h

View file

3

drivers/net/arm/am79c961a.c

View file

3

drivers/net/can/ti_hecc.c

View file

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