mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-21 18:25:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
3756a272d2cf356d2203da8474d173257f5f8521
linux/drivers/gpu/drm
History
Thomas Hellström aa833fc394 drm/xe: Fix duplicated put due to merge resolution 
An incorrect backmerge resolution resulted in an
incorrect duplicate put. Fix.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Closes: https://lore.kernel.org/dri-devel/CAHk-=whaiMayMx=LrL7P119MLBX6exM_mEu4S2uBRT+xWQ-mbA@mail.gmail.com/
Fixes: Fixes: ce0478b02e ("Merge tag 'v6.18-rc6' into drm-next")
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2025-12-04 14:13:04 -08:00
..
adp
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
amd
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00
arm
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
armada
drm/fb-helper: Allocate and release fb_info in single place
2025-11-25 11:02:43 +01:00
aspeed
…
ast
Merge tag 'v6.18-rc6' into drm-next
2025-11-21 08:55:08 +10:00
atmel-hlcdc
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
bridge
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00
ci
drm/ci: disable broken MR check in sanity job
2025-10-16 07:49:06 -07:00
clients
Merge tag 'drm-misc-next-2025-12-01-1' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
2025-12-02 18:09:08 +10:00
display
Merge tag 'drm-misc-next-2025-11-05-1' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
2025-11-07 12:41:26 +10:00
etnaviv
Merge tag 'v6.18-rc6' into drm-next
2025-11-21 08:55:08 +10:00
exynos
drm/fb-helper: Allocate and release fb_info in single place
2025-11-25 11:02:43 +01:00
fsl-dcu
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
gma500
drm/fb-helper: Allocate and release fb_info in single place
2025-11-25 11:02:43 +01:00
gud
drm/gud: rearrange gud_probe() to prepare for function splitting
2025-10-24 19:36:45 +01:00
hisilicon
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
hyperv
drm/hyperv: include drm_print.h where needed
2025-11-04 14:37:15 +02:00
i915
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00
imagination
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00
imx
Merge tag 'v6.18-rc6' into drm-next
2025-11-21 08:55:08 +10:00
ingenic
drm/ingenic: crtc: Switch to ingenic_drm_get_new_priv_state()
2025-10-06 13:59:22 +02:00
kmb
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
lib
…
lima
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
logicvc
drm/logicvc: Switch to drm_atomic_get_new_crtc_state()
2025-10-06 13:59:15 +02:00
loongson
drm/ttm: Replace multiple booleans with flags in device init
2025-10-31 09:14:35 +00:00
mcde
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
mediatek
Merge tag 'mediatek-drm-next-20251120' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next
2025-11-21 18:48:28 +10:00
meson
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
mgag200
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
msm
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00
mxsfb
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
nouveau
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00
nova
drm: nova: select NOVA_CORE
2025-10-30 00:38:15 +01:00
omapdrm
drm/fb-helper: Allocate and release fb_info in single place
2025-11-25 11:02:43 +01:00
panel
Merge tag 'drm-misc-next-2025-12-01-1' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
2025-12-02 18:09:08 +10:00
panfrost
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
panthor
Merge tag 'drm-misc-next-2025-12-01-1' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
2025-12-02 18:09:08 +10:00
pl111
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
qxl
drm/ttm: Replace multiple booleans with flags in device init
2025-10-31 09:14:35 +00:00
radeon
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 +10:00
renesas
drm: rcar-du: fix incorrect return in rcar_du_crtc_cleanup()
2025-11-05 11:17:26 +02:00
rockchip
Merge tag 'drm-misc-next-2025-12-01-1' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
2025-12-02 18:09:08 +10:00
scheduler
Merge tag 'v6.18-rc6' into drm-next
2025-11-21 08:55:08 +10:00
sitronix
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
solomon
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
sprd
…
sti
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00
stm
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
sun4i
drm/sun4i: Nuke mixer pointer from layer code
2025-11-12 17:18:25 +08:00
sysfb
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
tegra
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00
tests
drm/tests: Add a few tests around drm_fixed.h
2025-11-26 23:03:33 +01:00
tidss
drm/tidss: Move OLDI mode validation to OLDI bridge mode_valid hook
2025-11-12 11:54:39 +02:00
tilcdc
drm/tilcdc: Switch to drm_atomic_get_new_crtc_state()
2025-10-06 13:59:19 +02:00
tiny
Merge tag 'v6.18-rc6' into drm-next
2025-11-21 08:55:08 +10:00
ttm
drm/ttm: rework pipelined eviction fence handling
2025-11-26 13:12:23 +01:00
tve200
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
tyr
rust: drm: Introduce the Tyr driver for Arm Mali GPUs
2025-09-11 12:20:03 +00:00
udl
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
v3d
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
vboxvideo
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
vc4
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
vgem
drm/vgem-fence: Fix potential deadlock on release
2025-10-06 15:05:17 +02:00
virtio
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
vkms
drm/colorop: allow non-bypass colorops
2025-11-26 23:09:17 +01:00
vmwgfx
Merge tag 'v6.18-rc6' into drm-next
2025-11-21 08:55:08 +10:00
xe
drm/xe: Fix duplicated put due to merge resolution
2025-12-04 14:13:04 -08:00
xen
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
xlnx
drm/xlnx: Compute dumb-buffer sizes with drm_mode_size_dumb()
2025-09-29 17:50:54 +02:00
drm_atomic_helper.c
drm/colorop: Introduce new drm_colorop mode object
2025-11-26 23:03:30 +01:00
drm_atomic_state_helper.c
drm/plane: Add COLOR PIPELINE property
2025-11-26 23:03:32 +01:00
drm_atomic_uapi.c
drm/colorop: Add 3D LUT support to color pipeline
2025-11-26 23:09:42 +01:00
drm_atomic.c
drm/colorop: Add 3D LUT support to color pipeline
2025-11-26 23:09:42 +01:00
drm_auth.c
…
drm_blend.c
…
drm_bridge_helper.c
…
drm_bridge.c
drm/bridge: add warning for bridges using neither devm_drm_bridge_alloc() nor drm_bridge_add()
2025-11-03 13:04:55 +01:00
drm_buddy.c
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
drm_cache.c
…
drm_client_event.c
drm/client: Pass force parameter to client restore
2025-11-25 08:43:46 +01:00
drm_client_modeset.c
drm/fb-helper: Synchronize dirty worker with vblank
2025-09-16 12:42:52 +02:00
drm_client_sysrq.c
drm/client: Support emergency restore via sysrq for all clients
2025-11-25 08:43:47 +01:00
drm_client.c
drm/client: Support emergency restore via sysrq for all clients
2025-11-25 08:43:47 +01:00
drm_color_mgmt.c
drm: Add Enhanced LUT precision structure
2025-11-26 23:03:35 +01:00
drm_colorop.c
drm/colorop: Add DRM_COLOROP_1D_CURVE_GAMMA22 to 1D Curve
2025-11-26 23:09:44 +01:00
drm_connector.c
drm/colorop: Introduce DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE
2025-11-26 23:03:32 +01:00
drm_crtc_helper_internal.h
…
drm_crtc_helper.c
…
drm_crtc_internal.h
drm/colorop: Introduce DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE
2025-11-26 23:03:32 +01:00
drm_crtc.c
drm/drm_crtc: Introduce sharpness strength property
2025-10-30 15:38:04 +02:00
drm_damage_helper.c
…
drm_debugfs_crc.c
…
drm_debugfs.c
…
drm_displayid_internal.h
drm/displayid: add quirk to ignore DisplayID checksum errors
2025-11-04 14:49:30 +02:00
drm_displayid.c
drm/displayid: add quirk to ignore DisplayID checksum errors
2025-11-04 14:49:30 +02:00
drm_draw_internal.h
drm/draw: fix color truncation in drm_draw_fill24
2025-10-14 09:25:10 +02:00
drm_draw.c
drm/draw: fix color truncation in drm_draw_fill24
2025-10-14 09:25:10 +02:00
drm_drv.c
drm/client: Support emergency restore via sysrq for all clients
2025-11-25 08:43:47 +01:00
drm_dumb_buffers.c
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
drm_edid_load.c
…
drm_edid.c
drm/edid: add 6 bpc quirk to the Sharp LQ116M1JW10
2025-11-06 08:51:21 -08:00
drm_eld.c
…
drm_encoder.c
…
drm_exec.c
…
drm_fb_dma_helper.c
…
drm_fb_helper.c
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00
drm_fbdev_dma.c
drm/fb-helper: Allocate and release fb_info in single place
2025-11-25 11:02:43 +01:00
drm_fbdev_shmem.c
drm/fb-helper: Allocate and release fb_info in single place
2025-11-25 11:02:43 +01:00
drm_fbdev_ttm.c
drm/fb-helper: Allocate and release fb_info in single place
2025-11-25 11:02:43 +01:00
drm_file.c
drm/client: Pass force parameter to client restore
2025-11-25 08:43:46 +01:00
drm_flip_work.c
…
drm_format_helper.c
drm/format-helper: Remove drm_fb_blit()
2025-09-23 15:06:06 +02:00
drm_format_internal.h
…
drm_fourcc.c
…
drm_framebuffer.c
drm/framebuffer: Switch to drm_atomic_get_new_crtc_state()
2025-10-06 13:59:21 +02:00
drm_gem_atomic_helper.c
Merge tag 'v6.18-rc6' into drm-next
2025-11-21 08:55:08 +10:00
drm_gem_dma_helper.c
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
drm_gem_framebuffer_helper.c
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
drm_gem_shmem_helper.c
drm/gem-shmem: Compute dumb-buffer sizes with drm_mode_size_dumb()
2025-09-29 13:57:45 +02:00
drm_gem_ttm_helper.c
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
drm_gem_vram_helper.c
drm/ttm: Replace multiple booleans with flags in device init
2025-10-31 09:14:35 +00:00
drm_gem.c
drm/gem: Correct error condition in drm_gem_objects_lookup
2025-11-26 11:18:18 +00:00
drm_gpusvm.c
drm/gpusvm, drm/xe: Allow mixed mappings for userptr
2025-10-17 10:25:27 +02:00
drm_gpuvm.c
Merge tag 'drm-rust-next-2025-11-18' of https://gitlab.freedesktop.org/drm/rust/kernel into drm-next
2025-11-20 10:44:50 +10:00
drm_internal.h
drm/client: Support emergency restore via sysrq for all clients
2025-11-25 08:43:47 +01:00
drm_ioc32.c
…
drm_ioctl.c
drm/colorop: Introduce DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE
2025-11-26 23:03:32 +01:00
drm_kms_helper_common.c
…
drm_lease.c
…
drm_managed.c
…
drm_mipi_dbi.c
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
drm_mipi_dsi.c
drm: Add MIPI read_multi func and two write macros
2025-08-14 15:42:26 -07:00
drm_mm.c
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
drm_mode_config.c
drm/colorop: Introduce new drm_colorop mode object
2025-11-26 23:03:30 +01:00
drm_mode_object.c
drm/colorop: Introduce DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE
2025-11-26 23:03:32 +01:00
drm_modes.c
…
drm_modeset_helper.c
drm/client: Remove holds_console_lock parameter from suspend/resume
2025-10-18 17:35:09 +02:00
drm_modeset_lock.c
…
drm_of.c
drm: of: fix documentation reference
2025-08-21 16:21:08 +02:00
drm_pagemap.c
drm/pagemap: Allocate folios when possible
2025-08-06 13:34:58 +02:00
drm_panel_backlight_quirks.c
drm: panel-backlight-quirks: Add Steam Deck brightness quirk
2025-09-03 10:23:03 -05:00
drm_panel_orientation_quirks.c
…
drm_panel.c
drm/panel: Allow powering on panel follower after panel is enabled
2025-08-25 09:17:49 -07:00
drm_panic_qr.rs
drm/panic: use core::ffi::CStr method names
2025-09-16 09:26:59 +02:00
drm_panic.c
drm/panic: Fix 24bit pixel crossing page boundaries
2025-10-21 11:28:03 +02:00
drm_pci.c
…
drm_plane_helper.c
…
drm_plane.c
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00
drm_prime.c
drm: include drm_print.h where needed
2025-10-31 10:34:52 +02:00
drm_print.c
…
drm_privacy_screen_x86.c
…
drm_privacy_screen.c
…
drm_probe_helper.c
…
drm_property.c
…
drm_rect.c
…
drm_self_refresh_helper.c
…
drm_simple_kms_helper.c
…
drm_suballoc.c
…
drm_syncobj.c
…
drm_sysfs.c
DRM: Add a new 'boot_display' attribute
2025-09-10 09:35:33 -05:00
drm_trace_points.c
…
drm_trace.h
…
drm_vblank_helper.c
drm/vblank: Add CRTC helpers for simple use cases
2025-10-01 08:32:00 +02:00
drm_vblank_work.c
drm/vblank: use drm_crtc_vblank_crtc() in workers
2025-11-10 13:22:58 +02:00
drm_vblank.c
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00
drm_vma_manager.c
…
drm_writeback.c
Merge tag 'drm-next-2025-07-30' of https://gitlab.freedesktop.org/drm/kernel
2025-07-30 19:26:49 -07:00
Kconfig
Merge tag 'hyperv-next-signed-20251006' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
2025-10-07 08:40:15 -07:00
Kconfig.debug
…
Makefile
Merge tag 'drm-next-2025-12-03' of https://gitlab.freedesktop.org/drm/kernel
2025-12-04 08:53:30 -08:00