Big thing is that drm-misc is now officially a group maintainer/committer model thing, with MAINTAINERS suitably updated. Otherwise just the usual pile of misc things all over, nothing that stands out this time around. * tag 'drm-misc-next-2016-11-29' of git://anongit.freedesktop.org/git/drm-misc: (33 commits) drm: Introduce drm_framebuffer_assign() drm/bridge: adv7511: Enable the audio data and clock pads on adv7533 drm/bridge: adv7511: Add Audio support drm/edid: Consider alternate cea timings to be the same VIC drm/atomic: Constify drm_atomic_crtc_needs_modeset() drm: bridge: dw-hdmi: add ASoC dependency drm: Fix shift operations for drm_fb_helper::drm_target_preferred() drm: Avoid NULL dereference for DRM_LEGACY debug message drm: Use u64_to_user_ptr() helper for blob ioctls drm: Fix conflicting macro parameter in drm_mm_for_each_node_in_range() drm: Fixup kernel doc for driver->gem_create_object drm/hisilicon/hibmc: mark PM functions __maybe_unused drm/hisilicon/hibmc: Checking for NULL instead of IS_ERR() drm: bridge: add DesignWare HDMI I2S audio support drm: Check against color expansion in drm_mm_reserve_node() drm: Define drm_mm_for_each_node_in_range() drm/doc: Fix links in drm_property.c MAINTAINERS: Add link to drm-misc documentation vgaarb: use valid dev pointer in vgaarb_info() drm/atomic: Unconfuse the old_state mess in commmit_tail ...
Showing the changes to include/uapi (1 of 45 files). Show all
Unified · Split
| @@ -408,17 +408,20 @@ struct drm_mode_fb_cmd2 { · 407 unmodified lines | |||
| 408 | * offsets[1]. Note that offsets[0] will generally | 408 | * offsets[1]. Note that offsets[0] will generally |
| 409 | * be 0 (but this is not required). | 409 | * be 0 (but this is not required). |
| 410 | * | 410 | * |
| 411 | * To accommodate tiled, compressed, etc formats, a per-plane | 411 | * To accommodate tiled, compressed, etc formats, a |
| 412 | * modifier can be specified. The default value of zero | 412 | * modifier can be specified. The default value of zero |
| 413 | * indicates "native" format as specified by the fourcc. | 413 | * indicates "native" format as specified by the fourcc. |
| 414 | * Vendor specific modifier token. This allows, for example, | 414 | * Vendor specific modifier token. Note that even though |
| 415 | * different tiling/swizzling pattern on different planes. | 415 | * it looks like we have a modifier per-plane, we in fact |
| 416 | * See discussion above of DRM_FORMAT_MOD_xxx. | 416 | * do not. The modifier for each plane must be identical. |
| 417 | * Thus all combinations of different data layouts for | ||
| 418 | * multi plane formats must be enumerated as separate | ||
| 419 | * modifiers. | ||
| 417 | */ | 420 | */ |
| 418 | __u32 handles[4]; | 421 | __u32 handles[4]; |
| 419 | __u32 pitches[4]; /* pitch for each plane */ | 422 | __u32 pitches[4]; /* pitch for each plane */ |
| 420 | __u32 offsets[4]; /* offset of each plane */ | 423 | __u32 offsets[4]; /* offset of each plane */ |
| 421 | __u64 modifier[4]; /* ie, tiling, compressed (per plane) */ | 424 | __u64 modifier[4]; /* ie, tiling, compress */ |
| 422 | }; | 425 | }; |
| 423 | 426 | ||
| 424 | #define DRM_MODE_FB_DIRTY_ANNOTATE_COPY 0x01 | 427 | #define DRM_MODE_FB_DIRTY_ANNOTATE_COPY 0x01 |