Commit a649c2ab authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/ba5f304e9fe71723191d872e6828d461e1a572bd.1750147992.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 880e07d5

Documentation/gpu/i915.rst

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/i915/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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 \

drivers/gpu/drm/i915/display/i9xx_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/gpu/drm/i915/display/intel_atomic.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/gpu/drm/i915/display/intel_cdclk.c

+1 −1
Original line number Diff line number Diff line
@@ -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"