From: Jani Nikula <jani.nikula@intel.com>
Date: Wed, 22 Oct 2025 12:14:49 +0000 (+0300)
Subject: drm/i915/display: drop a few unnecessary i915_drv.h includes
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=998703342876b5daf084d9182387efab0005a07f;p=thirdparty%2Fkernel%2Flinux.git

drm/i915/display: drop a few unnecessary i915_drv.h includes

We've stopped using struct drm_i915_private in intel_fb.c and
skl_universal_plane.c, so we can drop the i915_drv.h includes.

Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://lore.kernel.org/r/20251022121450.452649-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 3958628c73e97..6ade38198f396 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -10,7 +10,6 @@
 #include <drm/drm_gem.h>
 #include <drm/drm_modeset_helper.h>
 
-#include "i915_drv.h"
 #include "i915_utils.h"
 #include "intel_bo.h"
 #include "intel_display.h"
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 0319174adf953..765d288cce2b0 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -7,9 +7,9 @@
 #include <drm/drm_blend.h>
 #include <drm/drm_damage_helper.h>
 #include <drm/drm_fourcc.h>
+#include <drm/drm_print.h>
 
 #include "pxp/intel_pxp.h"
-#include "i915_drv.h"
 #include "i915_utils.h"
 #include "intel_bo.h"
 #include "intel_de.h"
@@ -24,6 +24,7 @@
 #include "intel_plane.h"
 #include "intel_psr.h"
 #include "intel_psr_regs.h"
+#include "intel_step.h"
 #include "skl_scaler.h"
 #include "skl_universal_plane.h"
 #include "skl_universal_plane_regs.h"