Changes in Makefile

5c8cbca290acdd49a694b36c0af76ba0c00bbf12 - Merge branch '20260507-ubwc-rework-v4-4-c19593d20c1d@oss.qualcomm.com' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into HEAD

Thu, 21 May 2026 22:36:50 +0200

Merge branch '20260507-ubwc-rework-v4-4-c19593d20c1d@oss.qualcomm.com' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into HEADMerge the branch with the soc/qcom changes, required for the next UBWCpatches.Signed-off-by: Dmitry Baryshkov List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

8edf8b09fc44990977b3fbcb708035b1740d0b7e - Merge drm/drm-next into drm-intel-gt-next

Tue, 12 May 2026 10:16:35 +0200

Merge drm/drm-next into drm-intel-gt-nextBackmerging to pull in commit 5401b9adebc9 ("i915: don't usea vma that didn't match the context VM") to revert it.Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

1655f6895a896eb632ca8a019259bc5d358a9712 - Merge tag 'timers-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux into timers/clocksource

Sun, 12 Apr 2026 22:33:39 +0200

Merge tag 'timers-v7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux into timers/clocksource - Added the DT bindings for the compatible string 'fsl,imx25-epit' (Frank Li) - Made the rttm_cs variable static for the rtl otto timer driver (Krzysztof Kozlowski) - Fixed error return code handling in the sun5i timer driver (Chen Ni) - Made the timer-of and the mmio code compatible with modules (Daniel Lezcano)Link: https://lore.kernel.org/151feae1-39ba-4abd-a9f9-9bff377a2cd8@oss.qualcomm.com List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

f4b369c6fe0ceaba2da2daff8c9eb415f85926dd - Merge branch 'next' into for-linus

Mon, 20 Apr 2026 03:28:57 +0200

Merge branch 'next' into for-linusPrepare input updates for 7.1 merge window. List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

0421ccdfad0d92713a812a5aeb7d07b0ea7213c8 - Merge tag 'v7.0-rc3' into next

Thu, 12 Mar 2026 18:44:42 +0100

Merge tag 'v7.0-rc3' into nextSync up with the mainline to brig up the latest changes, specificallychanges to ALPS driver. List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

3e9e952bb3139ad1e08f3e1960239c2988ab90c9 - Merge branch 'for-7.1-printf-kunit-build' into for-linus

Mon, 20 Apr 2026 13:41:28 +0200

Merge branch 'for-7.1-printf-kunit-build' into for-linus List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

d4eb7b2da66c848709e31585b9c371fa234abc39 - Merge branch 'for-7.1/core-v2' into for-linus

Thu, 16 Apr 2026 21:01:18 +0200

Merge branch 'for-7.1/core-v2' into for-linus- fixed handling of 0-sized reports (Dmitry Torokhov)- convert core code to __free() (Dmitry Torokhov)- support for multiple batteries per HID device (Lucas Zampieri) List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

42d3b66d4cdbacfc9d120d2301b8de89cc29a914 - Merge drm/drm-next into drm-xe-next

Thu, 12 Mar 2026 15:17:56 +0100

Merge drm/drm-next into drm-xe-nextBackmerging to bring in 7.00-rc3. Important ahead GPU SVM merging THPsupport.Signed-off-by: Matthew Brost List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

0314e382cf02983eb3c33ac537ad9701e7858bc9 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Thu, 26 Feb 2026 19:20:47 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR (net-7.0-rc2).Conflicts:tools/testing/selftests/drivers/net/hw/rss_ctx.py 19c3a2a81d2b ("selftests: drv-net: rss: Generate unique ports for RSS context tests") ce5a0f4612db ("selftests: drv-net: rss_ctx: test RSS contexts persist after ifdown/up")include/net/inet_connection_sock.h 858d2a4f67ff6 ("tcp: fix potential race in tcp_v6_syn_recv_sock()") fcd3d039fab69 ("tcp: make tcp_v{4,6}_send_check() static")https://lore.kernel.org/aZ8PSFLzBrEU3I89@sirena.org.ukdrivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.cdrivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c 69050f8d6d075 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types") bf4afc53b77ae ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument") 8a96b9144f18a ("net/mlx5e: Alloc xsk channel param out of mlx5e_open_xsk()")Adjacent changes:net/netfilter/ipvs/ip_vs_ctl.c c59bd9e62e06 ("ipvs: use more counters to avoid service lookups") bf4afc53b77a ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")Signed-off-by: Jakub Kicinski List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

f09812b85fa6f41058bcc46e70ac406bf9b0493a - Merge drm/drm-next into drm-intel-next

Wed, 25 Feb 2026 12:23:04 +0100

Merge drm/drm-next into drm-intel-nextSync with v7.0-rc1 which contains a few treewide changes affecting i915.Signed-off-by: Jani Nikula List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

3ecf0b4a0e0ed4783aa32c5f3e42d23c7021e1c8 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 7.0-rc1

Mon, 23 Feb 2026 17:06:33 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 7.0-rc1Cross-merge trees after 7.0-rc1.No conflicts.Signed-off-by: Alexei Starovoitov List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

8b85987d3cf50178f67618122d9f3bb202f62f42 - Merge drm/drm-next into drm-misc-next

Mon, 23 Feb 2026 11:48:20 +0100

Merge drm/drm-next into drm-misc-nextLet's merge 7.0-rc1 to start the new drm-misc-next windowSigned-off-by: Maxime Ripard List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

c17ee635fd3a482b2ad2bf5e269755c2eae5f25e - Merge drm/drm-fixes into drm-misc-fixes

Mon, 23 Feb 2026 10:09:45 +0100

Merge drm/drm-fixes into drm-misc-fixes7.0-rc1 was just released, let's merge it to kick the new release cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

d4a292c5f8e65d2784b703c67179f4f7d0c7846c - Merge tag 'drm-next-2026-02-21' of https://gitlab.freedesktop.org/drm/kernel

Sat, 21 Feb 2026 00:36:38 +0100

Merge tag 'drm-next-2026-02-21' of https://gitlab.freedesktop.org/drm/kernelPull drm fixes from Dave Airlie: "This is the fixes and cleanups for the end of the merge window, it's nearly all amdgpu, with some amdkfd, then a pagemap core fix, i915/xe display fixes, and some xe driver fixes. Nothing seems out of the ordinary, except amdgpu is a little more volume than usual. pagemap: - drm/pagemap: pass pagemap_addr by reference amdgpu: - DML 2.1 fixes - Panel replay fixes - Display writeback fixes - MES 11 old firmware compat fix - DC CRC improvements - DPIA fixes - XGMI fixes - ASPM fix - SMU feature bit handling fixes - DC LUT fixes - RAS fixes - Misc memory leak in error path fixes - SDMA queue reset fixes - PG handling fixes - 5 level GPUVM page table fix - SR-IOV fix - Queue reset fix - SMU 13.x fixes - DC resume lag fix - MPO fixes - DCN 3.6 fix - VSDB fixes - HWSS clean up - Replay fixes - DCE cursor fixes - DCN 3.5 SR DDR5 latency fixes - HPD fixes - Error path unwind fixes - SMU13/14 mode1 reset fixes - PSP 15 updates - SMU 15 updates - Sync fix in amdgpu_dma_buf_move_notify() - HAINAN fix - PSP 13.x fix - GPUVM locking fix - Fixes for DC analog support - DC FAMS fixes - DML 2.1 fixes - eDP fixes - Misc DC fixes - Fastboot fix - 3DLUT fixes - GPUVM fixes - 64bpp format fix - Fix for MacBooks with switchable gfx amdkfd: - Fix possible double deletion of validate list - Event setup fix - Device disconnect regression fix - APU GTT as VRAM fix - Fix piority inversion with MQDs - NULL check fix radeon: - HAINAN fix i915/xe display: - Regresion fix for HDR 4k displays (#15503) - Fixup for Dell XPS 13 7390 eDP rate limit - Memory leak fix on ACPI _DSM handling - Add missing slice count check during DP mode validation xe: - drm/xe: Prevent VFs from exposing the CCS mode sysfs file - SRIOV related fixes - PAT cache fix - MMIO read fix - W/a fixes - Adjust type of xe_modparam.force_vram_bar_size - Wedge mode fix - HWMon fix* tag 'drm-next-2026-02-21' of https://gitlab.freedesktop.org/drm/kernel: (143 commits) drm/amd/display: Remove unneeded DAC link encoder register drm/amd/display: Enable DAC in DCE link encoder drm/amd/display: Set CRTC source for DAC using registers drm/amd/display: Initialize DAC in DCE link encoder using VBIOS drm/amd/display: Turn off DAC in DCE link encoder using VBIOS drm/amd/display: Don't call find_analog_engine() twice drm/amdgpu: fix 4-level paging if GMC supports 57-bit VA v2 drm/amdgpu: keep vga memory on MacBooks with switchable graphics drm/amdgpu: Set atomics to true for xgmi drm/amdkfd: Check for NULL return values drm/amd/display: Use same max plane scaling limits for all 64 bpp formats drm/amdgpu: Set vmid0 PAGE_TABLE_DEPTH for GFX12.1 drm/amdkfd: Disable MQD queue priority drm/amd/display: Remove conditional for shaper 3DLUT power-on drm/amd/display: Check return of shaper curve to HW format drm/amd/display: Correct logic check error for fastboot drm/amd/display: Skip eDP detection when no sink Revert "drm/amd/display: Add Gfx Base Case For Linear Tiling Handling" Revert "drm/amd/display: Correct hubp GfxVersion verification" Revert "drm/amd/display: Add Handling for gfxversion DcGfxBase" ... List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

3e2138510b2ad556a12a7b284a025a23992e4aa1 - Merge tag 'amd-drm-next-6.20-2026-02-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

Wed, 18 Feb 2026 03:37:11 +0100

Merge tag 'amd-drm-next-6.20-2026-02-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-nextamd-drm-next-6.20-2026-02-13:amdgpu:- SMU 13.x fixes- DC resume lag fix- MPO fixes- DCN 3.6 fix- VSDB fixes- HWSS clean up- Replay fixes- DCE cursor fixes- DCN 3.5 SR DDR5 latency fixes- HPD fixes- Error path unwind fixes- SMU13/14 mode1 reset fixes- PSP 15 updates- SMU 15 updates- RAS fixes- Sync fix in amdgpu_dma_buf_move_notify()- HAINAN fix- PSP 13.x fix- GPUVM locking fixamdkfd:- APU GTT as VRAM fixradeon:- HAINAN fixSigned-off-by: Dave Airlie From: Alex Deucher Link: https://patch.msgid.link/20260213220825.1454189-1-alexander.deucher@amd.com List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

9156bf442ee56c0f883aa4c81af9c8471eef6846 - drm/amd/display: Refactor virtual directory reorganize encoder and hwss files.

Wed, 21 Jan 2026 11:35:00 +0100

drm/amd/display: Refactor virtual directory reorganize encoder and hwss files.[why]Virtual encoders & hwss were grouped in a separate directory,not aligned with dio and link component structure.[how]Moved virtual_link_encoder and virtual_stream_encoder to dc/dio/virtual/.Moved virtual_link_hwss to dc/link/hwss/ and renamed to link_hwss_virtual.Removed dc/virtual/ directory.Updated all includes and build files (Makefiles)Reviewed-by: Nicholas Kazlauskas Signed-off-by: Bhuvanachandra Pinninti Signed-off-by: Tom Chung Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

ec439c38013550420aecc15988ae6acb670838c1 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.19-rc1

Wed, 17 Dec 2025 06:29:38 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.19-rc1Cross-merge BPF and other fixes after downstream PR.Signed-off-by: Alexei Starovoitov List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

a4a508df2aa34f8650afde54ea804321c618f45f - Merge tag 'v6.18' into next

Sat, 13 Dec 2025 10:18:20 +0100

Merge tag 'v6.18' into nextSync up with the mainline to bring in the latest APIs. List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

0f94e51b5320eacccc2626ab70b8d7e705332334 - Merge drm/drm-next into drm-xe-next

Wed, 03 Dec 2025 11:22:18 +0100

Merge drm/drm-next into drm-xe-nextBackmerging to bring in a needed dependency for the Xe VFIOdriver variant. This should ideally have been done before wecommited that, so we now have a small window in drm-xe-nextwhere that driver doesn't compile.Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202512030331.I8CveRre-lkp@intel.com/Signed-off-by: Thomas Hellström List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile

24f171c7e145f43b9f187578e89b0982ce87e54c - Merge tag 'asoc-fix-v6.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Sun, 21 Dec 2025 11:11:11 +0100

Merge tag 'asoc-fix-v6.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v6.19We've been quite busy with fixes since the merge window, though not inany particularly exciting ways - the standout thing is the fix for _SXcontrols which were broken by a change to how we do clamping, otherwiseit's all fairly run of the mill fixes and quirks. List of files: /linux/drivers/gpu/drm/amd/display/dc/Makefile