]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/display: drop a number of dependencies on i915_drv.h
authorJani Nikula <jani.nikula@intel.com>
Thu, 26 Jun 2025 10:16:36 +0000 (13:16 +0300)
committerJani Nikula <jani.nikula@intel.com>
Tue, 1 Jul 2025 12:43:52 +0000 (15:43 +0300)
With the switch to an unordered workqueue dedicated to display, we've
stopped using struct drm_i915_private in a number of places, and can
drop the dependencies on i915_drv.h.

Cc: Luca Coelho <luciano.coelho@intel.com>
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20250626101636.1896365-1-jani.nikula@intel.com
drivers/gpu/drm/i915/display/intel_dmc.c
drivers/gpu/drm/i915/display/intel_dmc_wl.c
drivers/gpu/drm/i915/display/intel_drrs.c
drivers/gpu/drm/i915/display/intel_encoder.c
drivers/gpu/drm/i915/display/intel_hdcp.c
drivers/gpu/drm/i915/display/intel_opregion.c
drivers/gpu/drm/i915/display/intel_pps.c
drivers/gpu/drm/i915/display/intel_psr.c

index af9eb67718ea06bdd6a2ba64c57f937d6e57cb6e..744f51c0eab82cca405e99f65b135d9b235fba61 100644 (file)
 #include <linux/firmware.h>
 #include <drm/drm_vblank.h>
 
-#include "i915_drv.h"
+#include <drm/drm_file.h>
+#include <drm/drm_print.h>
+
 #include "i915_reg.h"
+#include "i915_utils.h"
 #include "intel_crtc.h"
 #include "intel_de.h"
 #include "intel_display_power_well.h"
index d8a04a98dd7cab9c06a7af227b5cf14de8aeab1b..b3bb89ba34f990ca916b1908071ba8647c4bf569 100644 (file)
@@ -7,7 +7,6 @@
 
 #include <drm/drm_print.h>
 
-#include "i915_drv.h"
 #include "intel_de.h"
 #include "intel_display_regs.h"
 #include "intel_dmc_regs.h"
index 3e775bb1b57a939f39ce90a874cbc37ff16397dd..0fdb32ef241cde4920e687f1d50e1118c1890d85 100644 (file)
@@ -5,7 +5,8 @@
 
 #include <linux/debugfs.h>
 
-#include "i915_drv.h"
+#include <drm/drm_print.h>
+
 #include "intel_atomic.h"
 #include "intel_de.h"
 #include "intel_display_regs.h"
index 283187905d0b3d2cf79721d3ef7ae833ed0c07a9..0b7bd26f4339a609616a046728ab05ed89de3639 100644 (file)
@@ -5,7 +5,6 @@
 
 #include <linux/workqueue.h>
 
-#include "i915_drv.h"
 #include "intel_display_core.h"
 #include "intel_display_types.h"
 #include "intel_encoder.h"
@@ -32,7 +31,7 @@ void intel_encoder_link_check_flush_work(struct intel_encoder *encoder)
 
 void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int delay_ms)
 {
-       struct intel_display *display = to_i915(encoder->base.dev)->display;
+       struct intel_display *display = to_intel_display(encoder);
 
        mod_delayed_work(display->wq.unordered,
                         &encoder->link_check_work, msecs_to_jiffies(delay_ms));
index 619ccfc3300091a53ab632aec82f471e300b9344..42202c8bb066bcccc6124f58d1ac35377eaa3fd4 100644 (file)
 #include <linux/random.h>
 
 #include <drm/display/drm_hdcp_helper.h>
+#include <drm/drm_print.h>
 #include <drm/intel/i915_component.h>
 
-#include "i915_drv.h"
 #include "i915_reg.h"
+#include "i915_utils.h"
 #include "intel_connector.h"
 #include "intel_de.h"
 #include "intel_display_power.h"
@@ -32,6 +33,7 @@
 #include "intel_hdcp_regs.h"
 #include "intel_hdcp_shim.h"
 #include "intel_pcode.h"
+#include "intel_step.h"
 
 #define USE_HDCP_GSC(__display)                (DISPLAY_VER(__display) >= 14)
 
index 2b8538fcfd1dddfafaeaa5024aba580c9567c13f..81efdb17fc0ce57aa9caa555d9b9e3ec03f580f5 100644 (file)
 #include <acpi/video.h>
 
 #include <drm/drm_edid.h>
+#include <drm/drm_file.h>
+#include <drm/drm_print.h>
 
-#include "i915_drv.h"
+#include "i915_utils.h"
 #include "intel_acpi.h"
 #include "intel_backlight.h"
 #include "intel_display_core.h"
index 6caafa66e7b4b8e3aed2a5d7f6ab7317f0eb5669..b64d0b30f5b12aa83b0cb05c81bb2acc19ce11c4 100644 (file)
@@ -5,9 +5,11 @@
 
 #include <linux/debugfs.h>
 
+#include <drm/drm_print.h>
+
 #include "g4x_dp.h"
-#include "i915_drv.h"
 #include "i915_reg.h"
+#include "i915_utils.h"
 #include "intel_de.h"
 #include "intel_display_power_well.h"
 #include "intel_display_regs.h"
index 8ee9d9dbdf11e64ddec33a561f19bb1397fd3e23..ae9053919211b17d0e6d3a47b8bbaa289acd0e2f 100644 (file)
@@ -28,7 +28,6 @@
 #include <drm/drm_debugfs.h>
 #include <drm/drm_vblank.h>
 
-#include "i915_drv.h"
 #include "i915_reg.h"
 #include "intel_alpm.h"
 #include "intel_atomic.h"
@@ -48,6 +47,7 @@
 #include "intel_psr.h"
 #include "intel_psr_regs.h"
 #include "intel_snps_phy.h"
+#include "intel_step.h"
 #include "intel_vblank.h"
 #include "intel_vrr.h"
 #include "skl_universal_plane.h"