diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-10 08:17:50 +1000 | 
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-10 08:17:50 +1000 | 
| commit | c3b6ef8633e75bdcde8e845548e3b95e9a21cdf6 (patch) | |
| tree | 4b97d4d8c955d0c62c2f0dc9dd1627ea07149a86 /drivers/gpu/drm/drm_ioctl.c | |
| parent | d8ab35575098b2d6dc10b2535aeb40545933ae56 (diff) | |
| parent | 2dc5d2ec0599bd96729f8a9b00d44b56e15d765d (diff) | |
| download | olio-linux-3.10-c3b6ef8633e75bdcde8e845548e3b95e9a21cdf6.tar.xz olio-linux-3.10-c3b6ef8633e75bdcde8e845548e3b95e9a21cdf6.zip  | |
Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-core-next
* 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next: (27 commits)
  drm/nvc0: fix typo in PRAMIN flush
  drm/nouveau: Fix DCB TMDS config parsing.
  drm/nv30: Fix PFB init for nv31.
  drm/nv04: Fix up SGRAM density detection.
  drm/i2c/ch7006: Don't use POWER_LEVEL_FULL_POWER_OFF on early chip versions.
  drm/nouveau: Init dcb->or on cards that have no usable DCB table.
  drm/nouveau: reduce severity of some "error" messages
  drm/nvc0: backup bar3 channel on suspend
  drm/nouveau: implement init table opcodex 0x5e and 0x9a
  drm/nouveau: implement init table op 0x57, INIT_LTIME
  drm/nvc0: implement crtc pll setting
  drm/nvc0: fix evo dma object so we display something
  drm/nvc0: rudimentary instmem support
  drm/nvc0: implement memory detection
  drm/nvc0: allow INIT_GPIO
  drm/nvc0: starting point for GF100 support, everything stubbed
  drm/nv30: Workaround dual TMDS brain damage.
  drm/nouveau: No need to set slave TV encoder configs explicitly.
  drm/nv17-nv4x: Attempt to init some external TMDS transmitters.
  drm/nv10: Fix up switching of NV10TCL_DMA_VTXBUF.
  ...
Diffstat (limited to 'drivers/gpu/drm/drm_ioctl.c')
0 files changed, 0 insertions, 0 deletions