drm/i915: move intel_fb_pin.c to i915_fb_pin.c

intel_fb_pin.c is the final file in display/ that's specific to i915
only. Move it to i915 core, renaming it to i915_fb_pin.c. It'll still
depend on a lot of display stuff, unfortunately.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/ab1ffc08bcd1364715396142f91780b6261bbe65.1775556190.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 272c292f06ed43cfe696795ffbcb9dce8c4d7898..fa632f4e505c975876c041c24fcbb5f27c24f4ce 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -80,6 +80,7 @@ i915-y += \
        i915_display_pc8.o \
        i915_dpt.o \
        i915_dsb_buffer.o \
+       i915_fb_pin.o \
        i915_hdcp_gsc.o \
        i915_initial_plane.o \
        i915_overlay.o \
@@ -279,7 +280,6 @@ i915-y += \
        display/intel_drrs.o \
        display/intel_dsb.o \
        display/intel_fb.o \
-       display/intel_fb_pin.o \
        display/intel_fbc.o \
        display/intel_fdi.o \
        display/intel_fifo_underrun.o \

diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/i915_fb_pin.c
similarity index 97%
rename from drivers/gpu/drm/i915/display/intel_fb_pin.c
rename to drivers/gpu/drm/i915/i915_fb_pin.c
index 738d77a1468a55ea5e7e6abdc9544d7a0ac9e7de..580acbb14adab16ed7ba6b87c2e8d47b2d183851 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/i915_fb_pin.c
@@ -9,18 +9,19 @@
 
 #include <drm/drm_print.h>
 
+#include "display/intel_display_core.h"
+#include "display/intel_display_rpm.h"
+#include "display/intel_display_types.h"
+#include "display/intel_fb.h"
+#include "display/intel_fb_pin.h"
+#include "display/intel_plane.h"
+
 #include "gem/i915_gem_domain.h"
 #include "gem/i915_gem_object.h"
 
+#include "i915_dpt.h"
 #include "i915_drv.h"
 #include "i915_vma.h"
-#include "intel_display_core.h"
-#include "intel_display_rpm.h"
-#include "intel_display_types.h"
-#include "i915_dpt.h"
-#include "intel_fb.h"
-#include "intel_fb_pin.h"
-#include "intel_plane.h"
 
 static struct i915_vma *
 intel_fb_pin_to_dpt(const struct drm_framebuffer *fb,