[Intel-gfx] [PATCH v2 1/2] drm/i915: move intel_csr.[ch] under display/

[Ville Syrjälä]

On Tue, Feb 11, 2020 at 06:14:50PM +0200, Jani Nikula wrote:
> The DMC firmware is about display. Move the handling under display. No
> functional changes.
> 
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Acked-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

I'm also thinking s/csr/dmc/ migth be a good idea. I don't even
remember what "csr" means...

> ---
>  drivers/gpu/drm/i915/Makefile                  | 2 +-
>  drivers/gpu/drm/i915/{ => display}/intel_csr.c | 0
>  drivers/gpu/drm/i915/{ => display}/intel_csr.h | 0
>  drivers/gpu/drm/i915/i915_debugfs.c            | 2 +-
>  drivers/gpu/drm/i915/i915_drv.c                | 2 +-
>  drivers/gpu/drm/i915/i915_gpu_error.c          | 2 +-
>  6 files changed, 4 insertions(+), 4 deletions(-)
>  rename drivers/gpu/drm/i915/{ => display}/intel_csr.c (100%)
>  rename drivers/gpu/drm/i915/{ => display}/intel_csr.h (100%)
> 
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 49eed50ef0a4..a2fab3c43563 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -46,7 +46,6 @@ i915-y += i915_drv.o \
>  	  i915_switcheroo.o \
>  	  i915_sysfs.o \
>  	  i915_utils.o \
> -	  intel_csr.o \
>  	  intel_device_info.o \
>  	  intel_memory_region.o \
>  	  intel_pch.o \
> @@ -183,6 +182,7 @@ i915-y += \
>  	display/intel_color.o \
>  	display/intel_combo_phy.o \
>  	display/intel_connector.o \
> +	display/intel_csr.o \
>  	display/intel_display.o \
>  	display/intel_display_power.o \
>  	display/intel_dpio_phy.o \
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/display/intel_csr.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_csr.c
> rename to drivers/gpu/drm/i915/display/intel_csr.c
> diff --git a/drivers/gpu/drm/i915/intel_csr.h b/drivers/gpu/drm/i915/display/intel_csr.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_csr.h
> rename to drivers/gpu/drm/i915/display/intel_csr.h
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 3cae18d1d20c..83dae4d8ac0c 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -32,6 +32,7 @@
>  #include <drm/drm_debugfs.h>
>  #include <drm/drm_fourcc.h>
>  
> +#include "display/intel_csr.h"
>  #include "display/intel_display_types.h"
>  #include "display/intel_dp.h"
>  #include "display/intel_fbc.h"
> @@ -51,7 +52,6 @@
>  #include "i915_debugfs_params.h"
>  #include "i915_irq.h"
>  #include "i915_trace.h"
> -#include "intel_csr.h"
>  #include "intel_pm.h"
>  #include "intel_sideband.h"
>  
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 516536234e97..4e43a671f2c0 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -50,6 +50,7 @@
>  #include "display/intel_audio.h"
>  #include "display/intel_bw.h"
>  #include "display/intel_cdclk.h"
> +#include "display/intel_csr.h"
>  #include "display/intel_display_types.h"
>  #include "display/intel_dp.h"
>  #include "display/intel_fbdev.h"
> @@ -77,7 +78,6 @@
>  #include "i915_sysfs.h"
>  #include "i915_trace.h"
>  #include "i915_vgpu.h"
> -#include "intel_csr.h"
>  #include "intel_memory_region.h"
>  #include "intel_pm.h"
>  
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index 5a1517d0bf3b..b2ed977ed971 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -37,6 +37,7 @@
>  #include <drm/drm_print.h>
>  
>  #include "display/intel_atomic.h"
> +#include "display/intel_csr.h"
>  #include "display/intel_overlay.h"
>  
>  #include "gem/i915_gem_context.h"
> @@ -47,7 +48,6 @@
>  #include "i915_gpu_error.h"
>  #include "i915_memcpy.h"
>  #include "i915_scatterlist.h"
> -#include "intel_csr.h"
>  
>  #define ALLOW_FAIL (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN)
>  #define ATOMIC_MAYFAIL (GFP_ATOMIC | __GFP_NOWARN)
> -- 
> 2.20.1

-- 
Ville Syrjälä
Intel