History

Merge tag 'drm-misc-next-2021-01-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next for v5.12: UAPI Changes: - Fix fourcc macro for amlogic video fbc. Cross-subsystem Changes: - Export pci_rebar_bytes_to_size. - Add a PCI quirk to increase bar0 for RX 5600 XT Pulse to max possible size. - Convert devicetree bindings to use the OF graph schema. - Update s6e63m0 bindings. - Make omapfb2 DSI_CM incompatible with drm/omap2 DSI-CM because of module conflicts. - Add Zack Rusin as vmwgfx maintainer. - Add CONFIG_DMABUF_DEBUG for validating dma-buf users don't loo kat struct page when importing or detaching. Core Changes: - Remove references to drm_device.pdev - Fix regression in ttm_bo_move_to_lru_tail(). - Assorted docbook updates. - Do not send dp-mst hotplug events on error when probing. - Move some agp macros to agpsupport.c, so it's not always compiled. - Move drm_need_swiotlb.h to drm_cache.c - Only build drm_memory.o for legacy drivers, and move CONFIG_DRM_VM to legacy. - Nuke drm_device.hose - Warn when the ttm resource manager is non-empty when disabling. - Assorted small fixes. Driver Changes: - Small assorted fixes in radeon, v3d, hisilicon, mipi-dbi, panfrost, hibmc, vc4, amdgpu, vkms, vmwgfx. - Move hisilicon to use simple encode. - Add writeback connector to vkms. - Add support for BT2020 to DE3. - Use gem prime mmap helpers in vc4, and move the mmap function upwards. - Use managed drm device, and cleanup error paths and display registers in vmwgfx. - Use correct bus_format and connector_type for innolux_n116bge. - Fix a lot of warnings with W=1 (Lee Jones)

Daniel Vetter committed 5 years ago

Commit 71c46fc2 parents 1777b18 c31eb10229 files · +1500 −2273Browse files

Showing the changes to include/uapi (1 of 229 files). Show all

Unified · Split

include/uapi/drm/drm_fourcc.h+2−2
@@ -1036,9 +1036,9 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) · 1035 unmodified lines
1036 * Not all combinations are valid, and different SoCs may support different1036 * Not all combinations are valid, and different SoCs may support different
1037 * combinations of layout and options.1037 * combinations of layout and options.
1038 */1038 */
1039#define __fourcc_mod_amlogic_layout_mask 0xf1039#define __fourcc_mod_amlogic_layout_mask 0xff
1040#define __fourcc_mod_amlogic_options_shift 81040#define __fourcc_mod_amlogic_options_shift 8
1041#define __fourcc_mod_amlogic_options_mask 0xf1041#define __fourcc_mod_amlogic_options_mask 0xff
1042 1042
1043#define DRM_FORMAT_MOD_AMLOGIC_FBC(__layout, __options) \1043#define DRM_FORMAT_MOD_AMLOGIC_FBC(__layout, __options) \
1044 fourcc_mod_code(AMLOGIC, \1044 fourcc_mod_code(AMLOGIC, \