tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

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>
Link: https://lore.kernel.org/r/ba5f304e9fe71723191d872e6828d461e1a572bd.1750147992.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Jani Nikula a649c2ab 880e07d5

+23 -24
+2 -2
Documentation/gpu/i915.rst
··· 112 112 Atomic Plane Helpers 113 113 -------------------- 114 114 115 - .. kernel-doc:: drivers/gpu/drm/i915/display/intel_atomic_plane.c 115 + .. kernel-doc:: drivers/gpu/drm/i915/display/intel_plane.c 116 116 :doc: atomic plane helpers 117 117 118 - .. kernel-doc:: drivers/gpu/drm/i915/display/intel_atomic_plane.c 118 + .. kernel-doc:: drivers/gpu/drm/i915/display/intel_plane.c 119 119 :internal: 120 120 121 121 Asynchronous Page Flip
+2 -2
drivers/gpu/drm/i915/Makefile
··· 218 218 # modesetting core code 219 219 i915-y += \ 220 220 display/hsw_ips.o \ 221 - display/i9xx_plane.o \ 222 221 display/i9xx_display_sr.o \ 222 + display/i9xx_plane.o \ 223 223 display/i9xx_wm.o \ 224 224 display/intel_alpm.o \ 225 225 display/intel_atomic.o \ 226 - display/intel_atomic_plane.o \ 227 226 display/intel_audio.o \ 228 227 display/intel_bios.o \ 229 228 display/intel_bo.o \ ··· 282 283 display/intel_pch.o \ 283 284 display/intel_pch_display.o \ 284 285 display/intel_pch_refclk.o \ 286 + display/intel_plane.o \ 285 287 display/intel_plane_initial.o \ 286 288 display/intel_pmdemand.o \ 287 289 display/intel_psr.o \
+1 -1
drivers/gpu/drm/i915/display/i9xx_plane.c
··· 15 15 #include "i9xx_plane.h" 16 16 #include "i9xx_plane_regs.h" 17 17 #include "intel_atomic.h" 18 - #include "intel_atomic_plane.h" 19 18 #include "intel_de.h" 20 19 #include "intel_display_irq.h" 21 20 #include "intel_display_regs.h" ··· 22 23 #include "intel_fb.h" 23 24 #include "intel_fbc.h" 24 25 #include "intel_frontbuffer.h" 26 + #include "intel_plane.h" 25 27 #include "intel_sprite.h" 26 28 27 29 /* Primary plane formats for gen <= 3 */
+1 -1
drivers/gpu/drm/i915/display/intel_atomic.c
··· 26 26 * 27 27 * The functions here implement the state management and hardware programming 28 28 * dispatch required by the atomic modeset infrastructure. 29 - * See intel_atomic_plane.c for the plane-specific atomic functionality. 29 + * See intel_plane.c for the plane-specific atomic functionality. 30 30 */ 31 31 32 32 #include <drm/display/drm_dp_tunnel.h>
+1 -1
drivers/gpu/drm/i915/display/intel_atomic_plane.c drivers/gpu/drm/i915/display/intel_plane.c
··· 45 45 #include "i915_scheduler_types.h" 46 46 #include "i915_vma.h" 47 47 #include "i9xx_plane_regs.h" 48 - #include "intel_atomic_plane.h" 49 48 #include "intel_cdclk.h" 50 49 #include "intel_cursor.h" 51 50 #include "intel_display_rps.h" ··· 52 53 #include "intel_display_types.h" 53 54 #include "intel_fb.h" 54 55 #include "intel_fb_pin.h" 56 + #include "intel_plane.h" 55 57 #include "skl_scaler.h" 56 58 #include "skl_universal_plane.h" 57 59 #include "skl_watermark.h"
+3 -3
drivers/gpu/drm/i915/display/intel_atomic_plane.h drivers/gpu/drm/i915/display/intel_plane.h
··· 3 3 * Copyright © 2019 Intel Corporation 4 4 */ 5 5 6 - #ifndef __INTEL_ATOMIC_PLANE_H__ 7 - #define __INTEL_ATOMIC_PLANE_H__ 6 + #ifndef __INTEL_PLANE_H__ 7 + #define __INTEL_PLANE_H__ 8 8 9 9 #include <linux/types.h> 10 10 ··· 94 94 u32 format, 95 95 u64 modifier); 96 96 97 - #endif /* __INTEL_ATOMIC_PLANE_H__ */ 97 + #endif /* __INTEL_PLANE_H__ */
+1 -1
drivers/gpu/drm/i915/display/intel_cdclk.c
··· 32 32 #include "i915_drv.h" 33 33 #include "i915_reg.h" 34 34 #include "intel_atomic.h" 35 - #include "intel_atomic_plane.h" 36 35 #include "intel_audio.h" 37 36 #include "intel_bw.h" 38 37 #include "intel_cdclk.h" ··· 42 43 #include "intel_mchbar_regs.h" 43 44 #include "intel_pci_config.h" 44 45 #include "intel_pcode.h" 46 + #include "intel_plane.h" 45 47 #include "intel_psr.h" 46 48 #include "intel_vdsc.h" 47 49 #include "skl_watermark.h"
+1 -1
drivers/gpu/drm/i915/display/intel_crtc.c
··· 17 17 #include "i9xx_plane.h" 18 18 #include "icl_dsi.h" 19 19 #include "intel_atomic.h" 20 - #include "intel_atomic_plane.h" 21 20 #include "intel_color.h" 22 21 #include "intel_crtc.h" 23 22 #include "intel_cursor.h" ··· 28 29 #include "intel_dsi.h" 29 30 #include "intel_fifo_underrun.h" 30 31 #include "intel_pipe_crc.h" 32 + #include "intel_plane.h" 31 33 #include "intel_psr.h" 32 34 #include "intel_sprite.h" 33 35 #include "intel_vblank.h"
+1 -1
drivers/gpu/drm/i915/display/intel_cursor.c
··· 14 14 15 15 #include "i915_utils.h" 16 16 #include "intel_atomic.h" 17 - #include "intel_atomic_plane.h" 18 17 #include "intel_cursor.h" 19 18 #include "intel_cursor_regs.h" 20 19 #include "intel_de.h" ··· 22 23 #include "intel_fb.h" 23 24 #include "intel_fb_pin.h" 24 25 #include "intel_frontbuffer.h" 26 + #include "intel_plane.h" 25 27 #include "intel_psr.h" 26 28 #include "intel_psr_regs.h" 27 29 #include "intel_vblank.h"
+1 -1
drivers/gpu/drm/i915/display/intel_display.c
··· 57 57 #include "i9xx_wm.h" 58 58 #include "intel_alpm.h" 59 59 #include "intel_atomic.h" 60 - #include "intel_atomic_plane.h" 61 60 #include "intel_audio.h" 62 61 #include "intel_bo.h" 63 62 #include "intel_bw.h" ··· 107 108 #include "intel_pch_refclk.h" 108 109 #include "intel_pfit.h" 109 110 #include "intel_pipe_crc.h" 111 + #include "intel_plane.h" 110 112 #include "intel_plane_initial.h" 111 113 #include "intel_pmdemand.h" 112 114 #include "intel_pps.h"
+1 -1
drivers/gpu/drm/i915/display/intel_display_irq.c
··· 9 9 #include "i915_irq.h" 10 10 #include "i915_reg.h" 11 11 #include "icl_dsi_regs.h" 12 - #include "intel_atomic_plane.h" 13 12 #include "intel_crtc.h" 14 13 #include "intel_de.h" 15 14 #include "intel_display_irq.h" ··· 26 27 #include "intel_gmbus.h" 27 28 #include "intel_hotplug_irq.h" 28 29 #include "intel_pipe_crc_regs.h" 30 + #include "intel_plane.h" 29 31 #include "intel_pmdemand.h" 30 32 #include "intel_psr.h" 31 33 #include "intel_psr_regs.h"
+1 -1
drivers/gpu/drm/i915/display/intel_fb.c
··· 11 11 #include <drm/drm_modeset_helper.h> 12 12 13 13 #include "i915_drv.h" 14 - #include "intel_atomic_plane.h" 15 14 #include "intel_bo.h" 16 15 #include "intel_display.h" 17 16 #include "intel_display_core.h" ··· 19 20 #include "intel_fb.h" 20 21 #include "intel_fb_bo.h" 21 22 #include "intel_frontbuffer.h" 23 + #include "intel_plane.h" 22 24 23 25 #define check_array_bounds(display, a, i) drm_WARN_ON((display)->drm, (i) >= ARRAY_SIZE(a)) 24 26
+1 -1
drivers/gpu/drm/i915/display/intel_fb_pin.c
··· 11 11 #include "gem/i915_gem_object.h" 12 12 13 13 #include "i915_drv.h" 14 - #include "intel_atomic_plane.h" 15 14 #include "intel_display_core.h" 16 15 #include "intel_display_rpm.h" 17 16 #include "intel_display_types.h" 18 17 #include "intel_dpt.h" 19 18 #include "intel_fb.h" 20 19 #include "intel_fb_pin.h" 20 + #include "intel_plane.h" 21 21 22 22 static struct i915_vma * 23 23 intel_fb_pin_to_dpt(const struct drm_framebuffer *fb,
+1 -1
drivers/gpu/drm/i915/display/intel_plane_initial.c
··· 6 6 #include "gem/i915_gem_lmem.h" 7 7 #include "gem/i915_gem_region.h" 8 8 #include "i915_drv.h" 9 - #include "intel_atomic_plane.h" 10 9 #include "intel_crtc.h" 11 10 #include "intel_display.h" 12 11 #include "intel_display_core.h" 13 12 #include "intel_display_types.h" 14 13 #include "intel_fb.h" 15 14 #include "intel_frontbuffer.h" 15 + #include "intel_plane.h" 16 16 #include "intel_plane_initial.h" 17 17 18 18 void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)
+1 -1
drivers/gpu/drm/i915/display/intel_sprite.c
··· 41 41 42 42 #include "i915_utils.h" 43 43 #include "i9xx_plane.h" 44 - #include "intel_atomic_plane.h" 45 44 #include "intel_de.h" 46 45 #include "intel_display_types.h" 47 46 #include "intel_fb.h" 48 47 #include "intel_frontbuffer.h" 48 + #include "intel_plane.h" 49 49 #include "intel_sprite.h" 50 50 #include "intel_sprite_regs.h" 51 51
+1 -2
drivers/gpu/drm/i915/display/skl_universal_plane.c
··· 9 9 #include <drm/drm_fourcc.h> 10 10 11 11 #include "pxp/intel_pxp.h" 12 - 13 12 #include "i915_drv.h" 14 - #include "intel_atomic_plane.h" 15 13 #include "intel_bo.h" 16 14 #include "intel_de.h" 17 15 #include "intel_display_irq.h" ··· 19 21 #include "intel_fb.h" 20 22 #include "intel_fbc.h" 21 23 #include "intel_frontbuffer.h" 24 + #include "intel_plane.h" 22 25 #include "intel_psr.h" 23 26 #include "intel_psr_regs.h" 24 27 #include "skl_scaler.h"
+1 -1
drivers/gpu/drm/i915/display/skl_watermark.c
··· 13 13 #include "i915_reg.h" 14 14 #include "i9xx_wm.h" 15 15 #include "intel_atomic.h" 16 - #include "intel_atomic_plane.h" 17 16 #include "intel_bw.h" 18 17 #include "intel_cdclk.h" 19 18 #include "intel_crtc.h" ··· 26 27 #include "intel_fb.h" 27 28 #include "intel_fixed.h" 28 29 #include "intel_pcode.h" 30 + #include "intel_plane.h" 29 31 #include "intel_wm.h" 30 32 #include "skl_universal_plane_regs.h" 31 33 #include "skl_watermark.h"
+1 -1
drivers/gpu/drm/xe/Makefile
··· 204 204 i915-display/icl_dsi.o \ 205 205 i915-display/intel_alpm.o \ 206 206 i915-display/intel_atomic.o \ 207 - i915-display/intel_atomic_plane.o \ 208 207 i915-display/intel_audio.o \ 209 208 i915-display/intel_backlight.o \ 210 209 i915-display/intel_bios.o \ ··· 269 270 i915-display/intel_modeset_verify.o \ 270 271 i915-display/intel_panel.o \ 271 272 i915-display/intel_pfit.o \ 273 + i915-display/intel_plane.o \ 272 274 i915-display/intel_pmdemand.o \ 273 275 i915-display/intel_pch.o \ 274 276 i915-display/intel_pps.o \
+1 -1
drivers/gpu/drm/xe/display/xe_plane_initial.c
··· 10 10 #include "xe_ggtt.h" 11 11 #include "xe_mmio.h" 12 12 13 - #include "intel_atomic_plane.h" 14 13 #include "intel_crtc.h" 15 14 #include "intel_display.h" 16 15 #include "intel_display_core.h" ··· 18 19 #include "intel_fb.h" 19 20 #include "intel_fb_pin.h" 20 21 #include "intel_frontbuffer.h" 22 + #include "intel_plane.h" 21 23 #include "intel_plane_initial.h" 22 24 #include "xe_bo.h" 23 25 #include "xe_wa.h"