diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-08 14:02:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-08 14:02:32 +1000 |
| commit | b9e5071386007729110e86fd2c55c687085624e3 (patch) | |
| tree | 4720ecd2ee9be3f8c46e71d75119219db1692507 /drivers/gpu/drm/drm_edid.c | |
| parent | 85a7ce67f3ebfd5975ffd1febcabfe4999ca911d (diff) | |
| parent | cc4c0c4de3c775be22072ec3251f2e581b63d9a0 (diff) | |
Merge branch 'for-airlied' of git://people.freedesktop.org/~mlankhorst/linux into drm-next
TTM reservations changes, preparing for new reservation mutex system.
* 'for-airlied' of git://people.freedesktop.org/~mlankhorst/linux:
drm/ttm: unexport ttm_bo_wait_unreserved
drm/nouveau: use ttm_bo_reserve_slowpath in validate_init, v2
drm/ttm: use ttm_bo_reserve_slowpath_nolru in ttm_eu_reserve_buffers, v2
drm/ttm: add ttm_bo_reserve_slowpath
drm/ttm: cleanup ttm_eu_reserve_buffers handling
drm/ttm: remove lru_lock around ttm_bo_reserve
drm/nouveau: increase reservation sequence every retry
drm/vmwgfx: always use ttm_bo_is_reserved
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
0 files changed, 0 insertions, 0 deletions