diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-20 17:46:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-20 17:54:13 +1000 |
| commit | 1f3a574a4bfe86ebf7d51fac37e0668397372fd8 (patch) | |
| tree | 86308b3a63ea03151eff6e6b5c4ea96e2f509993 /drivers/video/of_display_timing.c | |
| parent | b81e059ec5a7128622ab5d74d78e9b4f361b54ae (diff) | |
| parent | a91ed42de25e7e81159c0dd59faf8cac9dfa1d32 (diff) | |
| download | blackbird-obmc-linux-1f3a574a4bfe86ebf7d51fac37e0668397372fd8.tar.gz blackbird-obmc-linux-1f3a574a4bfe86ebf7d51fac37e0668397372fd8.zip | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
Nothing terribly exciting in here probably:
- reworked thermal stuff from mupuf/I, has a chance of possibly working
well enough when we get to being able to reclock..
- driver will report mmio access faults on chipsets where it's supported
- will now sleep waiting on fences on nv84+ rather than polling
- some cleanup of the internal fencing, looking towards sli/dmabuf sync
- initial support for anx9805 dp/tmds encoder
- nv50+ display fixes related to the above, and also might fix a few
other issues
- nicer error reporting (will log process names with channel errors)
- various other random fixes
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (87 commits)
nouveau: ACPI support depends on X86 and X86_PLATFORM_DEVICES
drm/nouveau/i2c: add support for ddc/aux, and dp link training on anx9805
drm/nv50: initial kms support for off-chip TMDS/DP encoders
drm/nv50-/disp: initial supervisor support for off-chip encoders
drm/nv50-/disp: initial work towards supporting external encoders
drm/nv50-/kms: remove unnecessary wait-for-completion points
drm/nv50-/disp: move DP link training to core and train from supervisor
drm/nv50-/disp: handle supervisor tasks from workqueue
drm/nouveau/i2c: create proper chipset-specific class implementations
drm/nv50-/disp: 0x0000 is a valid udisp config value
drm/nv50/devinit: reverse the logic for running encoder init scripts
drm/nouveau/bios: store a type/mask hash in parsed dcb data
drm/nouveau/i2c: extend type to 16-bits, add lookup-by-type function
drm/nouveau/i2c: aux channels not necessarily on nvio
drm/nouveau/i2c: fix a bit of a thinko in nv_wri2cr helper functions
drm/nouveau/bios: parse external transmitter type if off-chip
drm/nouveau: store i2c port pointer directly in nouveau_encoder
drm/nouveau/i2c: handle i2c/aux mux outside of port lookup function
drm/nv50/graph: avoid touching 400724, it doesn't exist
drm/nouveau: Fix DPMS 1 on G4 Snowball, from snow white to coal black.
...
Diffstat (limited to 'drivers/video/of_display_timing.c')
0 files changed, 0 insertions, 0 deletions
