From: Thomas Zimmermann Date: Mon, 20 Jun 2022 16:21:25 +0000 (+0200) Subject: Merge drm/drm-next into drm-misc-next X-Git-Tag: block-6.0-2022-08-12~28^2~20^2~48 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2b1333b80885b896807ffb6ccf4bc21d29aa65e0;p=linux-block.git Merge drm/drm-next into drm-misc-next Backmerging to get new regmap APIs of v5.19-rc1. Signed-off-by: Thomas Zimmermann --- 2b1333b80885b896807ffb6ccf4bc21d29aa65e0 diff --cc drivers/gpu/drm/bridge/Kconfig index c37dd0e964a4,8ffd601e68f9..1afe99dac0ff --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@@ -92,9 -92,8 +92,10 @@@ config DRM_ITE_IT650 select DRM_DISPLAY_HELPER select DRM_DP_AUX_BUS select DRM_KMS_HELPER + select DRM_DP_HELPER select EXTCON + select CRYPTO + select CRYPTO_HASH help ITE IT6505 DisplayPort bridge chip driver. diff --cc include/uapi/linux/dma-buf.h index 30fb8834aa3c,b1523cb8ab30..5a6fda66d9ad --- a/include/uapi/linux/dma-buf.h +++ b/include/uapi/linux/dma-buf.h @@@ -174,9 -92,7 +174,9 @@@ struct dma_buf_import_sync_file * between them in actual uapi, they're just different numbers. */ #define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *) - #define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, u32) - #define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, u64) + #define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, __u32) + #define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, __u64) +#define DMA_BUF_IOCTL_EXPORT_SYNC_FILE _IOWR(DMA_BUF_BASE, 2, struct dma_buf_export_sync_file) +#define DMA_BUF_IOCTL_IMPORT_SYNC_FILE _IOW(DMA_BUF_BASE, 3, struct dma_buf_import_sync_file) #endif