Pull drm update from Dave Airlie: "Exynos and Radeon mostly, with a dma-buf and ttm fix thrown in. It's a bit big but its mostly exynos license fix ups and I'd rather not hold those up since its legally stuff. Radeon has a couple of fixes from dma engine work, TTM is just a locking fix, and dma-buf fix has been hanging around and I finally got a chance to review it." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (30 commits) drm/ttm: fix fence locking in ttm_buffer_object_transfer drm/prime: drop reference on imported dma-buf come from gem drm/radeon: add quirk for d3 delay during switcheroo poweron for apple macbooks drm/exynos: move finish page flip to a common place drm/exynos: fimd: modify condition in fimd resume drm/radeon: fix DMA CS parser for r6xx linear copy packet drm/radeon: split r6xx and r7xx copy_dma functions drm/exynos: Use devm_clk_get in exynos_drm_gsc.c drm/exynos: Remove redundant NULL check in exynos_drm_gsc.c drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_gsc.c drm/exynos: Use devm_clk_get in exynos_drm_rotator.c drm/exynos: Remove redundant NULL check in exynos_drm_rotator.c drm/exynos: Remove unnecessary devm_* freeing APIs in exynos_drm_rotator.c drm/exynos: Use devm_clk_get in exynos_drm_fimc.c drm/exynos: Remove redundant NULL check drm/exynos: Remove explicit freeing using devm_* APIs in exynos_drm_fimc.c drm/exynos: Use devm_kzalloc in exynos_drm_ipp.c drm/exynos: fix gem buffer allocation type checking drm/exynos: remove needless parenthesis. drm/exynos: fix incorrect interrupt induced by m2m operation. ...
Showing the changes to include/uapi (1 of 48 files). Show all
Unified · Split
| @@ -6,24 +6,10 @@ · 5 unmodified lines | ||
| 6 | 6 | * Joonyoung Shim <jy0922.shim@samsung.com> |
| 7 | 7 | * Seung-Woo Kim <sw0312.kim@samsung.com> |
| 8 | 8 | * |
| 9 | − * Permission is hereby granted, free of charge, to any person obtaining a | |
| 10 | − * copy of this software and associated documentation files (the "Software"), | |
| 11 | − * to deal in the Software without restriction, including without limitation | |
| 12 | − * the rights to use, copy, modify, merge, publish, distribute, sublicense, | |
| 13 | − * and/or sell copies of the Software, and to permit persons to whom the | |
| 14 | − * Software is furnished to do so, subject to the following conditions: | |
| 15 | − * | |
| 16 | − * The above copyright notice and this permission notice (including the next | |
| 17 | − * paragraph) shall be included in all copies or substantial portions of the | |
| 18 | − * Software. | |
| 19 | − * | |
| 20 | − * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
| 21 | − * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
| 22 | − * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | |
| 23 | − * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR | |
| 24 | − * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | |
| 25 | − * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | |
| 26 | − * OTHER DEALINGS IN THE SOFTWARE. | |
| 9 | + * This program is free software; you can redistribute it and/or modify it | |
| 10 | + * under the terms of the GNU General Public License as published by the | |
| 11 | + * Free Software Foundation; either version 2 of the License, or (at your | |
| 12 | + * option) any later version. | |
| 27 | 13 | */ |
| 28 | 14 | |
| 29 | 15 | #ifndef _UAPI_EXYNOS_DRM_H_ |
| @@ -185,6 +171,8 @@ enum drm_exynos_flip { · 155 unmodified lines | ||
| 185 | 171 | EXYNOS_DRM_FLIP_NONE = (0 << 0), |
| 186 | 172 | EXYNOS_DRM_FLIP_VERTICAL = (1 << 0), |
| 187 | 173 | EXYNOS_DRM_FLIP_HORIZONTAL = (1 << 1), |
| 174 | + EXYNOS_DRM_FLIP_BOTH = EXYNOS_DRM_FLIP_VERTICAL | | |
| 175 | + EXYNOS_DRM_FLIP_HORIZONTAL, | |
| 188 | 176 | }; |
| 189 | 177 | |
| 190 | 178 | enum drm_exynos_degree { |