git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-23 14:02:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Sync to fix conlicts between drm-xe-next and drm-intel-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula
2025-02-28 11:25:36 +02:00
parent 6709388380 33e26f3544
commit 8918e180a6
1660 changed files with 112039 additions and 27109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/i915/display/intel_display_driver.c
View File

@@ -564,6 +564,8 @@ void intel_display_driver_register(struct intel_display *display)
intel_display_device_info_print(DISPLAY_INFO(display),
DISPLAY_RUNTIME_INFO(display), &p);
intel_register_dsm_handler();
}
/* part #1: call before irq uninstall */
@@ -639,6 +641,8 @@ void intel_display_driver_unregister(struct intel_display *display)
if (!HAS_DISPLAY(display))
return;
intel_unregister_dsm_handler();
drm_client_dev_unregister(display->drm);
/*