From: Michal Wajdeczko <michal.wajdeczko@intel.com>
Date: Tue, 12 May 2026 18:33:41 +0000 (+0200)
Subject: drm/xe/display: Drop xe_display_driver_set_hooks()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=839ffd94f08353b09c4c855634718fbc768ddce2;p=thirdparty%2Fkernel%2Flinux.git

drm/xe/display: Drop xe_display_driver_set_hooks()

This function is now no-op.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20260512183342.3374-7-michal.wajdeczko@intel.com
---

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 7e5382fc161d4..d6aea18025afb 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -70,22 +70,6 @@ bool xe_display_driver_probe_defer(struct pci_dev *pdev)
 	return intel_display_driver_probe_defer(pdev);
 }
 
-/**
- * xe_display_driver_set_hooks - Add driver flags and hooks for display
- * @driver: DRM device driver
- *
- * Set features and function hooks in @driver that are needed for driving the
- * display IP. This sets the driver's capability of driving display, regardless
- * if the device has it enabled
- *
- * Note: This is called before xe or display device creation.
- */
-void xe_display_driver_set_hooks(struct drm_driver *driver)
-{
-	if (!xe_modparam.probe_display)
-		return;
-}
-
 static void unset_display_features(struct xe_device *xe)
 {
 	xe->drm.driver_features &= ~XE_DISPLAY_DRIVER_FEATURES;
diff --git a/drivers/gpu/drm/xe/display/xe_display.h b/drivers/gpu/drm/xe/display/xe_display.h
index d2b105d5f2a1b..60291cb154df7 100644
--- a/drivers/gpu/drm/xe/display/xe_display.h
+++ b/drivers/gpu/drm/xe/display/xe_display.h
@@ -17,7 +17,7 @@ struct xe_device;
 #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY)
 
 bool xe_display_driver_probe_defer(struct pci_dev *pdev);
-void xe_display_driver_set_hooks(struct drm_driver *driver);
+
 int xe_display_driver_fbdev_probe(struct drm_fb_helper *fbh,
 				  struct drm_fb_helper_surface_size *sizes);
 
@@ -56,7 +56,6 @@ void xe_display_pm_runtime_resume(struct xe_device *xe);
 	.fbdev_probe = NULL
 
 static inline int xe_display_driver_probe_defer(struct pci_dev *pdev) { return 0; }
-static inline void xe_display_driver_set_hooks(struct drm_driver *driver) { }
 
 static inline int xe_display_probe(struct xe_device *xe) { return 0; }
 
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index c053e4d2692ff..7519cda3f42c2 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -491,8 +491,6 @@ struct xe_device *xe_device_create(struct pci_dev *pdev,
 		driver = &admin_only_driver;
 #endif
 
-	xe_display_driver_set_hooks(driver);
-
 	err = aperture_remove_conflicting_pci_devices(pdev, driver->name);
 	if (err)
 		return ERR_PTR(err);