Hi Linus, As mentioned in the first PR there was some additional intel code for color operations we wanted to land. However I discovered I missed a pull for the xe vfio driver which I had sorted into 6.20 in my brain, until Thomas mentioned it.
This contains the xe vfio code, a bunch of xe fixes that were waiting and the i915 color management support. I'd like to include it as part of keeping the two main vendors on the same page and giving a good cross-driver experience for userspace when it starts using it. Let me know if it causes any problems on your end, Thanks, Dave. drm-next-2025-12-05: drm next part 2 for 6.19-rc1 vfio: - add a vfio_pci variant driver for Intel xe/i915 display: - add plane color management support xe: - Add scope-based cleanup helper for runtime PM - vfio xe driver prerequisites and exports - fix vfio link error - Fix a memory leak - Fix a 64-bit division - vf migration fix - LRC pause fix The following changes since commit 0692602defb0c273f80dec9c564ca50726404aca: Merge tag 'amd-drm-next-6.19-2025-12-02' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2025-12-03 09:43:49 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/drm/kernel.git tags/drm-next-2025-12-05 for you to fetch changes up to c7685d11108acb387e44e3d81194d0d8959eaa44: Merge tag 'topic/drm-intel-plane-color-pipeline-2025-12-04' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next (2025-12-05 10:27:57 +1000) ---------------------------------------------------------------- drm next part 2 for 6.19-rc1 vfio: - add a vfio_pci variant driver for Intel xe/i915 display: - add plane color management support xe: - Add scope-based cleanup helper for runtime PM - vfio xe driver prerequisites and exports - fix vfio link error - Fix a memory leak - Fix a 64-bit division - vf migration fix - LRC pause fix ---------------------------------------------------------------- Arnd Bergmann (1): drm/xe/pf: fix VFIO link error Chaitanya Kumar Borah (8): drm/i915/display: Add identifiers for driver specific blocks drm/i915: Add intel_color_op drm/i915/color: Add helper to create intel colorop drm/i915/color: Create a transfer function color pipeline drm/i915/color: Add framework to program CSC drm/i915/color: Preserve sign bit when int_bits is Zero drm/i915/color: Add registers for 3D LUT drm/i915/color: Add 3D LUT to color pipeline Dave Airlie (4): Merge tag 'topic/xe-vfio-2025-12-01' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next Merge tag 'topic/xe-vfio-2025-12-04' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next Merge tag 'drm-xe-next-fixes-2025-12-04' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next Merge tag 'topic/drm-intel-plane-color-pipeline-2025-12-04' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next Matt Roper (1): drm/xe/pm: Add scope-based cleanup helper for runtime PM Matthew Brost (1): drm/xe/vf: Start re-emission from first unsignaled job during VF migration Michal Wajdeczko (1): drm/xe/pf: Use div_u64 when calculating GGTT profile Michał Winiarski (4): drm/xe/pf: Enable SR-IOV VF migration drm/xe/pci: Introduce a helper to allow VF access to PF xe_device drm/xe/pf: Export helpers for VFIO vfio/xe: Add device specific vfio_pci driver variant for Intel graphics Mika Kuoppala (1): drm/xe: Fix memory leak when handling pagefault vma Thomas Hellström (1): Merge drm/drm-next into drm-xe-next-fixes Tomasz Lis (1): drm/xe: Protect against unset LRC when pausing submissions Uma Shankar (7): drm/i915/color: Add plane CTM callback for D12 and beyond drm/i915: Add register definitions for Plane Degamma drm/i915: Add register definitions for Plane Post CSC drm/i915/color: Add framework to program PRE/POST CSC LUT drm/i915/color: Program Pre-CSC registers drm/i915/color: Program Plane Post CSC Registers drm/i915/color: Enable Plane Color Pipelines MAINTAINERS | 7 + drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/display/intel_color.c | 335 ++++++++++++ drivers/gpu/drm/i915/display/intel_color.h | 8 +- .../gpu/drm/i915/display/intel_color_pipeline.c | 99 ++++ .../gpu/drm/i915/display/intel_color_pipeline.h | 14 + drivers/gpu/drm/i915/display/intel_color_regs.h | 29 ++ drivers/gpu/drm/i915/display/intel_colorop.c | 35 ++ drivers/gpu/drm/i915/display/intel_colorop.h | 15 + drivers/gpu/drm/i915/display/intel_display.c | 5 +- .../gpu/drm/i915/display/intel_display_limits.h | 9 + drivers/gpu/drm/i915/display/intel_display_types.h | 9 + drivers/gpu/drm/i915/display/intel_plane.c | 55 ++ drivers/gpu/drm/i915/display/skl_universal_plane.c | 21 + .../drm/i915/display/skl_universal_plane_regs.h | 115 +++++ drivers/gpu/drm/xe/Makefile | 6 + drivers/gpu/drm/xe/xe_gpu_scheduler.h | 5 +- drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 2 +- drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c | 9 + drivers/gpu/drm/xe/xe_guc_submit.c | 47 +- drivers/gpu/drm/xe/xe_pagefault.c | 1 - drivers/gpu/drm/xe/xe_pci.c | 17 + drivers/gpu/drm/xe/xe_pci.h | 3 + drivers/gpu/drm/xe/xe_pm.c | 21 + drivers/gpu/drm/xe/xe_pm.h | 17 + drivers/gpu/drm/xe/xe_sched_job_types.h | 4 +- drivers/gpu/drm/xe/xe_sriov_pf_migration.c | 35 +- drivers/gpu/drm/xe/xe_sriov_pf_migration.h | 1 + drivers/gpu/drm/xe/xe_sriov_pf_migration_types.h | 4 +- drivers/gpu/drm/xe/xe_sriov_vfio.c | 80 +++ drivers/vfio/pci/Kconfig | 2 + drivers/vfio/pci/Makefile | 2 + drivers/vfio/pci/xe/Kconfig | 12 + drivers/vfio/pci/xe/Makefile | 3 + drivers/vfio/pci/xe/main.c | 573 +++++++++++++++++++++ include/drm/intel/xe_sriov_vfio.h | 143 +++++ 36 files changed, 1713 insertions(+), 32 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_color_pipeline.c create mode 100644 drivers/gpu/drm/i915/display/intel_color_pipeline.h create mode 100644 drivers/gpu/drm/i915/display/intel_colorop.c create mode 100644 drivers/gpu/drm/i915/display/intel_colorop.h create mode 100644 drivers/gpu/drm/xe/xe_sriov_vfio.c create mode 100644 drivers/vfio/pci/xe/Kconfig create mode 100644 drivers/vfio/pci/xe/Makefile create mode 100644 drivers/vfio/pci/xe/main.c create mode 100644 include/drm/intel/xe_sriov_vfio.h
