diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-25 18:24:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-25 18:24:30 -0500 |
| commit | 74a7f6a0a61f1f5addd0afa789785f4cefcfcafc (patch) | |
| tree | 0172864707218626c857125d5a212e4e1933a058 /include | |
| parent | 486bc794abfdc10fcb417fbb0b781b46e1e70aef (diff) | |
| parent | 9f1feed2e16652a6e599ed4a73b4c501bb3d4568 (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/ttm: fix two regressions since move_notify changes
drm/radeon: avoid deadlock if GPU lockup is detected in ib_pool_get
drm/radeon: silence out possible lock dependency warning
drm: Fix authentication kernel crash
gma500: Fix shmem mapping
drm/radeon/kms: refine TMDS dual link checks
drm/radeon/kms: use drm_detect_hdmi_monitor for picking encoder mode
drm/radeon/kms: rework modeset sequence for DCE41 and DCE5
drm/radeon/kms: move panel mode setup into encoder mode set
drm/radeon/kms: move disp eng pll setup to init path
drm/radeon: finish getting bios earlier
drm/radeon: fix invalid memory access in radeon_atrm_get_bios()
drm/radeon/kms: add some missing semaphore init
drm/radeon/kms: Add an MSI quirk for Dell RS690
gpu, drm, sis: Don't return uninitialized variable from sis_driver_load()
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drmP.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 76caa67c22e2..92f0981b5fb8 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
| @@ -1328,6 +1328,7 @@ extern int drm_getmagic(struct drm_device *dev, void *data, | |||
| 1328 | struct drm_file *file_priv); | 1328 | struct drm_file *file_priv); |
| 1329 | extern int drm_authmagic(struct drm_device *dev, void *data, | 1329 | extern int drm_authmagic(struct drm_device *dev, void *data, |
| 1330 | struct drm_file *file_priv); | 1330 | struct drm_file *file_priv); |
| 1331 | extern int drm_remove_magic(struct drm_master *master, drm_magic_t magic); | ||
| 1331 | 1332 | ||
| 1332 | /* Cache management (drm_cache.c) */ | 1333 | /* Cache management (drm_cache.c) */ |
| 1333 | void drm_clflush_pages(struct page *pages[], unsigned long num_pages); | 1334 | void drm_clflush_pages(struct page *pages[], unsigned long num_pages); |