diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-15 13:22:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-15 13:25:38 +1000 |
| commit | 1c974dc21898f9abbcb5e47ae9ddb7e6b473de2e (patch) | |
| tree | 60f76a234060d19c4d63335d292fc1b93330746a /drivers/gpu/drm/drm_edid.c | |
| parent | 354fb52cb6138de0e6cf84a0f6a7f3467586e390 (diff) | |
| parent | 12f735b79f0ad63964dedabed3eee8a581bb66a5 (diff) | |
Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus
* 'nouveau/for-airlied' of ../drm-nouveau-next: (44 commits)
drm/nouveau: check pushbuffer bounds in ioctl
drm/nouveau: reserve VGA area for the moment
drm/nouveau: Unset the EDID connector property when the EDID block goes away.
drm/nouveau: Fallback to analog load detection when the EDID block is invalid.
drm/nouveau: fix edid memleak in nouveau_connector
drm/nouveau: Break some long lines.
drm/nouveau: add NV18 device id to call_lvds_manufacturer_script
drm/nv50: Fix typo in PGRAPH initialisation.
drm/nouveau: less magic DCB 1.5 parsing
drm/nouveau: assume no nv04 board has a DCB table
drm/nouveau: remove PRIV0 check in nouveau_mem_close()
drm/nouveau: wait on fence after bo move if validating for another channel
drm/nouveau: trust init table registers are safe
drm/nv50: wait for pgraph to idle before unloading the context
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
0 files changed, 0 insertions, 0 deletions