diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-09-23 02:35:25 -0400 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2016-09-23 02:52:12 -0400 |
commit | 226714dc7c6af6d0acee449eb2afce08d128edad (patch) | |
tree | c92085e67c8d4a2a0b4eb9fe9b692c6f76bbad76 /include/drm | |
parent | c654dd07522e88bacc546c9ccd81b3ee72838ccf (diff) |
drm: Fix plane type uabi breakage
Turns out assuming that only stuff in uabi is uabi is a bit naive, and
we have a bunch of properties for which the enum values are placed in
random headers. A proper fix would be to split out uapi include
headers, but meanwhile sprinkle at least some warning over them.
Fixes: 532b36712ddf ("drm/doc: Polish for drm_plane.[hc]")
Cc: Archit Taneja <architt@codeaurora.org>
Cc: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1474612525-9488-1-git-send-email-daniel.vetter@ffwll.ch
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_blend.h | 3 | ||||
-rw-r--r-- | include/drm/drm_plane.h | 19 |
2 files changed, 14 insertions, 8 deletions
diff --git a/include/drm/drm_blend.h b/include/drm/drm_blend.h index 868f0364e939..36baa175de99 100644 --- a/include/drm/drm_blend.h +++ b/include/drm/drm_blend.h | |||
@@ -33,6 +33,9 @@ struct drm_atomic_state; | |||
33 | * Rotation property bits. DRM_ROTATE_<degrees> rotates the image by the | 33 | * Rotation property bits. DRM_ROTATE_<degrees> rotates the image by the |
34 | * specified amount in degrees in counter clockwise direction. DRM_REFLECT_X and | 34 | * specified amount in degrees in counter clockwise direction. DRM_REFLECT_X and |
35 | * DRM_REFLECT_Y reflects the image along the specified axis prior to rotation | 35 | * DRM_REFLECT_Y reflects the image along the specified axis prior to rotation |
36 | * | ||
37 | * WARNING: These defines are UABI since they're exposed in the rotation | ||
38 | * property. | ||
36 | */ | 39 | */ |
37 | #define DRM_ROTATE_0 BIT(0) | 40 | #define DRM_ROTATE_0 BIT(0) |
38 | #define DRM_ROTATE_90 BIT(1) | 41 | #define DRM_ROTATE_90 BIT(1) |
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index 256219bfd07b..43cf193e54d6 100644 --- a/include/drm/drm_plane.h +++ b/include/drm/drm_plane.h | |||
@@ -333,9 +333,20 @@ struct drm_plane_funcs { | |||
333 | * DRM_CLIENT_CAP_UNIVERSAL_PLANES client capability bit to indicate that they | 333 | * DRM_CLIENT_CAP_UNIVERSAL_PLANES client capability bit to indicate that they |
334 | * wish to receive a universal plane list containing all plane types. See also | 334 | * wish to receive a universal plane list containing all plane types. See also |
335 | * drm_for_each_legacy_plane(). | 335 | * drm_for_each_legacy_plane(). |
336 | * | ||
337 | * WARNING: The values of this enum is UABI since they're exposed in the "type" | ||
338 | * property. | ||
336 | */ | 339 | */ |
337 | enum drm_plane_type { | 340 | enum drm_plane_type { |
338 | /** | 341 | /** |
342 | * @DRM_PLANE_TYPE_OVERLAY: | ||
343 | * | ||
344 | * Overlay planes represent all non-primary, non-cursor planes. Some | ||
345 | * drivers refer to these types of planes as "sprites" internally. | ||
346 | */ | ||
347 | DRM_PLANE_TYPE_OVERLAY, | ||
348 | |||
349 | /** | ||
339 | * @DRM_PLANE_TYPE_PRIMARY: | 350 | * @DRM_PLANE_TYPE_PRIMARY: |
340 | * | 351 | * |
341 | * Primary planes represent a "main" plane for a CRTC. Primary planes | 352 | * Primary planes represent a "main" plane for a CRTC. Primary planes |
@@ -353,14 +364,6 @@ enum drm_plane_type { | |||
353 | * DRM_IOCTL_MODE_CURSOR2 IOCTLs. | 364 | * DRM_IOCTL_MODE_CURSOR2 IOCTLs. |
354 | */ | 365 | */ |
355 | DRM_PLANE_TYPE_CURSOR, | 366 | DRM_PLANE_TYPE_CURSOR, |
356 | |||
357 | /** | ||
358 | * @DRM_PLANE_TYPE_OVERLAY: | ||
359 | * | ||
360 | * Overlay planes represent all non-primary, non-cursor planes. Some | ||
361 | * drivers refer to these types of planes as "sprites" internally. | ||
362 | */ | ||
363 | DRM_PLANE_TYPE_OVERLAY, | ||
364 | }; | 367 | }; |
365 | 368 | ||
366 | 369 | ||