diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-29 14:49:36 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-29 14:49:36 -0400 |
| commit | 4dac3edfe68e5e1b3c2216b84ba160572420fa40 (patch) | |
| tree | 924c0d117dbcc6d374eea603ed64e627b35b043b /include/uapi | |
| parent | 487777673e355ab9f0b7cac4ad1207be9d36156f (diff) | |
| parent | e05444be705b5c7c7f85d7722b6f97f3a6732d54 (diff) | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
Pull in drm-next with Dave's DP MST support so that I can merge some
conflicting patches which also touch the driver load sequencing around
interrupt handling.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/drm/drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 9abbeb924cbb..b0b855613641 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h | |||
| @@ -780,7 +780,7 @@ struct drm_prime_handle { | |||
| 780 | 780 | ||
| 781 | /** | 781 | /** |
| 782 | * Device specific ioctls should only be in their respective headers | 782 | * Device specific ioctls should only be in their respective headers |
| 783 | * The device specific ioctl range is from 0x40 to 0x99. | 783 | * The device specific ioctl range is from 0x40 to 0x9f. |
| 784 | * Generic IOCTLS restart at 0xA0. | 784 | * Generic IOCTLS restart at 0xA0. |
| 785 | * | 785 | * |
| 786 | * \sa drmCommandNone(), drmCommandRead(), drmCommandWrite(), and | 786 | * \sa drmCommandNone(), drmCommandRead(), drmCommandWrite(), and |