Skip to content

Commit f3a36cb

Browse files
Thomas Zimmermannjnikula
authored andcommitted
drm/{i915,xe}: Unregister in-kernel clients
Unregister all in-kernel clients before unloading the i915 driver. For other drivers, drm_dev_unregister() does this automatically. As i915 and xe do not use this helper, they have to perform the call by themselves. Note that there are currently no in-kernel clients in i915 or xe. The patch prepares the drivers for a related update of their fbdev support. v8: - unregister clients in intel_display_driver_unregister() (Jani) - mention xe in commit message (Rodrigo, Jani) v7: - update xe driver Signed-off-by: Thomas Zimmermann <[email protected]> Reviewed-by: Jouni Högander <[email protected]> Acked-by: Lucas De Marchi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Jani Nikula <[email protected]>
1 parent 3143c0c commit f3a36cb

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

drivers/gpu/drm/i915/display/intel_display_driver.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <acpi/video.h>
1212
#include <drm/display/drm_dp_mst_helper.h>
1313
#include <drm/drm_atomic_helper.h>
14+
#include <drm/drm_client.h>
1415
#include <drm/drm_mode_config.h>
1516
#include <drm/drm_privacy_screen_consumer.h>
1617
#include <drm/drm_probe_helper.h>
@@ -640,6 +641,8 @@ void intel_display_driver_unregister(struct drm_i915_private *i915)
640641
if (!HAS_DISPLAY(i915))
641642
return;
642643

644+
drm_client_dev_unregister(&i915->drm);
645+
643646
intel_fbdev_unregister(i915);
644647
/*
645648
* After flushing the fbdev (incl. a late async config which

drivers/gpu/drm/xe/xe_device.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include <drm/drm_aperture.h>
1111
#include <drm/drm_atomic_helper.h>
12+
#include <drm/drm_client.h>
1213
#include <drm/drm_gem_ttm_helper.h>
1314
#include <drm/drm_ioctl.h>
1415
#include <drm/drm_managed.h>

0 commit comments

Comments
 (0)