diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-06-21 11:06:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-06-21 11:06:56 +1000 |
| commit | ab3d8479626d281f43db0d41b8e36f6a9bd9980a (patch) | |
| tree | 779a421a2659ddec0d34992804138e3e101857ad /include/linux | |
| parent | 91c93e475ca4b4bd5f1e8d525c9a9810283db056 (diff) | |
| parent | b9578c49456340ca4d3c7ddbaca054ffc2b51bc1 (diff) | |
Merge tag 'drm-misc-next-2024-06-20' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
drm-misc-next for 6.11:
UAPI Changes:
- New monochrome TV mode variant
Cross-subsystem Changes:
- dma heaps: Change slightly the allocation hook prototype
Core Changes:
Driver Changes:
- ivpu: various improvements over firmware handling, clocks, power
management, scheduling and logging.
- mgag200: Add BMC output, enable polling
- panfrost: Enable MT8188 support
- tidss: drm_panic support
- zynqmp_dp: IRQ cleanups, debugfs DP compliance testing API
- bridge:
- sii902x: state validation improvements
- panel:
- edp: Drop legacy panel compatibles
- simple-bridge: Switch to devm_drm_bridge_add
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240620-heretic-honored-macaque-b40f8a@houat
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-heap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h index 0c05561cad6e..064bad725061 100644 --- a/include/linux/dma-heap.h +++ b/include/linux/dma-heap.h @@ -23,8 +23,8 @@ struct dma_heap; struct dma_heap_ops { struct dma_buf *(*allocate)(struct dma_heap *heap, unsigned long len, - unsigned long fd_flags, - unsigned long heap_flags); + u32 fd_flags, + u64 heap_flags); }; /** |