Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus

Browse source

* 'nouveau/for-airlied' of ../drm-nouveau-next:
  drm/nv50: prevent switching off SOR when in use for DVI-over-DP
  drm/nv50: fail auxch transaction if reply count not what we expect
  drm/nouveau: fix failure path if userspace specifies no valid memtypes
  drm/nouveau: report LVDS as disconnected if lid closed
  drm/nv50: prevent accidently turning off encoders we're actually using
  drm/nv50: fix alignment of per-channel fifo cache
  drm/nouveau: Evict buffers in VRAM before freeing sgdma
  drm/nouveau: Acknowledge DMA_VTX_PROTECTION PGRAPH interrupts
  drm/nouveau: fix thinko in nv04_instmem.c
  drm/nouveau: fix a race condition in nouveau_dma_wait()

...

This commit is contained in:

Dave Airlie 2010-01-25 16:04:11 +10:00

parent 1a961ce09f 162265367a

commit 8d586fe65a

13 changed files with 111 additions and 34 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/nouveau_connector.c

View file

76

drivers/gpu/drm/nouveau/nouveau_dma.c

View file

8

drivers/gpu/drm/nouveau/nouveau_dp.c

View file

4

drivers/gpu/drm/nouveau/nouveau_drv.c

View file

1

drivers/gpu/drm/nouveau/nouveau_drv.h

View file

1

drivers/gpu/drm/nouveau/nouveau_gem.c

View file

7

drivers/gpu/drm/nouveau/nouveau_irq.c

View file

1

drivers/gpu/drm/nouveau/nouveau_mem.c

View file

1

drivers/gpu/drm/nouveau/nouveau_state.c

View file

2

drivers/gpu/drm/nouveau/nv04_instmem.c

View file

22

drivers/gpu/drm/nouveau/nv50_crtc.c

View file

2

drivers/gpu/drm/nouveau/nv50_fifo.c

View file

13

drivers/gpu/drm/nouveau/nv50_sor.c

View file