drm-misc-next for 5.5: UAPI Changes: -syncobj: allow querying the last submitted timeline value (David) -fourcc: explicitly defineDRM_FORMAT_BIG_ENDIAN as unsigned (Adam) -omap: revert the OMAP_BO_* flags that were added -- no userspace (Sean) Cross-subsystem Changes: -MAINTAINERS: add Mihail as komeda co-maintainer (Mihail) Core Changes: -edid: a few cleanups, add AVI infoframe bar info (Ville) -todo: remove i915 device_link item and add difficulty levels (Daniel) -dp_helpers: add a few new helpers to parse dpcd (Thierry) Driver Changes: -gma500: fix a few memory disclosure leaks (Kangjie) -qxl: convert to use the new drm_gem_object_funcs.mmap (Gerd) -various: open code dp_link helpers in preparation for helper removal (Thierry) Cc: Chunming Zhou <david1.zhou@amd.com> Cc: Adam Jackson <ajax@redhat.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Kangjie Lu <kjlu@umn.edu> Cc: Mihail Atanassov <mihail.atanassov@arm.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Thierry Reding <treding@nvidia.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Showing the changes to include/uapi (3 of 137 files). Show all
Unified · Split
| @@ -778,11 +778,12 @@ struct drm_syncobj_array { · 777 unmodified lines | |||
| 778 | __u32 pad; | 778 | __u32 pad; |
| 779 | }; | 779 | }; |
| 780 | 780 | ||
| 781 | #define DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED (1 << 0) /* last available point on timeline syncobj */ | ||
| 781 | struct drm_syncobj_timeline_array { | 782 | struct drm_syncobj_timeline_array { |
| 782 | __u64 handles; | 783 | __u64 handles; |
| 783 | __u64 points; | 784 | __u64 points; |
| 784 | __u32 count_handles; | 785 | __u32 count_handles; |
| 785 | __u32 pad; | 786 | __u32 flags; |
| 786 | }; | 787 | }; |
| 787 | 788 | ||
| 788 | 789 | ||
| @@ -69,7 +69,7 @@ extern "C" { · 68 unmodified lines | |||
| 69 | #define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \ | 69 | #define fourcc_code(a, b, c, d) ((__u32)(a) | ((__u32)(b) << 8) | \ |
| 70 | ((__u32)(c) << 16) | ((__u32)(d) << 24)) | 70 | ((__u32)(c) << 16) | ((__u32)(d) << 24)) |
| 71 | 71 | ||
| 72 | #define DRM_FORMAT_BIG_ENDIAN (1<<31) /* format is big endian instead of little endian */ | 72 | #define DRM_FORMAT_BIG_ENDIAN (1U<<31) /* format is big endian instead of little endian */ |
| 73 | 73 | ||
| 74 | /* Reserve 0 for the invalid format specifier */ | 74 | /* Reserve 0 for the invalid format specifier */ |
| 75 | #define DRM_FORMAT_INVALID 0 | 75 | #define DRM_FORMAT_INVALID 0 |
| @@ -38,20 +38,20 @@ struct drm_omap_param { · 37 unmodified lines | |||
| 38 | __u64 value; /* in (set_param), out (get_param) */ | 38 | __u64 value; /* in (set_param), out (get_param) */ |
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | #define OMAP_BO_SCANOUT 0x00000001 /* scanout capable (phys contiguous) */ | 41 | /* Scanout buffer, consumable by DSS */ |
| 42 | #define OMAP_BO_CACHE_MASK 0x00000006 /* cache type mask, see cache modes */ | 42 | #define OMAP_BO_SCANOUT 0x00000001 |
| 43 | #define OMAP_BO_TILED_MASK 0x00000f00 /* tiled mapping mask, see tiled modes */ | ||
| 44 | 43 | ||
| 45 | /* cache modes */ | 44 | /* Buffer CPU caching mode: cached, write-combining or uncached. */ |
| 46 | #define OMAP_BO_CACHED 0x00000000 /* default */ | 45 | #define OMAP_BO_CACHED 0x00000000 |
| 47 | #define OMAP_BO_WC 0x00000002 /* write-combine */ | 46 | #define OMAP_BO_WC 0x00000002 |
| 48 | #define OMAP_BO_UNCACHED 0x00000004 /* strongly-ordered (uncached) */ | 47 | #define OMAP_BO_UNCACHED 0x00000004 |
| 48 | #define OMAP_BO_CACHE_MASK 0x00000006 | ||
| 49 | 49 | ||
| 50 | /* tiled modes */ | 50 | /* Use TILER for the buffer. The TILER container unit can be 8, 16 or 32 bits. */ |
| 51 | #define OMAP_BO_TILED_8 0x00000100 | 51 | #define OMAP_BO_TILED_8 0x00000100 |
| 52 | #define OMAP_BO_TILED_16 0x00000200 | 52 | #define OMAP_BO_TILED_16 0x00000200 |
| 53 | #define OMAP_BO_TILED_32 0x00000300 | 53 | #define OMAP_BO_TILED_32 0x00000300 |
| 54 | #define OMAP_BO_TILED (OMAP_BO_TILED_8 | OMAP_BO_TILED_16 | OMAP_BO_TILED_32) | 54 | #define OMAP_BO_TILED_MASK 0x00000f00 |
| 55 | 55 | ||
| 56 | union omap_gem_size { | 56 | union omap_gem_size { |
| 57 | __u32 bytes; /* (for non-tiled formats) */ | 57 | __u32 bytes; /* (for non-tiled formats) */ |