[RESEND 0/5] drm/i915/plane: file and function renames

[RESEND 0/5] drm/i915/plane: file and function renames

[Jani Nikula]

Rebase and resend of [1].

BR,
Jani.

[1] https://lore.kernel.org/r/cover.1744129283.git.jani.nikula@intel.com

Jani Nikula (5):
  drm/i915/plane: rename intel_atomic_plane.[ch] to intel_plane.[ch]
  drm/i915/plane: drop atomic from intel_atomic_plane_check_clipping()
  drm/i915/plane: make intel_plane_atomic_check() static and rename
  drm/i915/plane: rename intel_atomic_check_planes() to
    intel_plane_atomic_check()
  drm/i915/plane: rename intel_atomic_add_affected_planes() to
    intel_plane_add_affected()

 drivers/gpu/drm/i915/Makefile                 |  4 ++--
 drivers/gpu/drm/i915/display/i9xx_plane.c     | 10 ++++-----
 drivers/gpu/drm/i915/display/intel_atomic.c   |  2 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c    |  2 +-
 drivers/gpu/drm/i915/display/intel_crtc.c     |  2 +-
 drivers/gpu/drm/i915/display/intel_cursor.c   | 10 ++++-----
 drivers/gpu/drm/i915/display/intel_display.c  |  8 +++----
 .../gpu/drm/i915/display/intel_display_irq.c  |  2 +-
 drivers/gpu/drm/i915/display/intel_fb.c       |  2 +-
 drivers/gpu/drm/i915/display/intel_fb_pin.c   |  2 +-
 .../{intel_atomic_plane.c => intel_plane.c}   | 22 +++++++++----------
 .../{intel_atomic_plane.h => intel_plane.h}   | 22 +++++++++----------
 .../drm/i915/display/intel_plane_initial.c    |  2 +-
 drivers/gpu/drm/i915/display/intel_sprite.c   | 14 ++++++------
 .../drm/i915/display/skl_universal_plane.c    |  7 +++---
 drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
 drivers/gpu/drm/xe/Makefile                   |  2 +-
 drivers/gpu/drm/xe/display/xe_plane_initial.c |  2 +-
 18 files changed, 57 insertions(+), 60 deletions(-)
 rename drivers/gpu/drm/i915/display/{intel_atomic_plane.c => intel_plane.c} (98%)
 rename drivers/gpu/drm/i915/display/{intel_atomic_plane.h => intel_plane.h} (86%)

-- 
2.39.5

[RESEND 1/5] drm/i915/plane: rename intel_atomic_plane.[ch] to intel_plane.[ch]

[Jani Nikula]

It's all atomic, no need to emphasize this.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/Makefile                               | 4 ++--
 drivers/gpu/drm/i915/display/i9xx_plane.c                   | 2 +-
 drivers/gpu/drm/i915/display/intel_atomic.c                 | 2 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c                  | 2 +-
 drivers/gpu/drm/i915/display/intel_crtc.c                   | 2 +-
 drivers/gpu/drm/i915/display/intel_cursor.c                 | 2 +-
 drivers/gpu/drm/i915/display/intel_display.c                | 2 +-
 drivers/gpu/drm/i915/display/intel_display_irq.c            | 2 +-
 drivers/gpu/drm/i915/display/intel_fb.c                     | 2 +-
 drivers/gpu/drm/i915/display/intel_fb_pin.c                 | 2 +-
 .../i915/display/{intel_atomic_plane.c => intel_plane.c}    | 2 +-
 .../i915/display/{intel_atomic_plane.h => intel_plane.h}    | 6 +++---
 drivers/gpu/drm/i915/display/intel_plane_initial.c          | 2 +-
 drivers/gpu/drm/i915/display/intel_sprite.c                 | 2 +-
 drivers/gpu/drm/i915/display/skl_universal_plane.c          | 3 +--
 drivers/gpu/drm/i915/display/skl_watermark.c                | 2 +-
 drivers/gpu/drm/xe/Makefile                                 | 2 +-
 drivers/gpu/drm/xe/display/xe_plane_initial.c               | 2 +-
 18 files changed, 21 insertions(+), 22 deletions(-)
 rename drivers/gpu/drm/i915/display/{intel_atomic_plane.c => intel_plane.c} (99%)
 rename drivers/gpu/drm/i915/display/{intel_atomic_plane.h => intel_plane.h} (97%)

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 7c6075bc483c..0c3fbd0d14e7 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -218,12 +218,11 @@ i915-$(CONFIG_HWMON) += \
 # modesetting core code
 i915-y += \
 	display/hsw_ips.o \
-	display/i9xx_plane.o \
 	display/i9xx_display_sr.o \
+	display/i9xx_plane.o \
 	display/i9xx_wm.o \
 	display/intel_alpm.o \
 	display/intel_atomic.o \
-	display/intel_atomic_plane.o \
 	display/intel_audio.o \
 	display/intel_bios.o \
 	display/intel_bo.o \
@@ -283,6 +282,7 @@ i915-y += \
 	display/intel_pch.o \
 	display/intel_pch_display.o \
 	display/intel_pch_refclk.o \
+	display/intel_plane.o \
 	display/intel_plane_initial.o \
 	display/intel_pmdemand.o \
 	display/intel_psr.o \
diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index 8f15333a4b07..eba8eb745aa7 100644
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -15,7 +15,6 @@
 #include "i9xx_plane.h"
 #include "i9xx_plane_regs.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_de.h"
 #include "intel_display_irq.h"
 #include "intel_display_regs.h"
@@ -23,6 +22,7 @@
 #include "intel_fb.h"
 #include "intel_fbc.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_sprite.h"
 
 /* Primary plane formats for gen <= 3 */
diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index f85edb374c97..348b1655435e 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -26,7 +26,7 @@
  *
  * The functions here implement the state management and hardware programming
  * dispatch required by the atomic modeset infrastructure.
- * See intel_atomic_plane.c for the plane-specific atomic functionality.
+ * See intel_plane.c for the plane-specific atomic functionality.
  */
 
 #include <drm/display/drm_dp_tunnel.h>
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 38b3094b37d7..bae85603543c 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -32,7 +32,6 @@
 #include "i915_drv.h"
 #include "i915_reg.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_audio.h"
 #include "intel_bw.h"
 #include "intel_cdclk.h"
@@ -43,6 +42,7 @@
 #include "intel_mchbar_regs.h"
 #include "intel_pci_config.h"
 #include "intel_pcode.h"
+#include "intel_plane.h"
 #include "intel_psr.h"
 #include "intel_vdsc.h"
 #include "skl_watermark.h"
diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index a88317ea4e9c..a187db6df2d3 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -17,7 +17,6 @@
 #include "i9xx_plane.h"
 #include "icl_dsi.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_color.h"
 #include "intel_crtc.h"
 #include "intel_cursor.h"
@@ -29,6 +28,7 @@
 #include "intel_dsi.h"
 #include "intel_fifo_underrun.h"
 #include "intel_pipe_crc.h"
+#include "intel_plane.h"
 #include "intel_psr.h"
 #include "intel_sprite.h"
 #include "intel_vblank.h"
diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index 6bd4f6a28cae..27d86549af2c 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -14,7 +14,6 @@
 
 #include "i915_utils.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_cursor.h"
 #include "intel_cursor_regs.h"
 #include "intel_de.h"
@@ -23,6 +22,7 @@
 #include "intel_fb.h"
 #include "intel_fb_pin.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_psr.h"
 #include "intel_psr_regs.h"
 #include "intel_vblank.h"
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index b0c7c46ffbe2..acc03b4c9e89 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -57,7 +57,6 @@
 #include "i9xx_wm.h"
 #include "intel_alpm.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_audio.h"
 #include "intel_bo.h"
 #include "intel_bw.h"
@@ -108,6 +107,7 @@
 #include "intel_pch_refclk.h"
 #include "intel_pfit.h"
 #include "intel_pipe_crc.h"
+#include "intel_plane.h"
 #include "intel_plane_initial.h"
 #include "intel_pmdemand.h"
 #include "intel_pps.h"
diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index 8d0dcf252bed..fb25ec8adae3 100644
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -9,7 +9,6 @@
 #include "i915_irq.h"
 #include "i915_reg.h"
 #include "icl_dsi_regs.h"
-#include "intel_atomic_plane.h"
 #include "intel_crtc.h"
 #include "intel_de.h"
 #include "intel_display_irq.h"
@@ -27,6 +26,7 @@
 #include "intel_gmbus.h"
 #include "intel_hotplug_irq.h"
 #include "intel_pipe_crc_regs.h"
+#include "intel_plane.h"
 #include "intel_pmdemand.h"
 #include "intel_psr.h"
 #include "intel_psr_regs.h"
diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index a5906cb4900c..763b36c4de10 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -11,7 +11,6 @@
 #include <drm/drm_modeset_helper.h>
 
 #include "i915_drv.h"
-#include "intel_atomic_plane.h"
 #include "intel_bo.h"
 #include "intel_display.h"
 #include "intel_display_core.h"
@@ -20,6 +19,7 @@
 #include "intel_fb.h"
 #include "intel_fb_bo.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 
 #define check_array_bounds(display, a, i) drm_WARN_ON((display)->drm, (i) >= ARRAY_SIZE(a))
 
diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index 98a61a7b0b93..fcc88e677e47 100644
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -11,13 +11,13 @@
 #include "gem/i915_gem_object.h"
 
 #include "i915_drv.h"
-#include "intel_atomic_plane.h"
 #include "intel_display_core.h"
 #include "intel_display_rpm.h"
 #include "intel_display_types.h"
 #include "intel_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,
diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
similarity index 99%
rename from drivers/gpu/drm/i915/display/intel_atomic_plane.c
rename to drivers/gpu/drm/i915/display/intel_plane.c
index 15ede7678636..f079963c5dff 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -45,7 +45,6 @@
 #include "i915_scheduler_types.h"
 #include "i915_vma.h"
 #include "i9xx_plane_regs.h"
-#include "intel_atomic_plane.h"
 #include "intel_cdclk.h"
 #include "intel_cursor.h"
 #include "intel_display_rps.h"
@@ -53,6 +52,7 @@
 #include "intel_display_types.h"
 #include "intel_fb.h"
 #include "intel_fb_pin.h"
+#include "intel_plane.h"
 #include "skl_scaler.h"
 #include "skl_universal_plane.h"
 #include "skl_watermark.h"
diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
similarity index 97%
rename from drivers/gpu/drm/i915/display/intel_atomic_plane.h
rename to drivers/gpu/drm/i915/display/intel_plane.h
index 317320c32285..1dd32586ac16 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.h
+++ b/drivers/gpu/drm/i915/display/intel_plane.h
@@ -3,8 +3,8 @@
  * Copyright © 2019 Intel Corporation
  */
 
-#ifndef __INTEL_ATOMIC_PLANE_H__
-#define __INTEL_ATOMIC_PLANE_H__
+#ifndef __INTEL_PLANE_H__
+#define __INTEL_PLANE_H__
 
 #include <linux/types.h>
 
@@ -94,4 +94,4 @@ bool intel_plane_format_mod_supported_async(struct drm_plane *plane,
 					    u32 format,
 					    u64 modifier);
 
-#endif /* __INTEL_ATOMIC_PLANE_H__ */
+#endif /* __INTEL_PLANE_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index 8800a657cd21..2194d39a5c98 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -6,13 +6,13 @@
 #include "gem/i915_gem_lmem.h"
 #include "gem/i915_gem_region.h"
 #include "i915_drv.h"
-#include "intel_atomic_plane.h"
 #include "intel_crtc.h"
 #include "intel_display.h"
 #include "intel_display_core.h"
 #include "intel_display_types.h"
 #include "intel_fb.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_plane_initial.h"
 
 void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index fd92e6b89b43..db0c48d0c743 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -41,11 +41,11 @@
 
 #include "i915_utils.h"
 #include "i9xx_plane.h"
-#include "intel_atomic_plane.h"
 #include "intel_de.h"
 #include "intel_display_types.h"
 #include "intel_fb.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_sprite.h"
 #include "intel_sprite_regs.h"
 
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 2aa64482d44b..9c8dac97cc40 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -9,9 +9,7 @@
 #include <drm/drm_fourcc.h>
 
 #include "pxp/intel_pxp.h"
-
 #include "i915_drv.h"
-#include "intel_atomic_plane.h"
 #include "intel_bo.h"
 #include "intel_de.h"
 #include "intel_display_irq.h"
@@ -21,6 +19,7 @@
 #include "intel_fb.h"
 #include "intel_fbc.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_psr.h"
 #include "intel_psr_regs.h"
 #include "skl_scaler.h"
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 2c2371574d6f..c2e11d9ee652 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -13,7 +13,6 @@
 #include "i915_reg.h"
 #include "i9xx_wm.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_bw.h"
 #include "intel_cdclk.h"
 #include "intel_crtc.h"
@@ -27,6 +26,7 @@
 #include "intel_fb.h"
 #include "intel_fixed.h"
 #include "intel_pcode.h"
+#include "intel_plane.h"
 #include "intel_wm.h"
 #include "skl_universal_plane_regs.h"
 #include "skl_watermark.h"
diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index f5f5775acdc0..40d01751b49e 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -205,7 +205,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
 	i915-display/icl_dsi.o \
 	i915-display/intel_alpm.o \
 	i915-display/intel_atomic.o \
-	i915-display/intel_atomic_plane.o \
 	i915-display/intel_audio.o \
 	i915-display/intel_backlight.o \
 	i915-display/intel_bios.o \
@@ -271,6 +270,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
 	i915-display/intel_modeset_verify.o \
 	i915-display/intel_panel.o \
 	i915-display/intel_pfit.o \
+	i915-display/intel_plane.o \
 	i915-display/intel_pmdemand.o \
 	i915-display/intel_pch.o \
 	i915-display/intel_pps.o \
diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c
index af47ce34102c..b2ede3af9345 100644
--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
@@ -10,7 +10,6 @@
 #include "xe_ggtt.h"
 #include "xe_mmio.h"
 
-#include "intel_atomic_plane.h"
 #include "intel_crtc.h"
 #include "intel_display.h"
 #include "intel_display_core.h"
@@ -19,6 +18,7 @@
 #include "intel_fb.h"
 #include "intel_fb_pin.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_plane_initial.h"
 #include "xe_bo.h"
 #include "xe_wa.h"
-- 
2.39.5

[RESEND 2/5] drm/i915/plane: drop atomic from intel_atomic_plane_check_clipping()

[Jani Nikula]

Align with intel_plane_check_src_coordinates(). The "atomic" is
superfluous.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/i9xx_plane.c          |  8 ++++----
 drivers/gpu/drm/i915/display/intel_cursor.c        |  8 ++++----
 drivers/gpu/drm/i915/display/intel_plane.c         |  8 ++++----
 drivers/gpu/drm/i915/display/intel_plane.h         |  8 ++++----
 drivers/gpu/drm/i915/display/intel_sprite.c        | 12 ++++++------
 drivers/gpu/drm/i915/display/skl_universal_plane.c |  4 ++--
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index eba8eb745aa7..ac84558006c7 100644
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -336,10 +336,10 @@ i9xx_plane_check(struct intel_crtc_state *crtc_state,
 	if (ret)
 		return ret;
 
-	ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
-						DRM_PLANE_NO_SCALING,
-						DRM_PLANE_NO_SCALING,
-						i9xx_plane_has_windowing(plane));
+	ret = intel_plane_check_clipping(plane_state, crtc_state,
+					 DRM_PLANE_NO_SCALING,
+					 DRM_PLANE_NO_SCALING,
+					 i9xx_plane_has_windowing(plane));
 	if (ret)
 		return ret;
 
diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index 27d86549af2c..198e69efe9ac 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -158,10 +158,10 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
 		return -EINVAL;
 	}
 
-	ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
-						DRM_PLANE_NO_SCALING,
-						DRM_PLANE_NO_SCALING,
-						true);
+	ret = intel_plane_check_clipping(plane_state, crtc_state,
+					 DRM_PLANE_NO_SCALING,
+					 DRM_PLANE_NO_SCALING,
+					 true);
 	if (ret)
 		return ret;
 
diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
index f079963c5dff..f68432d28d36 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -983,10 +983,10 @@ void intel_crtc_planes_update_arm(struct intel_dsb *dsb,
 		i9xx_crtc_planes_update_arm(dsb, state, crtc);
 }
 
-int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state,
-				      struct intel_crtc_state *crtc_state,
-				      int min_scale, int max_scale,
-				      bool can_position)
+int intel_plane_check_clipping(struct intel_plane_state *plane_state,
+			       struct intel_crtc_state *crtc_state,
+			       int min_scale, int max_scale,
+			       bool can_position)
 {
 	struct intel_display *display = to_intel_display(plane_state);
 	struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
index 1dd32586ac16..10a94b9a135c 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.h
+++ b/drivers/gpu/drm/i915/display/intel_plane.h
@@ -74,10 +74,10 @@ int intel_plane_atomic_check(struct intel_atomic_state *state,
 int intel_plane_calc_min_cdclk(struct intel_atomic_state *state,
 			       struct intel_plane *plane,
 			       bool *need_cdclk_calc);
-int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state,
-				      struct intel_crtc_state *crtc_state,
-				      int min_scale, int max_scale,
-				      bool can_position);
+int intel_plane_check_clipping(struct intel_plane_state *plane_state,
+			       struct intel_crtc_state *crtc_state,
+			       int min_scale, int max_scale,
+			       bool can_position);
 int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state);
 void intel_plane_set_invisible(struct intel_crtc_state *crtc_state,
 			       struct intel_plane_state *plane_state);
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index db0c48d0c743..e6844df837af 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -1366,8 +1366,8 @@ g4x_sprite_check(struct intel_crtc_state *crtc_state,
 		}
 	}
 
-	ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
-						min_scale, max_scale, true);
+	ret = intel_plane_check_clipping(plane_state, crtc_state,
+					 min_scale, max_scale, true);
 	if (ret)
 		return ret;
 
@@ -1421,10 +1421,10 @@ vlv_sprite_check(struct intel_crtc_state *crtc_state,
 	if (ret)
 		return ret;
 
-	ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
-						DRM_PLANE_NO_SCALING,
-						DRM_PLANE_NO_SCALING,
-						true);
+	ret = intel_plane_check_clipping(plane_state, crtc_state,
+					 DRM_PLANE_NO_SCALING,
+					 DRM_PLANE_NO_SCALING,
+					 true);
 	if (ret)
 		return ret;
 
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 9c8dac97cc40..68f18f18bacd 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -2327,8 +2327,8 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state,
 		max_scale = skl_plane_max_scale(display, fb);
 	}
 
-	ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
-						min_scale, max_scale, true);
+	ret = intel_plane_check_clipping(plane_state, crtc_state,
+					 min_scale, max_scale, true);
 	if (ret)
 		return ret;
 
-- 
2.39.5

[RESEND 3/5] drm/i915/plane: make intel_plane_atomic_check() static and rename

[Jani Nikula]

intel_plane_atomic_check() isn't used outside of intel_plane.c. Make it
static. While at it, rename to vacate the name for subsequent changes.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_plane.c | 6 +++---
 drivers/gpu/drm/i915/display/intel_plane.h | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
index f68432d28d36..fbbe957d3f04 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -734,8 +734,8 @@ intel_crtc_get_plane(struct intel_crtc *crtc, enum plane_id plane_id)
 	return NULL;
 }
 
-int intel_plane_atomic_check(struct intel_atomic_state *state,
-			     struct intel_plane *plane)
+static int plane_atomic_check(struct intel_atomic_state *state,
+			      struct intel_plane *plane)
 {
 	struct intel_display *display = to_intel_display(state);
 	struct intel_plane_state *new_plane_state =
@@ -1542,7 +1542,7 @@ int intel_atomic_check_planes(struct intel_atomic_state *state)
 		return ret;
 
 	for_each_new_intel_plane_in_state(state, plane, plane_state, i) {
-		ret = intel_plane_atomic_check(state, plane);
+		ret = plane_atomic_check(state, plane);
 		if (ret) {
 			drm_dbg_atomic(display->drm,
 				       "[PLANE:%d:%s] atomic driver check failed\n",
diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
index 10a94b9a135c..4d69a868265c 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.h
+++ b/drivers/gpu/drm/i915/display/intel_plane.h
@@ -69,8 +69,6 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
 					struct intel_crtc_state *crtc_state,
 					const struct intel_plane_state *old_plane_state,
 					struct intel_plane_state *intel_state);
-int intel_plane_atomic_check(struct intel_atomic_state *state,
-			     struct intel_plane *plane);
 int intel_plane_calc_min_cdclk(struct intel_atomic_state *state,
 			       struct intel_plane *plane,
 			       bool *need_cdclk_calc);
-- 
2.39.5

[RESEND 4/5] drm/i915/plane: rename intel_atomic_check_planes() to intel_plane_atomic_check()

[Jani Nikula]

Align with all the other atomic check functions.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 2 +-
 drivers/gpu/drm/i915/display/intel_plane.c   | 2 +-
 drivers/gpu/drm/i915/display/intel_plane.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index acc03b4c9e89..bd81ff9e3854 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6447,7 +6447,7 @@ int intel_atomic_check(struct drm_device *dev,
 		goto fail;
 	}
 
-	ret = intel_atomic_check_planes(state);
+	ret = intel_plane_atomic_check(state);
 	if (ret)
 		goto fail;
 
diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
index fbbe957d3f04..2ac7a4e655f5 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -1528,7 +1528,7 @@ static int intel_add_affected_planes(struct intel_atomic_state *state)
 	return 0;
 }
 
-int intel_atomic_check_planes(struct intel_atomic_state *state)
+int intel_plane_atomic_check(struct intel_atomic_state *state)
 {
 	struct intel_display *display = to_intel_display(state);
 	struct intel_crtc_state *old_crtc_state, *new_crtc_state;
diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
index 4d69a868265c..5cb995b2940f 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.h
+++ b/drivers/gpu/drm/i915/display/intel_plane.h
@@ -85,7 +85,7 @@ void intel_plane_init_cursor_vblank_work(struct intel_plane_state *old_plane_sta
 					 struct intel_plane_state *new_plane_state);
 int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
 				     struct intel_crtc *crtc);
-int intel_atomic_check_planes(struct intel_atomic_state *state);
+int intel_plane_atomic_check(struct intel_atomic_state *state);
 
 u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state);
 bool intel_plane_format_mod_supported_async(struct drm_plane *plane,
-- 
2.39.5

[RESEND 5/5] drm/i915/plane: rename intel_atomic_add_affected_planes() to intel_plane_add_affected()

[Jani Nikula]

Rename to follow filename based naming.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
 drivers/gpu/drm/i915/display/intel_plane.c   | 4 ++--
 drivers/gpu/drm/i915/display/intel_plane.h   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index bd81ff9e3854..978c524546c6 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5479,7 +5479,7 @@ static int intel_modeset_pipe(struct intel_atomic_state *state,
 	if (ret)
 		return ret;
 
-	ret = intel_atomic_add_affected_planes(state, crtc);
+	ret = intel_plane_add_affected(state, crtc);
 	if (ret)
 		return ret;
 
@@ -6195,7 +6195,7 @@ static int intel_joiner_add_affected_crtcs(struct intel_atomic_state *state)
 		if (ret)
 			return ret;
 
-		ret = intel_atomic_add_affected_planes(state, crtc);
+		ret = intel_plane_add_affected(state, crtc);
 		if (ret)
 			return ret;
 	}
diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
index 2ac7a4e655f5..11aeb7435b05 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -1433,8 +1433,8 @@ static int intel_crtc_add_planes_to_state(struct intel_atomic_state *state,
 	return 0;
 }
 
-int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
-				     struct intel_crtc *crtc)
+int intel_plane_add_affected(struct intel_atomic_state *state,
+			     struct intel_crtc *crtc)
 {
 	const struct intel_crtc_state *old_crtc_state =
 		intel_atomic_get_old_crtc_state(state, crtc);
diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
index 5cb995b2940f..4ef012c08fa4 100644
--- a/drivers/gpu/drm/i915/display/intel_plane.h
+++ b/drivers/gpu/drm/i915/display/intel_plane.h
@@ -83,8 +83,8 @@ void intel_plane_helper_add(struct intel_plane *plane);
 bool intel_plane_needs_physical(struct intel_plane *plane);
 void intel_plane_init_cursor_vblank_work(struct intel_plane_state *old_plane_state,
 					 struct intel_plane_state *new_plane_state);
-int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
-				     struct intel_crtc *crtc);
+int intel_plane_add_affected(struct intel_atomic_state *state,
+			     struct intel_crtc *crtc);
 int intel_plane_atomic_check(struct intel_atomic_state *state);
 
 u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state);
-- 
2.39.5

Re: [RESEND 3/5] drm/i915/plane: make intel_plane_atomic_check() static and rename

[Gustavo Sousa]

Quoting Jani Nikula (2025-06-12 08:37:09-03:00)
>intel_plane_atomic_check() isn't used outside of intel_plane.c. Make it
>static. While at it, rename to vacate the name for subsequent changes.
>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>

>---
> drivers/gpu/drm/i915/display/intel_plane.c | 6 +++---
> drivers/gpu/drm/i915/display/intel_plane.h | 2 --
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
>index f68432d28d36..fbbe957d3f04 100644
>--- a/drivers/gpu/drm/i915/display/intel_plane.c
>+++ b/drivers/gpu/drm/i915/display/intel_plane.c
>@@ -734,8 +734,8 @@ intel_crtc_get_plane(struct intel_crtc *crtc, enum plane_id plane_id)
>         return NULL;
> }
> 
>-int intel_plane_atomic_check(struct intel_atomic_state *state,
>-                             struct intel_plane *plane)
>+static int plane_atomic_check(struct intel_atomic_state *state,
>+                              struct intel_plane *plane)
> {
>         struct intel_display *display = to_intel_display(state);
>         struct intel_plane_state *new_plane_state =
>@@ -1542,7 +1542,7 @@ int intel_atomic_check_planes(struct intel_atomic_state *state)
>                 return ret;
> 
>         for_each_new_intel_plane_in_state(state, plane, plane_state, i) {
>-                ret = intel_plane_atomic_check(state, plane);
>+                ret = plane_atomic_check(state, plane);
>                 if (ret) {
>                         drm_dbg_atomic(display->drm,
>                                        "[PLANE:%d:%s] atomic driver check failed\n",
>diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
>index 10a94b9a135c..4d69a868265c 100644
>--- a/drivers/gpu/drm/i915/display/intel_plane.h
>+++ b/drivers/gpu/drm/i915/display/intel_plane.h
>@@ -69,8 +69,6 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
>                                         struct intel_crtc_state *crtc_state,
>                                         const struct intel_plane_state *old_plane_state,
>                                         struct intel_plane_state *intel_state);
>-int intel_plane_atomic_check(struct intel_atomic_state *state,
>-                             struct intel_plane *plane);
> int intel_plane_calc_min_cdclk(struct intel_atomic_state *state,
>                                struct intel_plane *plane,
>                                bool *need_cdclk_calc);
>-- 
>2.39.5
>

Re: [RESEND 1/5] drm/i915/plane: rename intel_atomic_plane.[ch] to intel_plane.[ch]

[Gustavo Sousa]

Quoting Jani Nikula (2025-06-12 08:37:07-03:00)
>It's all atomic, no need to emphasize this.
>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>

I think we should also update the kernel-doc directives in
Documentation/gpu/i915.rst. With that addressed,

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>

>---
> drivers/gpu/drm/i915/Makefile                               | 4 ++--
> drivers/gpu/drm/i915/display/i9xx_plane.c                   | 2 +-
> drivers/gpu/drm/i915/display/intel_atomic.c                 | 2 +-
> drivers/gpu/drm/i915/display/intel_cdclk.c                  | 2 +-
> drivers/gpu/drm/i915/display/intel_crtc.c                   | 2 +-
> drivers/gpu/drm/i915/display/intel_cursor.c                 | 2 +-
> drivers/gpu/drm/i915/display/intel_display.c                | 2 +-
> drivers/gpu/drm/i915/display/intel_display_irq.c            | 2 +-
> drivers/gpu/drm/i915/display/intel_fb.c                     | 2 +-
> drivers/gpu/drm/i915/display/intel_fb_pin.c                 | 2 +-
> .../i915/display/{intel_atomic_plane.c => intel_plane.c}    | 2 +-
> .../i915/display/{intel_atomic_plane.h => intel_plane.h}    | 6 +++---
> drivers/gpu/drm/i915/display/intel_plane_initial.c          | 2 +-
> drivers/gpu/drm/i915/display/intel_sprite.c                 | 2 +-
> drivers/gpu/drm/i915/display/skl_universal_plane.c          | 3 +--
> drivers/gpu/drm/i915/display/skl_watermark.c                | 2 +-
> drivers/gpu/drm/xe/Makefile                                 | 2 +-
> drivers/gpu/drm/xe/display/xe_plane_initial.c               | 2 +-
> 18 files changed, 21 insertions(+), 22 deletions(-)
> rename drivers/gpu/drm/i915/display/{intel_atomic_plane.c => intel_plane.c} (99%)
> rename drivers/gpu/drm/i915/display/{intel_atomic_plane.h => intel_plane.h} (97%)
>
>diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
>index 7c6075bc483c..0c3fbd0d14e7 100644
>--- a/drivers/gpu/drm/i915/Makefile
>+++ b/drivers/gpu/drm/i915/Makefile
>@@ -218,12 +218,11 @@ i915-$(CONFIG_HWMON) += \
> # modesetting core code
> i915-y += \
>         display/hsw_ips.o \
>-        display/i9xx_plane.o \
>         display/i9xx_display_sr.o \
>+        display/i9xx_plane.o \
>         display/i9xx_wm.o \
>         display/intel_alpm.o \
>         display/intel_atomic.o \
>-        display/intel_atomic_plane.o \
>         display/intel_audio.o \
>         display/intel_bios.o \
>         display/intel_bo.o \
>@@ -283,6 +282,7 @@ i915-y += \
>         display/intel_pch.o \
>         display/intel_pch_display.o \
>         display/intel_pch_refclk.o \
>+        display/intel_plane.o \
>         display/intel_plane_initial.o \
>         display/intel_pmdemand.o \
>         display/intel_psr.o \
>diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
>index 8f15333a4b07..eba8eb745aa7 100644
>--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
>+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
>@@ -15,7 +15,6 @@
> #include "i9xx_plane.h"
> #include "i9xx_plane_regs.h"
> #include "intel_atomic.h"
>-#include "intel_atomic_plane.h"
> #include "intel_de.h"
> #include "intel_display_irq.h"
> #include "intel_display_regs.h"
>@@ -23,6 +22,7 @@
> #include "intel_fb.h"
> #include "intel_fbc.h"
> #include "intel_frontbuffer.h"
>+#include "intel_plane.h"
> #include "intel_sprite.h"
> 
> /* Primary plane formats for gen <= 3 */
>diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
>index f85edb374c97..348b1655435e 100644
>--- a/drivers/gpu/drm/i915/display/intel_atomic.c
>+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
>@@ -26,7 +26,7 @@
>  *
>  * The functions here implement the state management and hardware programming
>  * dispatch required by the atomic modeset infrastructure.
>- * See intel_atomic_plane.c for the plane-specific atomic functionality.
>+ * See intel_plane.c for the plane-specific atomic functionality.
>  */
> 
> #include <drm/display/drm_dp_tunnel.h>
>diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
>index 38b3094b37d7..bae85603543c 100644
>--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
>+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
>@@ -32,7 +32,6 @@
> #include "i915_drv.h"
> #include "i915_reg.h"
> #include "intel_atomic.h"
>-#include "intel_atomic_plane.h"
> #include "intel_audio.h"
> #include "intel_bw.h"
> #include "intel_cdclk.h"
>@@ -43,6 +42,7 @@
> #include "intel_mchbar_regs.h"
> #include "intel_pci_config.h"
> #include "intel_pcode.h"
>+#include "intel_plane.h"
> #include "intel_psr.h"
> #include "intel_vdsc.h"
> #include "skl_watermark.h"
>diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
>index a88317ea4e9c..a187db6df2d3 100644
>--- a/drivers/gpu/drm/i915/display/intel_crtc.c
>+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
>@@ -17,7 +17,6 @@
> #include "i9xx_plane.h"
> #include "icl_dsi.h"
> #include "intel_atomic.h"
>-#include "intel_atomic_plane.h"
> #include "intel_color.h"
> #include "intel_crtc.h"
> #include "intel_cursor.h"
>@@ -29,6 +28,7 @@
> #include "intel_dsi.h"
> #include "intel_fifo_underrun.h"
> #include "intel_pipe_crc.h"
>+#include "intel_plane.h"
> #include "intel_psr.h"
> #include "intel_sprite.h"
> #include "intel_vblank.h"
>diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
>index 6bd4f6a28cae..27d86549af2c 100644
>--- a/drivers/gpu/drm/i915/display/intel_cursor.c
>+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
>@@ -14,7 +14,6 @@
> 
> #include "i915_utils.h"
> #include "intel_atomic.h"
>-#include "intel_atomic_plane.h"
> #include "intel_cursor.h"
> #include "intel_cursor_regs.h"
> #include "intel_de.h"
>@@ -23,6 +22,7 @@
> #include "intel_fb.h"
> #include "intel_fb_pin.h"
> #include "intel_frontbuffer.h"
>+#include "intel_plane.h"
> #include "intel_psr.h"
> #include "intel_psr_regs.h"
> #include "intel_vblank.h"
>diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>index b0c7c46ffbe2..acc03b4c9e89 100644
>--- a/drivers/gpu/drm/i915/display/intel_display.c
>+++ b/drivers/gpu/drm/i915/display/intel_display.c
>@@ -57,7 +57,6 @@
> #include "i9xx_wm.h"
> #include "intel_alpm.h"
> #include "intel_atomic.h"
>-#include "intel_atomic_plane.h"
> #include "intel_audio.h"
> #include "intel_bo.h"
> #include "intel_bw.h"
>@@ -108,6 +107,7 @@
> #include "intel_pch_refclk.h"
> #include "intel_pfit.h"
> #include "intel_pipe_crc.h"
>+#include "intel_plane.h"
> #include "intel_plane_initial.h"
> #include "intel_pmdemand.h"
> #include "intel_pps.h"
>diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
>index 8d0dcf252bed..fb25ec8adae3 100644
>--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
>+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
>@@ -9,7 +9,6 @@
> #include "i915_irq.h"
> #include "i915_reg.h"
> #include "icl_dsi_regs.h"
>-#include "intel_atomic_plane.h"
> #include "intel_crtc.h"
> #include "intel_de.h"
> #include "intel_display_irq.h"
>@@ -27,6 +26,7 @@
> #include "intel_gmbus.h"
> #include "intel_hotplug_irq.h"
> #include "intel_pipe_crc_regs.h"
>+#include "intel_plane.h"
> #include "intel_pmdemand.h"
> #include "intel_psr.h"
> #include "intel_psr_regs.h"
>diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
>index a5906cb4900c..763b36c4de10 100644
>--- a/drivers/gpu/drm/i915/display/intel_fb.c
>+++ b/drivers/gpu/drm/i915/display/intel_fb.c
>@@ -11,7 +11,6 @@
> #include <drm/drm_modeset_helper.h>
> 
> #include "i915_drv.h"
>-#include "intel_atomic_plane.h"
> #include "intel_bo.h"
> #include "intel_display.h"
> #include "intel_display_core.h"
>@@ -20,6 +19,7 @@
> #include "intel_fb.h"
> #include "intel_fb_bo.h"
> #include "intel_frontbuffer.h"
>+#include "intel_plane.h"
> 
> #define check_array_bounds(display, a, i) drm_WARN_ON((display)->drm, (i) >= ARRAY_SIZE(a))
> 
>diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
>index 98a61a7b0b93..fcc88e677e47 100644
>--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
>+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
>@@ -11,13 +11,13 @@
> #include "gem/i915_gem_object.h"
> 
> #include "i915_drv.h"
>-#include "intel_atomic_plane.h"
> #include "intel_display_core.h"
> #include "intel_display_rpm.h"
> #include "intel_display_types.h"
> #include "intel_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,
>diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
>similarity index 99%
>rename from drivers/gpu/drm/i915/display/intel_atomic_plane.c
>rename to drivers/gpu/drm/i915/display/intel_plane.c
>index 15ede7678636..f079963c5dff 100644
>--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
>+++ b/drivers/gpu/drm/i915/display/intel_plane.c
>@@ -45,7 +45,6 @@
> #include "i915_scheduler_types.h"
> #include "i915_vma.h"
> #include "i9xx_plane_regs.h"
>-#include "intel_atomic_plane.h"
> #include "intel_cdclk.h"
> #include "intel_cursor.h"
> #include "intel_display_rps.h"
>@@ -53,6 +52,7 @@
> #include "intel_display_types.h"
> #include "intel_fb.h"
> #include "intel_fb_pin.h"
>+#include "intel_plane.h"
> #include "skl_scaler.h"
> #include "skl_universal_plane.h"
> #include "skl_watermark.h"
>diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
>similarity index 97%
>rename from drivers/gpu/drm/i915/display/intel_atomic_plane.h
>rename to drivers/gpu/drm/i915/display/intel_plane.h
>index 317320c32285..1dd32586ac16 100644
>--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.h
>+++ b/drivers/gpu/drm/i915/display/intel_plane.h
>@@ -3,8 +3,8 @@
>  * Copyright © 2019 Intel Corporation
>  */
> 
>-#ifndef __INTEL_ATOMIC_PLANE_H__
>-#define __INTEL_ATOMIC_PLANE_H__
>+#ifndef __INTEL_PLANE_H__
>+#define __INTEL_PLANE_H__
> 
> #include <linux/types.h>
> 
>@@ -94,4 +94,4 @@ bool intel_plane_format_mod_supported_async(struct drm_plane *plane,
>                                             u32 format,
>                                             u64 modifier);
> 
>-#endif /* __INTEL_ATOMIC_PLANE_H__ */
>+#endif /* __INTEL_PLANE_H__ */
>diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
>index 8800a657cd21..2194d39a5c98 100644
>--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
>+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
>@@ -6,13 +6,13 @@
> #include "gem/i915_gem_lmem.h"
> #include "gem/i915_gem_region.h"
> #include "i915_drv.h"
>-#include "intel_atomic_plane.h"
> #include "intel_crtc.h"
> #include "intel_display.h"
> #include "intel_display_core.h"
> #include "intel_display_types.h"
> #include "intel_fb.h"
> #include "intel_frontbuffer.h"
>+#include "intel_plane.h"
> #include "intel_plane_initial.h"
> 
> void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)
>diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
>index fd92e6b89b43..db0c48d0c743 100644
>--- a/drivers/gpu/drm/i915/display/intel_sprite.c
>+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
>@@ -41,11 +41,11 @@
> 
> #include "i915_utils.h"
> #include "i9xx_plane.h"
>-#include "intel_atomic_plane.h"
> #include "intel_de.h"
> #include "intel_display_types.h"
> #include "intel_fb.h"
> #include "intel_frontbuffer.h"
>+#include "intel_plane.h"
> #include "intel_sprite.h"
> #include "intel_sprite_regs.h"
> 
>diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>index 2aa64482d44b..9c8dac97cc40 100644
>--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
>+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>@@ -9,9 +9,7 @@
> #include <drm/drm_fourcc.h>
> 
> #include "pxp/intel_pxp.h"
>-
> #include "i915_drv.h"
>-#include "intel_atomic_plane.h"
> #include "intel_bo.h"
> #include "intel_de.h"
> #include "intel_display_irq.h"
>@@ -21,6 +19,7 @@
> #include "intel_fb.h"
> #include "intel_fbc.h"
> #include "intel_frontbuffer.h"
>+#include "intel_plane.h"
> #include "intel_psr.h"
> #include "intel_psr_regs.h"
> #include "skl_scaler.h"
>diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
>index 2c2371574d6f..c2e11d9ee652 100644
>--- a/drivers/gpu/drm/i915/display/skl_watermark.c
>+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
>@@ -13,7 +13,6 @@
> #include "i915_reg.h"
> #include "i9xx_wm.h"
> #include "intel_atomic.h"
>-#include "intel_atomic_plane.h"
> #include "intel_bw.h"
> #include "intel_cdclk.h"
> #include "intel_crtc.h"
>@@ -27,6 +26,7 @@
> #include "intel_fb.h"
> #include "intel_fixed.h"
> #include "intel_pcode.h"
>+#include "intel_plane.h"
> #include "intel_wm.h"
> #include "skl_universal_plane_regs.h"
> #include "skl_watermark.h"
>diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
>index f5f5775acdc0..40d01751b49e 100644
>--- a/drivers/gpu/drm/xe/Makefile
>+++ b/drivers/gpu/drm/xe/Makefile
>@@ -205,7 +205,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
>         i915-display/icl_dsi.o \
>         i915-display/intel_alpm.o \
>         i915-display/intel_atomic.o \
>-        i915-display/intel_atomic_plane.o \
>         i915-display/intel_audio.o \
>         i915-display/intel_backlight.o \
>         i915-display/intel_bios.o \
>@@ -271,6 +270,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
>         i915-display/intel_modeset_verify.o \
>         i915-display/intel_panel.o \
>         i915-display/intel_pfit.o \
>+        i915-display/intel_plane.o \
>         i915-display/intel_pmdemand.o \
>         i915-display/intel_pch.o \
>         i915-display/intel_pps.o \
>diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c
>index af47ce34102c..b2ede3af9345 100644
>--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
>+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
>@@ -10,7 +10,6 @@
> #include "xe_ggtt.h"
> #include "xe_mmio.h"
> 
>-#include "intel_atomic_plane.h"
> #include "intel_crtc.h"
> #include "intel_display.h"
> #include "intel_display_core.h"
>@@ -19,6 +18,7 @@
> #include "intel_fb.h"
> #include "intel_fb_pin.h"
> #include "intel_frontbuffer.h"
>+#include "intel_plane.h"
> #include "intel_plane_initial.h"
> #include "xe_bo.h"
> #include "xe_wa.h"
>-- 
>2.39.5
>

Re: [RESEND 2/5] drm/i915/plane: drop atomic from intel_atomic_plane_check_clipping()

[Gustavo Sousa]

Quoting Jani Nikula (2025-06-12 08:37:08-03:00)
>Align with intel_plane_check_src_coordinates(). The "atomic" is
>superfluous.
>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>

>---
> drivers/gpu/drm/i915/display/i9xx_plane.c          |  8 ++++----
> drivers/gpu/drm/i915/display/intel_cursor.c        |  8 ++++----
> drivers/gpu/drm/i915/display/intel_plane.c         |  8 ++++----
> drivers/gpu/drm/i915/display/intel_plane.h         |  8 ++++----
> drivers/gpu/drm/i915/display/intel_sprite.c        | 12 ++++++------
> drivers/gpu/drm/i915/display/skl_universal_plane.c |  4 ++--
> 6 files changed, 24 insertions(+), 24 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
>index eba8eb745aa7..ac84558006c7 100644
>--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
>+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
>@@ -336,10 +336,10 @@ i9xx_plane_check(struct intel_crtc_state *crtc_state,
>         if (ret)
>                 return ret;
> 
>-        ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
>-                                                DRM_PLANE_NO_SCALING,
>-                                                DRM_PLANE_NO_SCALING,
>-                                                i9xx_plane_has_windowing(plane));
>+        ret = intel_plane_check_clipping(plane_state, crtc_state,
>+                                         DRM_PLANE_NO_SCALING,
>+                                         DRM_PLANE_NO_SCALING,
>+                                         i9xx_plane_has_windowing(plane));
>         if (ret)
>                 return ret;
> 
>diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
>index 27d86549af2c..198e69efe9ac 100644
>--- a/drivers/gpu/drm/i915/display/intel_cursor.c
>+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
>@@ -158,10 +158,10 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
>                 return -EINVAL;
>         }
> 
>-        ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
>-                                                DRM_PLANE_NO_SCALING,
>-                                                DRM_PLANE_NO_SCALING,
>-                                                true);
>+        ret = intel_plane_check_clipping(plane_state, crtc_state,
>+                                         DRM_PLANE_NO_SCALING,
>+                                         DRM_PLANE_NO_SCALING,
>+                                         true);
>         if (ret)
>                 return ret;
> 
>diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
>index f079963c5dff..f68432d28d36 100644
>--- a/drivers/gpu/drm/i915/display/intel_plane.c
>+++ b/drivers/gpu/drm/i915/display/intel_plane.c
>@@ -983,10 +983,10 @@ void intel_crtc_planes_update_arm(struct intel_dsb *dsb,
>                 i9xx_crtc_planes_update_arm(dsb, state, crtc);
> }
> 
>-int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state,
>-                                      struct intel_crtc_state *crtc_state,
>-                                      int min_scale, int max_scale,
>-                                      bool can_position)
>+int intel_plane_check_clipping(struct intel_plane_state *plane_state,
>+                               struct intel_crtc_state *crtc_state,
>+                               int min_scale, int max_scale,
>+                               bool can_position)
> {
>         struct intel_display *display = to_intel_display(plane_state);
>         struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
>diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
>index 1dd32586ac16..10a94b9a135c 100644
>--- a/drivers/gpu/drm/i915/display/intel_plane.h
>+++ b/drivers/gpu/drm/i915/display/intel_plane.h
>@@ -74,10 +74,10 @@ int intel_plane_atomic_check(struct intel_atomic_state *state,
> int intel_plane_calc_min_cdclk(struct intel_atomic_state *state,
>                                struct intel_plane *plane,
>                                bool *need_cdclk_calc);
>-int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state,
>-                                      struct intel_crtc_state *crtc_state,
>-                                      int min_scale, int max_scale,
>-                                      bool can_position);
>+int intel_plane_check_clipping(struct intel_plane_state *plane_state,
>+                               struct intel_crtc_state *crtc_state,
>+                               int min_scale, int max_scale,
>+                               bool can_position);
> int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state);
> void intel_plane_set_invisible(struct intel_crtc_state *crtc_state,
>                                struct intel_plane_state *plane_state);
>diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
>index db0c48d0c743..e6844df837af 100644
>--- a/drivers/gpu/drm/i915/display/intel_sprite.c
>+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
>@@ -1366,8 +1366,8 @@ g4x_sprite_check(struct intel_crtc_state *crtc_state,
>                 }
>         }
> 
>-        ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
>-                                                min_scale, max_scale, true);
>+        ret = intel_plane_check_clipping(plane_state, crtc_state,
>+                                         min_scale, max_scale, true);
>         if (ret)
>                 return ret;
> 
>@@ -1421,10 +1421,10 @@ vlv_sprite_check(struct intel_crtc_state *crtc_state,
>         if (ret)
>                 return ret;
> 
>-        ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
>-                                                DRM_PLANE_NO_SCALING,
>-                                                DRM_PLANE_NO_SCALING,
>-                                                true);
>+        ret = intel_plane_check_clipping(plane_state, crtc_state,
>+                                         DRM_PLANE_NO_SCALING,
>+                                         DRM_PLANE_NO_SCALING,
>+                                         true);
>         if (ret)
>                 return ret;
> 
>diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>index 9c8dac97cc40..68f18f18bacd 100644
>--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
>+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>@@ -2327,8 +2327,8 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state,
>                 max_scale = skl_plane_max_scale(display, fb);
>         }
> 
>-        ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
>-                                                min_scale, max_scale, true);
>+        ret = intel_plane_check_clipping(plane_state, crtc_state,
>+                                         min_scale, max_scale, true);
>         if (ret)
>                 return ret;
> 
>-- 
>2.39.5
>

Re: [RESEND 4/5] drm/i915/plane: rename intel_atomic_check_planes() to intel_plane_atomic_check()

[Gustavo Sousa]

Quoting Jani Nikula (2025-06-12 08:37:10-03:00)
>Align with all the other atomic check functions.
>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>

>---
> drivers/gpu/drm/i915/display/intel_display.c | 2 +-
> drivers/gpu/drm/i915/display/intel_plane.c   | 2 +-
> drivers/gpu/drm/i915/display/intel_plane.h   | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>index acc03b4c9e89..bd81ff9e3854 100644
>--- a/drivers/gpu/drm/i915/display/intel_display.c
>+++ b/drivers/gpu/drm/i915/display/intel_display.c
>@@ -6447,7 +6447,7 @@ int intel_atomic_check(struct drm_device *dev,
>                 goto fail;
>         }
> 
>-        ret = intel_atomic_check_planes(state);
>+        ret = intel_plane_atomic_check(state);
>         if (ret)
>                 goto fail;
> 
>diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
>index fbbe957d3f04..2ac7a4e655f5 100644
>--- a/drivers/gpu/drm/i915/display/intel_plane.c
>+++ b/drivers/gpu/drm/i915/display/intel_plane.c
>@@ -1528,7 +1528,7 @@ static int intel_add_affected_planes(struct intel_atomic_state *state)
>         return 0;
> }
> 
>-int intel_atomic_check_planes(struct intel_atomic_state *state)
>+int intel_plane_atomic_check(struct intel_atomic_state *state)
> {
>         struct intel_display *display = to_intel_display(state);
>         struct intel_crtc_state *old_crtc_state, *new_crtc_state;
>diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
>index 4d69a868265c..5cb995b2940f 100644
>--- a/drivers/gpu/drm/i915/display/intel_plane.h
>+++ b/drivers/gpu/drm/i915/display/intel_plane.h
>@@ -85,7 +85,7 @@ void intel_plane_init_cursor_vblank_work(struct intel_plane_state *old_plane_sta
>                                          struct intel_plane_state *new_plane_state);
> int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
>                                      struct intel_crtc *crtc);
>-int intel_atomic_check_planes(struct intel_atomic_state *state);
>+int intel_plane_atomic_check(struct intel_atomic_state *state);
> 
> u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state);
> bool intel_plane_format_mod_supported_async(struct drm_plane *plane,
>-- 
>2.39.5
>

Re: [RESEND 5/5] drm/i915/plane: rename intel_atomic_add_affected_planes() to intel_plane_add_affected()

[Gustavo Sousa]

Quoting Jani Nikula (2025-06-12 08:37:11-03:00)
>Rename to follow filename based naming.
>
>Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>

>---
> drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_plane.c   | 4 ++--
> drivers/gpu/drm/i915/display/intel_plane.h   | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>index bd81ff9e3854..978c524546c6 100644
>--- a/drivers/gpu/drm/i915/display/intel_display.c
>+++ b/drivers/gpu/drm/i915/display/intel_display.c
>@@ -5479,7 +5479,7 @@ static int intel_modeset_pipe(struct intel_atomic_state *state,
>         if (ret)
>                 return ret;
> 
>-        ret = intel_atomic_add_affected_planes(state, crtc);
>+        ret = intel_plane_add_affected(state, crtc);
>         if (ret)
>                 return ret;
> 
>@@ -6195,7 +6195,7 @@ static int intel_joiner_add_affected_crtcs(struct intel_atomic_state *state)
>                 if (ret)
>                         return ret;
> 
>-                ret = intel_atomic_add_affected_planes(state, crtc);
>+                ret = intel_plane_add_affected(state, crtc);
>                 if (ret)
>                         return ret;
>         }
>diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
>index 2ac7a4e655f5..11aeb7435b05 100644
>--- a/drivers/gpu/drm/i915/display/intel_plane.c
>+++ b/drivers/gpu/drm/i915/display/intel_plane.c
>@@ -1433,8 +1433,8 @@ static int intel_crtc_add_planes_to_state(struct intel_atomic_state *state,
>         return 0;
> }
> 
>-int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
>-                                     struct intel_crtc *crtc)
>+int intel_plane_add_affected(struct intel_atomic_state *state,
>+                             struct intel_crtc *crtc)
> {
>         const struct intel_crtc_state *old_crtc_state =
>                 intel_atomic_get_old_crtc_state(state, crtc);
>diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
>index 5cb995b2940f..4ef012c08fa4 100644
>--- a/drivers/gpu/drm/i915/display/intel_plane.h
>+++ b/drivers/gpu/drm/i915/display/intel_plane.h
>@@ -83,8 +83,8 @@ void intel_plane_helper_add(struct intel_plane *plane);
> bool intel_plane_needs_physical(struct intel_plane *plane);
> void intel_plane_init_cursor_vblank_work(struct intel_plane_state *old_plane_state,
>                                          struct intel_plane_state *new_plane_state);
>-int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
>-                                     struct intel_crtc *crtc);
>+int intel_plane_add_affected(struct intel_atomic_state *state,
>+                             struct intel_crtc *crtc);
> int intel_plane_atomic_check(struct intel_atomic_state *state);
> 
> u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state);
>-- 
>2.39.5
>

✗ i915.CI.BAT: failure for drm/i915/plane: file and function renames (rev2)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 6856 bytes --]

== Series Details ==

Series: drm/i915/plane: file and function renames (rev2)
URL   : https://patchwork.freedesktop.org/series/147416/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_16692 -> Patchwork_147416v2
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_147416v2 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_147416v2, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/index.html

Participating hosts (40 -> 40)
------------------------------

  Additional (1): bat-arlh-2 
  Missing    (1): fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_147416v2:

### IGT changes ###

#### Possible regressions ####

  * igt@prime_self_import@basic-with_one_bo:
    - bat-arlh-2:         NOTRUN -> [ABORT][1]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@prime_self_import@basic-with_one_bo.html

  
Known issues
------------

  Here are the changes found in Patchwork_147416v2 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@fbdev@eof:
    - bat-arlh-2:         NOTRUN -> [SKIP][2] ([i915#11345] / [i915#11346]) +3 other tests skip
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@fbdev@eof.html

  * igt@fbdev@info:
    - bat-arlh-2:         NOTRUN -> [SKIP][3] ([i915#11346] / [i915#1849])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@fbdev@info.html

  * igt@gem_mmap@basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][4] ([i915#11343] / [i915#11346])
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@gem_mmap@basic.html

  * igt@gem_render_tiled_blits@basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][5] ([i915#10197] / [i915#10211] / [i915#11346] / [i915#11725] / [i915#4079])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@gem_render_tiled_blits@basic.html

  * igt@gem_tiled_fence_blits@basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][6] ([i915#11346] / [i915#12637]) +2 other tests skip
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@gem_tiled_fence_blits@basic.html

  * igt@gem_tiled_pread_basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][7] ([i915#10206] / [i915#11346] / [i915#11724] / [i915#4079])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@gem_tiled_pread_basic.html

  * igt@i915_pm_rps@basic-api:
    - bat-arlh-2:         NOTRUN -> [SKIP][8] ([i915#10209] / [i915#11346] / [i915#11681])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@i915_pm_rps@basic-api.html

  * igt@intel_hwmon@hwmon-read:
    - bat-arlh-2:         NOTRUN -> [SKIP][9] ([i915#11346] / [i915#11680] / [i915#7707]) +1 other test skip
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@intel_hwmon@hwmon-read.html

  * igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
    - bat-arlh-2:         NOTRUN -> [SKIP][10] ([i915#10200] / [i915#11346] / [i915#11666] / [i915#12203])
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html

  * igt@kms_addfb_basic@basic-x-tiled-legacy:
    - bat-arlh-2:         NOTRUN -> [SKIP][11] ([i915#10200] / [i915#11346] / [i915#11666]) +8 other tests skip
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@kms_addfb_basic@basic-x-tiled-legacy.html

  * igt@kms_pipe_crc_basic@read-crc-frame-sequence:
    - bat-arlh-2:         NOTRUN -> [SKIP][12] ([i915#11190] / [i915#11346]) +16 other tests skip
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@kms_pipe_crc_basic@read-crc-frame-sequence.html

  * igt@kms_pm_backlight@basic-brightness:
    - bat-arlh-2:         NOTRUN -> [SKIP][13] ([i915#11346]) +14 other tests skip
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@kms_pm_backlight@basic-brightness.html

  * igt@kms_setmode@basic-clone-single-crtc:
    - bat-arlh-2:         NOTRUN -> [SKIP][14] ([i915#10208] / [i915#11346] / [i915#8809])
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/bat-arlh-2/igt@kms_setmode@basic-clone-single-crtc.html

  
  [i915#10197]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10197
  [i915#10200]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10200
  [i915#10206]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10206
  [i915#10208]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10208
  [i915#10209]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10209
  [i915#10211]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10211
  [i915#11190]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11190
  [i915#11343]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11343
  [i915#11345]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11345
  [i915#11346]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11346
  [i915#11666]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11666
  [i915#11680]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11680
  [i915#11681]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11681
  [i915#11724]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11724
  [i915#11725]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11725
  [i915#12203]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12203
  [i915#12637]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12637
  [i915#1849]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1849
  [i915#4079]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4079
  [i915#7707]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7707
  [i915#8809]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8809


Build changes
-------------

  * Linux: CI_DRM_16692 -> Patchwork_147416v2

  CI-20190529: 20190529
  CI_DRM_16692: b5ef50f5d944d569d6eda26728bffb78c4ef6fa2 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8406: 12d7c99650c85e479571b6db2c392408be474c88 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_147416v2: b5ef50f5d944d569d6eda26728bffb78c4ef6fa2 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v2/index.html

[-- Attachment #2: Type: text/html, Size: 8890 bytes --]

[PATCH v2] drm/i915/plane: rename intel_atomic_plane.[ch] to intel_plane.[ch]

[Jani Nikula]

It's all atomic, no need to emphasize this.

v2: Also update Documentation/gpu/i915.rst (Gustavo)

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 Documentation/gpu/i915.rst                                  | 4 ++--
 drivers/gpu/drm/i915/Makefile                               | 4 ++--
 drivers/gpu/drm/i915/display/i9xx_plane.c                   | 2 +-
 drivers/gpu/drm/i915/display/intel_atomic.c                 | 2 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c                  | 2 +-
 drivers/gpu/drm/i915/display/intel_crtc.c                   | 2 +-
 drivers/gpu/drm/i915/display/intel_cursor.c                 | 2 +-
 drivers/gpu/drm/i915/display/intel_display.c                | 2 +-
 drivers/gpu/drm/i915/display/intel_display_irq.c            | 2 +-
 drivers/gpu/drm/i915/display/intel_fb.c                     | 2 +-
 drivers/gpu/drm/i915/display/intel_fb_pin.c                 | 2 +-
 .../i915/display/{intel_atomic_plane.c => intel_plane.c}    | 2 +-
 .../i915/display/{intel_atomic_plane.h => intel_plane.h}    | 6 +++---
 drivers/gpu/drm/i915/display/intel_plane_initial.c          | 2 +-
 drivers/gpu/drm/i915/display/intel_sprite.c                 | 2 +-
 drivers/gpu/drm/i915/display/skl_universal_plane.c          | 3 +--
 drivers/gpu/drm/i915/display/skl_watermark.c                | 2 +-
 drivers/gpu/drm/xe/Makefile                                 | 2 +-
 drivers/gpu/drm/xe/display/xe_plane_initial.c               | 2 +-
 19 files changed, 23 insertions(+), 24 deletions(-)
 rename drivers/gpu/drm/i915/display/{intel_atomic_plane.c => intel_plane.c} (99%)
 rename drivers/gpu/drm/i915/display/{intel_atomic_plane.h => intel_plane.h} (97%)

diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index 7a469df675d8..5c5436413d7a 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -112,10 +112,10 @@ panel self refresh.
 Atomic Plane Helpers
 --------------------
 
-.. kernel-doc:: drivers/gpu/drm/i915/display/intel_atomic_plane.c
+.. kernel-doc:: drivers/gpu/drm/i915/display/intel_plane.c
    :doc: atomic plane helpers
 
-.. kernel-doc:: drivers/gpu/drm/i915/display/intel_atomic_plane.c
+.. kernel-doc:: drivers/gpu/drm/i915/display/intel_plane.c
    :internal:
 
 Asynchronous Page Flip
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 7c6075bc483c..0c3fbd0d14e7 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -218,12 +218,11 @@ i915-$(CONFIG_HWMON) += \
 # modesetting core code
 i915-y += \
 	display/hsw_ips.o \
-	display/i9xx_plane.o \
 	display/i9xx_display_sr.o \
+	display/i9xx_plane.o \
 	display/i9xx_wm.o \
 	display/intel_alpm.o \
 	display/intel_atomic.o \
-	display/intel_atomic_plane.o \
 	display/intel_audio.o \
 	display/intel_bios.o \
 	display/intel_bo.o \
@@ -283,6 +282,7 @@ i915-y += \
 	display/intel_pch.o \
 	display/intel_pch_display.o \
 	display/intel_pch_refclk.o \
+	display/intel_plane.o \
 	display/intel_plane_initial.o \
 	display/intel_pmdemand.o \
 	display/intel_psr.o \
diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index 8f15333a4b07..eba8eb745aa7 100644
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -15,7 +15,6 @@
 #include "i9xx_plane.h"
 #include "i9xx_plane_regs.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_de.h"
 #include "intel_display_irq.h"
 #include "intel_display_regs.h"
@@ -23,6 +22,7 @@
 #include "intel_fb.h"
 #include "intel_fbc.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_sprite.h"
 
 /* Primary plane formats for gen <= 3 */
diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index f85edb374c97..348b1655435e 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -26,7 +26,7 @@
  *
  * The functions here implement the state management and hardware programming
  * dispatch required by the atomic modeset infrastructure.
- * See intel_atomic_plane.c for the plane-specific atomic functionality.
+ * See intel_plane.c for the plane-specific atomic functionality.
  */
 
 #include <drm/display/drm_dp_tunnel.h>
diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 38b3094b37d7..bae85603543c 100644
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -32,7 +32,6 @@
 #include "i915_drv.h"
 #include "i915_reg.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_audio.h"
 #include "intel_bw.h"
 #include "intel_cdclk.h"
@@ -43,6 +42,7 @@
 #include "intel_mchbar_regs.h"
 #include "intel_pci_config.h"
 #include "intel_pcode.h"
+#include "intel_plane.h"
 #include "intel_psr.h"
 #include "intel_vdsc.h"
 #include "skl_watermark.h"
diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index a88317ea4e9c..a187db6df2d3 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -17,7 +17,6 @@
 #include "i9xx_plane.h"
 #include "icl_dsi.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_color.h"
 #include "intel_crtc.h"
 #include "intel_cursor.h"
@@ -29,6 +28,7 @@
 #include "intel_dsi.h"
 #include "intel_fifo_underrun.h"
 #include "intel_pipe_crc.h"
+#include "intel_plane.h"
 #include "intel_psr.h"
 #include "intel_sprite.h"
 #include "intel_vblank.h"
diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
index 6bd4f6a28cae..27d86549af2c 100644
--- a/drivers/gpu/drm/i915/display/intel_cursor.c
+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
@@ -14,7 +14,6 @@
 
 #include "i915_utils.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_cursor.h"
 #include "intel_cursor_regs.h"
 #include "intel_de.h"
@@ -23,6 +22,7 @@
 #include "intel_fb.h"
 #include "intel_fb_pin.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_psr.h"
 #include "intel_psr_regs.h"
 #include "intel_vblank.h"
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index b0c7c46ffbe2..acc03b4c9e89 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -57,7 +57,6 @@
 #include "i9xx_wm.h"
 #include "intel_alpm.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_audio.h"
 #include "intel_bo.h"
 #include "intel_bw.h"
@@ -108,6 +107,7 @@
 #include "intel_pch_refclk.h"
 #include "intel_pfit.h"
 #include "intel_pipe_crc.h"
+#include "intel_plane.h"
 #include "intel_plane_initial.h"
 #include "intel_pmdemand.h"
 #include "intel_pps.h"
diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index 8d0dcf252bed..fb25ec8adae3 100644
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -9,7 +9,6 @@
 #include "i915_irq.h"
 #include "i915_reg.h"
 #include "icl_dsi_regs.h"
-#include "intel_atomic_plane.h"
 #include "intel_crtc.h"
 #include "intel_de.h"
 #include "intel_display_irq.h"
@@ -27,6 +26,7 @@
 #include "intel_gmbus.h"
 #include "intel_hotplug_irq.h"
 #include "intel_pipe_crc_regs.h"
+#include "intel_plane.h"
 #include "intel_pmdemand.h"
 #include "intel_psr.h"
 #include "intel_psr_regs.h"
diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index a5906cb4900c..763b36c4de10 100644
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -11,7 +11,6 @@
 #include <drm/drm_modeset_helper.h>
 
 #include "i915_drv.h"
-#include "intel_atomic_plane.h"
 #include "intel_bo.h"
 #include "intel_display.h"
 #include "intel_display_core.h"
@@ -20,6 +19,7 @@
 #include "intel_fb.h"
 #include "intel_fb_bo.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 
 #define check_array_bounds(display, a, i) drm_WARN_ON((display)->drm, (i) >= ARRAY_SIZE(a))
 
diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index 98a61a7b0b93..fcc88e677e47 100644
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -11,13 +11,13 @@
 #include "gem/i915_gem_object.h"
 
 #include "i915_drv.h"
-#include "intel_atomic_plane.h"
 #include "intel_display_core.h"
 #include "intel_display_rpm.h"
 #include "intel_display_types.h"
 #include "intel_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,
diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
similarity index 99%
rename from drivers/gpu/drm/i915/display/intel_atomic_plane.c
rename to drivers/gpu/drm/i915/display/intel_plane.c
index 15ede7678636..f079963c5dff 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_plane.c
@@ -45,7 +45,6 @@
 #include "i915_scheduler_types.h"
 #include "i915_vma.h"
 #include "i9xx_plane_regs.h"
-#include "intel_atomic_plane.h"
 #include "intel_cdclk.h"
 #include "intel_cursor.h"
 #include "intel_display_rps.h"
@@ -53,6 +52,7 @@
 #include "intel_display_types.h"
 #include "intel_fb.h"
 #include "intel_fb_pin.h"
+#include "intel_plane.h"
 #include "skl_scaler.h"
 #include "skl_universal_plane.h"
 #include "skl_watermark.h"
diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
similarity index 97%
rename from drivers/gpu/drm/i915/display/intel_atomic_plane.h
rename to drivers/gpu/drm/i915/display/intel_plane.h
index 317320c32285..1dd32586ac16 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.h
+++ b/drivers/gpu/drm/i915/display/intel_plane.h
@@ -3,8 +3,8 @@
  * Copyright © 2019 Intel Corporation
  */
 
-#ifndef __INTEL_ATOMIC_PLANE_H__
-#define __INTEL_ATOMIC_PLANE_H__
+#ifndef __INTEL_PLANE_H__
+#define __INTEL_PLANE_H__
 
 #include <linux/types.h>
 
@@ -94,4 +94,4 @@ bool intel_plane_format_mod_supported_async(struct drm_plane *plane,
 					    u32 format,
 					    u64 modifier);
 
-#endif /* __INTEL_ATOMIC_PLANE_H__ */
+#endif /* __INTEL_PLANE_H__ */
diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index 8800a657cd21..2194d39a5c98 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -6,13 +6,13 @@
 #include "gem/i915_gem_lmem.h"
 #include "gem/i915_gem_region.h"
 #include "i915_drv.h"
-#include "intel_atomic_plane.h"
 #include "intel_crtc.h"
 #include "intel_display.h"
 #include "intel_display_core.h"
 #include "intel_display_types.h"
 #include "intel_fb.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_plane_initial.h"
 
 void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index fd92e6b89b43..db0c48d0c743 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -41,11 +41,11 @@
 
 #include "i915_utils.h"
 #include "i9xx_plane.h"
-#include "intel_atomic_plane.h"
 #include "intel_de.h"
 #include "intel_display_types.h"
 #include "intel_fb.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_sprite.h"
 #include "intel_sprite_regs.h"
 
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 2aa64482d44b..9c8dac97cc40 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -9,9 +9,7 @@
 #include <drm/drm_fourcc.h>
 
 #include "pxp/intel_pxp.h"
-
 #include "i915_drv.h"
-#include "intel_atomic_plane.h"
 #include "intel_bo.h"
 #include "intel_de.h"
 #include "intel_display_irq.h"
@@ -21,6 +19,7 @@
 #include "intel_fb.h"
 #include "intel_fbc.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_psr.h"
 #include "intel_psr_regs.h"
 #include "skl_scaler.h"
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index 2c2371574d6f..c2e11d9ee652 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -13,7 +13,6 @@
 #include "i915_reg.h"
 #include "i9xx_wm.h"
 #include "intel_atomic.h"
-#include "intel_atomic_plane.h"
 #include "intel_bw.h"
 #include "intel_cdclk.h"
 #include "intel_crtc.h"
@@ -27,6 +26,7 @@
 #include "intel_fb.h"
 #include "intel_fixed.h"
 #include "intel_pcode.h"
+#include "intel_plane.h"
 #include "intel_wm.h"
 #include "skl_universal_plane_regs.h"
 #include "skl_watermark.h"
diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index f5f5775acdc0..40d01751b49e 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -205,7 +205,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
 	i915-display/icl_dsi.o \
 	i915-display/intel_alpm.o \
 	i915-display/intel_atomic.o \
-	i915-display/intel_atomic_plane.o \
 	i915-display/intel_audio.o \
 	i915-display/intel_backlight.o \
 	i915-display/intel_bios.o \
@@ -271,6 +270,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
 	i915-display/intel_modeset_verify.o \
 	i915-display/intel_panel.o \
 	i915-display/intel_pfit.o \
+	i915-display/intel_plane.o \
 	i915-display/intel_pmdemand.o \
 	i915-display/intel_pch.o \
 	i915-display/intel_pps.o \
diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c
index af47ce34102c..b2ede3af9345 100644
--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
@@ -10,7 +10,6 @@
 #include "xe_ggtt.h"
 #include "xe_mmio.h"
 
-#include "intel_atomic_plane.h"
 #include "intel_crtc.h"
 #include "intel_display.h"
 #include "intel_display_core.h"
@@ -19,6 +18,7 @@
 #include "intel_fb.h"
 #include "intel_fb_pin.h"
 #include "intel_frontbuffer.h"
+#include "intel_plane.h"
 #include "intel_plane_initial.h"
 #include "xe_bo.h"
 #include "xe_wa.h"
-- 
2.39.5

✗ i915.CI.BAT: failure for drm/i915/plane: file and function renames (rev3)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 6856 bytes --]

== Series Details ==

Series: drm/i915/plane: file and function renames (rev3)
URL   : https://patchwork.freedesktop.org/series/147416/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_16692 -> Patchwork_147416v3
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_147416v3 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_147416v3, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/index.html

Participating hosts (40 -> 40)
------------------------------

  Additional (1): bat-arlh-2 
  Missing    (1): fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_147416v3:

### IGT changes ###

#### Possible regressions ####

  * igt@prime_self_import@basic-with_one_bo:
    - bat-arlh-2:         NOTRUN -> [ABORT][1]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@prime_self_import@basic-with_one_bo.html

  
Known issues
------------

  Here are the changes found in Patchwork_147416v3 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@fbdev@eof:
    - bat-arlh-2:         NOTRUN -> [SKIP][2] ([i915#11345] / [i915#11346]) +3 other tests skip
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@fbdev@eof.html

  * igt@fbdev@info:
    - bat-arlh-2:         NOTRUN -> [SKIP][3] ([i915#11346] / [i915#1849])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@fbdev@info.html

  * igt@gem_mmap@basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][4] ([i915#11343] / [i915#11346])
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@gem_mmap@basic.html

  * igt@gem_render_tiled_blits@basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][5] ([i915#10197] / [i915#10211] / [i915#11346] / [i915#11725] / [i915#4079])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@gem_render_tiled_blits@basic.html

  * igt@gem_tiled_fence_blits@basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][6] ([i915#11346] / [i915#12637]) +2 other tests skip
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@gem_tiled_fence_blits@basic.html

  * igt@gem_tiled_pread_basic:
    - bat-arlh-2:         NOTRUN -> [SKIP][7] ([i915#10206] / [i915#11346] / [i915#11724] / [i915#4079])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@gem_tiled_pread_basic.html

  * igt@i915_pm_rps@basic-api:
    - bat-arlh-2:         NOTRUN -> [SKIP][8] ([i915#10209] / [i915#11346] / [i915#11681])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@i915_pm_rps@basic-api.html

  * igt@intel_hwmon@hwmon-read:
    - bat-arlh-2:         NOTRUN -> [SKIP][9] ([i915#11346] / [i915#11680] / [i915#7707]) +1 other test skip
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@intel_hwmon@hwmon-read.html

  * igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
    - bat-arlh-2:         NOTRUN -> [SKIP][10] ([i915#10200] / [i915#11346] / [i915#11666] / [i915#12203])
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html

  * igt@kms_addfb_basic@basic-x-tiled-legacy:
    - bat-arlh-2:         NOTRUN -> [SKIP][11] ([i915#10200] / [i915#11346] / [i915#11666]) +8 other tests skip
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@kms_addfb_basic@basic-x-tiled-legacy.html

  * igt@kms_pipe_crc_basic@read-crc-frame-sequence:
    - bat-arlh-2:         NOTRUN -> [SKIP][12] ([i915#11190] / [i915#11346]) +16 other tests skip
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@kms_pipe_crc_basic@read-crc-frame-sequence.html

  * igt@kms_pm_backlight@basic-brightness:
    - bat-arlh-2:         NOTRUN -> [SKIP][13] ([i915#11346]) +14 other tests skip
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@kms_pm_backlight@basic-brightness.html

  * igt@kms_setmode@basic-clone-single-crtc:
    - bat-arlh-2:         NOTRUN -> [SKIP][14] ([i915#10208] / [i915#11346] / [i915#8809])
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/bat-arlh-2/igt@kms_setmode@basic-clone-single-crtc.html

  
  [i915#10197]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10197
  [i915#10200]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10200
  [i915#10206]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10206
  [i915#10208]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10208
  [i915#10209]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10209
  [i915#10211]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10211
  [i915#11190]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11190
  [i915#11343]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11343
  [i915#11345]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11345
  [i915#11346]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11346
  [i915#11666]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11666
  [i915#11680]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11680
  [i915#11681]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11681
  [i915#11724]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11724
  [i915#11725]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11725
  [i915#12203]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12203
  [i915#12637]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12637
  [i915#1849]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1849
  [i915#4079]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4079
  [i915#7707]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7707
  [i915#8809]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8809


Build changes
-------------

  * Linux: CI_DRM_16692 -> Patchwork_147416v3

  CI-20190529: 20190529
  CI_DRM_16692: b5ef50f5d944d569d6eda26728bffb78c4ef6fa2 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8406: 12d7c99650c85e479571b6db2c392408be474c88 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_147416v3: b5ef50f5d944d569d6eda26728bffb78c4ef6fa2 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v3/index.html

[-- Attachment #2: Type: text/html, Size: 8890 bytes --]

✗ i915.CI.BAT: failure for drm/i915/plane: file and function renames (rev4)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 3732 bytes --]

== Series Details ==

Series: drm/i915/plane: file and function renames (rev4)
URL   : https://patchwork.freedesktop.org/series/147416/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_16700 -> Patchwork_147416v4
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_147416v4 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_147416v4, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v4/index.html

Participating hosts (43 -> 43)
------------------------------

  Additional (1): bat-jsl-1 
  Missing    (1): fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_147416v4:

### IGT changes ###

#### Possible regressions ####

  * igt@prime_self_import@basic-with_one_bo:
    - bat-jsl-1:          NOTRUN -> [ABORT][1]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v4/bat-jsl-1/igt@prime_self_import@basic-with_one_bo.html

  
Known issues
------------

  Here are the changes found in Patchwork_147416v4 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_huc_copy@huc-copy:
    - bat-jsl-1:          NOTRUN -> [SKIP][2] ([i915#2190])
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v4/bat-jsl-1/igt@gem_huc_copy@huc-copy.html

  * igt@intel_hwmon@hwmon-read:
    - bat-jsl-1:          NOTRUN -> [SKIP][3] ([i915#7707]) +1 other test skip
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v4/bat-jsl-1/igt@intel_hwmon@hwmon-read.html

  * igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
    - bat-jsl-1:          NOTRUN -> [SKIP][4] ([i915#4103]) +1 other test skip
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v4/bat-jsl-1/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html

  * igt@kms_dsc@dsc-basic:
    - bat-jsl-1:          NOTRUN -> [SKIP][5] ([i915#3555] / [i915#9886])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v4/bat-jsl-1/igt@kms_dsc@dsc-basic.html

  * igt@kms_force_connector_basic@force-load-detect:
    - bat-jsl-1:          NOTRUN -> [SKIP][6]
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v4/bat-jsl-1/igt@kms_force_connector_basic@force-load-detect.html

  * igt@kms_setmode@basic-clone-single-crtc:
    - bat-jsl-1:          NOTRUN -> [SKIP][7] ([i915#3555])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v4/bat-jsl-1/igt@kms_setmode@basic-clone-single-crtc.html

  
  [i915#2190]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2190
  [i915#3555]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3555
  [i915#4103]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4103
  [i915#7707]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/7707
  [i915#9886]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9886


Build changes
-------------

  * Linux: CI_DRM_16700 -> Patchwork_147416v4

  CI-20190529: 20190529
  CI_DRM_16700: cce8a9af1c6cf1776511aa69e5f4b5bef7bf5938 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8410: 5826cdbf1cb8f5ec8a42bae33deb6b2b63e59e6e @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_147416v4: cce8a9af1c6cf1776511aa69e5f4b5bef7bf5938 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v4/index.html

[-- Attachment #2: Type: text/html, Size: 4588 bytes --]

Re: [RESEND 5/5] drm/i915/plane: rename intel_atomic_add_affected_planes() to intel_plane_add_affected()

[Ville Syrjälä]

On Thu, Jun 12, 2025 at 02:37:11PM +0300, Jani Nikula wrote:
> Rename to follow filename based naming.
> 
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
>  drivers/gpu/drm/i915/display/intel_plane.c   | 4 ++--
>  drivers/gpu/drm/i915/display/intel_plane.h   | 4 ++--
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index bd81ff9e3854..978c524546c6 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -5479,7 +5479,7 @@ static int intel_modeset_pipe(struct intel_atomic_state *state,
>  	if (ret)
>  		return ret;
>  
> -	ret = intel_atomic_add_affected_planes(state, crtc);
> +	ret = intel_plane_add_affected(state, crtc);

This breaks the common naming pattern. At the very least I think
it needs to keep the "planes" at the end to make it clear what
it's adding.

But from the "does this sentence make any sense?" POV I'd
rather it be called intel_crtc_add_affected_planes().

>  	if (ret)
>  		return ret;
>  
> @@ -6195,7 +6195,7 @@ static int intel_joiner_add_affected_crtcs(struct intel_atomic_state *state)
>  		if (ret)
>  			return ret;
>  
> -		ret = intel_atomic_add_affected_planes(state, crtc);
> +		ret = intel_plane_add_affected(state, crtc);
>  		if (ret)
>  			return ret;
>  	}
> diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
> index 2ac7a4e655f5..11aeb7435b05 100644
> --- a/drivers/gpu/drm/i915/display/intel_plane.c
> +++ b/drivers/gpu/drm/i915/display/intel_plane.c
> @@ -1433,8 +1433,8 @@ static int intel_crtc_add_planes_to_state(struct intel_atomic_state *state,
>  	return 0;
>  }
>  
> -int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
> -				     struct intel_crtc *crtc)
> +int intel_plane_add_affected(struct intel_atomic_state *state,
> +			     struct intel_crtc *crtc)
>  {
>  	const struct intel_crtc_state *old_crtc_state =
>  		intel_atomic_get_old_crtc_state(state, crtc);
> diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
> index 5cb995b2940f..4ef012c08fa4 100644
> --- a/drivers/gpu/drm/i915/display/intel_plane.h
> +++ b/drivers/gpu/drm/i915/display/intel_plane.h
> @@ -83,8 +83,8 @@ void intel_plane_helper_add(struct intel_plane *plane);
>  bool intel_plane_needs_physical(struct intel_plane *plane);
>  void intel_plane_init_cursor_vblank_work(struct intel_plane_state *old_plane_state,
>  					 struct intel_plane_state *new_plane_state);
> -int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
> -				     struct intel_crtc *crtc);
> +int intel_plane_add_affected(struct intel_atomic_state *state,
> +			     struct intel_crtc *crtc);
>  int intel_plane_atomic_check(struct intel_atomic_state *state);
>  
>  u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state);
> -- 
> 2.39.5

-- 
Ville Syrjälä
Intel

Re: [RESEND 5/5] drm/i915/plane: rename intel_atomic_add_affected_planes() to intel_plane_add_affected()

[Ville Syrjälä]

On Fri, Jun 13, 2025 at 06:02:21PM +0300, Ville Syrjälä wrote:
> On Thu, Jun 12, 2025 at 02:37:11PM +0300, Jani Nikula wrote:
> > Rename to follow filename based naming.
> > 
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
> >  drivers/gpu/drm/i915/display/intel_plane.c   | 4 ++--
> >  drivers/gpu/drm/i915/display/intel_plane.h   | 4 ++--
> >  3 files changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> > index bd81ff9e3854..978c524546c6 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -5479,7 +5479,7 @@ static int intel_modeset_pipe(struct intel_atomic_state *state,
> >  	if (ret)
> >  		return ret;
> >  
> > -	ret = intel_atomic_add_affected_planes(state, crtc);
> > +	ret = intel_plane_add_affected(state, crtc);
> 
> This breaks the common naming pattern. At the very least I think
> it needs to keep the "planes" at the end to make it clear what
> it's adding.
> 
> But from the "does this sentence make any sense?" POV I'd
> rather it be called intel_crtc_add_affected_planes().

If you're worried about the namespacing then I think just move it
(and intel_crtc_add_planes_to_state()) to intel_crtc.c. There's
nothing really plane specific in these, so doesnt' matter where
they live AFAICS.

> 
> >  	if (ret)
> >  		return ret;
> >  
> > @@ -6195,7 +6195,7 @@ static int intel_joiner_add_affected_crtcs(struct intel_atomic_state *state)
> >  		if (ret)
> >  			return ret;
> >  
> > -		ret = intel_atomic_add_affected_planes(state, crtc);
> > +		ret = intel_plane_add_affected(state, crtc);
> >  		if (ret)
> >  			return ret;
> >  	}
> > diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
> > index 2ac7a4e655f5..11aeb7435b05 100644
> > --- a/drivers/gpu/drm/i915/display/intel_plane.c
> > +++ b/drivers/gpu/drm/i915/display/intel_plane.c
> > @@ -1433,8 +1433,8 @@ static int intel_crtc_add_planes_to_state(struct intel_atomic_state *state,
> >  	return 0;
> >  }
> >  
> > -int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
> > -				     struct intel_crtc *crtc)
> > +int intel_plane_add_affected(struct intel_atomic_state *state,
> > +			     struct intel_crtc *crtc)
> >  {
> >  	const struct intel_crtc_state *old_crtc_state =
> >  		intel_atomic_get_old_crtc_state(state, crtc);
> > diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
> > index 5cb995b2940f..4ef012c08fa4 100644
> > --- a/drivers/gpu/drm/i915/display/intel_plane.h
> > +++ b/drivers/gpu/drm/i915/display/intel_plane.h
> > @@ -83,8 +83,8 @@ void intel_plane_helper_add(struct intel_plane *plane);
> >  bool intel_plane_needs_physical(struct intel_plane *plane);
> >  void intel_plane_init_cursor_vblank_work(struct intel_plane_state *old_plane_state,
> >  					 struct intel_plane_state *new_plane_state);
> > -int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
> > -				     struct intel_crtc *crtc);
> > +int intel_plane_add_affected(struct intel_atomic_state *state,
> > +			     struct intel_crtc *crtc);
> >  int intel_plane_atomic_check(struct intel_atomic_state *state);
> >  
> >  u32 intel_plane_ggtt_offset(const struct intel_plane_state *plane_state);
> > -- 
> > 2.39.5
> 
> -- 
> Ville Syrjälä
> Intel

-- 
Ville Syrjälä
Intel

[RESEND 0/5] drm/i915/plane: file and function renames

[Jani Nikula]

Jani Nikula (5):
  drm/i915/plane: rename intel_atomic_plane.[ch] to intel_plane.[ch]
  drm/i915/plane: drop atomic from intel_atomic_plane_check_clipping()
  drm/i915/plane: make intel_plane_atomic_check() static and rename
  drm/i915/plane: rename intel_atomic_check_planes() to
    intel_plane_atomic_check()
  drm/i915/plane: rename intel_atomic_add_affected_planes() to
    intel_plane_add_affected()

 Documentation/gpu/i915.rst                    |  4 ++--
 drivers/gpu/drm/i915/Makefile                 |  4 ++--
 drivers/gpu/drm/i915/display/i9xx_plane.c     | 10 ++++-----
 drivers/gpu/drm/i915/display/intel_atomic.c   |  2 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c    |  2 +-
 drivers/gpu/drm/i915/display/intel_crtc.c     |  2 +-
 drivers/gpu/drm/i915/display/intel_cursor.c   | 10 ++++-----
 drivers/gpu/drm/i915/display/intel_display.c  |  8 +++----
 .../gpu/drm/i915/display/intel_display_irq.c  |  2 +-
 drivers/gpu/drm/i915/display/intel_fb.c       |  2 +-
 drivers/gpu/drm/i915/display/intel_fb_pin.c   |  2 +-
 .../{intel_atomic_plane.c => intel_plane.c}   | 22 +++++++++----------
 .../{intel_atomic_plane.h => intel_plane.h}   | 22 +++++++++----------
 .../drm/i915/display/intel_plane_initial.c    |  2 +-
 drivers/gpu/drm/i915/display/intel_sprite.c   | 14 ++++++------
 .../drm/i915/display/skl_universal_plane.c    |  7 +++---
 drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
 drivers/gpu/drm/xe/Makefile                   |  2 +-
 drivers/gpu/drm/xe/display/xe_plane_initial.c |  2 +-
 19 files changed, 59 insertions(+), 62 deletions(-)
 rename drivers/gpu/drm/i915/display/{intel_atomic_plane.c => intel_plane.c} (98%)
 rename drivers/gpu/drm/i915/display/{intel_atomic_plane.h => intel_plane.h} (86%)

-- 
2.39.5

✓ i915.CI.BAT: success for drm/i915/plane: file and function renames (rev5)

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 3586 bytes --]

== Series Details ==

Series: drm/i915/plane: file and function renames (rev5)
URL   : https://patchwork.freedesktop.org/series/147416/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_16706 -> Patchwork_147416v5
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v5/index.html

Participating hosts (47 -> 46)
------------------------------

  Missing    (1): fi-snb-2520m 

Known issues
------------

  Here are the changes found in Patchwork_147416v5 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_selftest@live:
    - bat-mtlp-8:         [PASS][1] -> [DMESG-FAIL][2] ([i915#12061]) +1 other test dmesg-fail
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16706/bat-mtlp-8/igt@i915_selftest@live.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v5/bat-mtlp-8/igt@i915_selftest@live.html

  * igt@i915_selftest@live@workarounds:
    - bat-dg2-11:         [PASS][3] -> [DMESG-FAIL][4] ([i915#12061]) +1 other test dmesg-fail
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16706/bat-dg2-11/igt@i915_selftest@live@workarounds.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v5/bat-dg2-11/igt@i915_selftest@live@workarounds.html
    - bat-mtlp-9:         [PASS][5] -> [DMESG-FAIL][6] ([i915#12061]) +1 other test dmesg-fail
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16706/bat-mtlp-9/igt@i915_selftest@live@workarounds.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v5/bat-mtlp-9/igt@i915_selftest@live@workarounds.html

  
#### Possible fixes ####

  * igt@i915_selftest@live@workarounds:
    - bat-dg2-14:         [DMESG-FAIL][7] ([i915#12061]) -> [PASS][8] +1 other test pass
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16706/bat-dg2-14/igt@i915_selftest@live@workarounds.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v5/bat-dg2-14/igt@i915_selftest@live@workarounds.html

  
#### Warnings ####

  * igt@i915_selftest@live:
    - bat-atsm-1:         [DMESG-FAIL][9] ([i915#12061] / [i915#13929]) -> [DMESG-FAIL][10] ([i915#12061] / [i915#14204])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16706/bat-atsm-1/igt@i915_selftest@live.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v5/bat-atsm-1/igt@i915_selftest@live.html

  * igt@i915_selftest@live@mman:
    - bat-atsm-1:         [DMESG-FAIL][11] ([i915#13929]) -> [DMESG-FAIL][12] ([i915#14204])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_16706/bat-atsm-1/igt@i915_selftest@live@mman.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v5/bat-atsm-1/igt@i915_selftest@live@mman.html

  
  [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061
  [i915#13929]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13929
  [i915#14204]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14204


Build changes
-------------

  * Linux: CI_DRM_16706 -> Patchwork_147416v5

  CI-20190529: 20190529
  CI_DRM_16706: dea7240e83c9e58ec755a3d68e7db10068df6b76 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8411: d5b5d2bb4f8795a98ea58376a128b74f654b7ec1 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_147416v5: dea7240e83c9e58ec755a3d68e7db10068df6b76 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_147416v5/index.html

[-- Attachment #2: Type: text/html, Size: 4823 bytes --]