diff mbox series

[5/5] drm/i915/dmc: s/intel_csr.c/intel_dmc.c and s/intel_csr.h/intel_dmc.h

Message ID 20210511231757.14873-6-anusha.srivatsa@intel.com (mailing list archive)
State New, archived
Headers show
Series Rename all CSR references to DMC | expand

Commit Message

Anusha Srivatsa May 11, 2021, 11:17 p.m. UTC
Finally, rename the header and source file from csr to dmc.

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/Makefile                             | 2 +-
 drivers/gpu/drm/i915/display/intel_display.c              | 2 +-
 drivers/gpu/drm/i915/display/intel_display_debugfs.c      | 2 +-
 drivers/gpu/drm/i915/display/intel_display_power.c        | 2 +-
 drivers/gpu/drm/i915/display/{intel_csr.c => intel_dmc.c} | 2 +-
 drivers/gpu/drm/i915/display/{intel_csr.h => intel_dmc.h} | 6 +++---
 drivers/gpu/drm/i915/i915_drv.c                           | 2 +-
 drivers/gpu/drm/i915/i915_gpu_error.c                     | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename drivers/gpu/drm/i915/display/{intel_csr.c => intel_dmc.c} (99%)
 rename drivers/gpu/drm/i915/display/{intel_csr.h => intel_dmc.h} (88%)

Comments

Jani Nikula May 12, 2021, 1:38 p.m. UTC | #1
On Tue, 11 May 2021, Anusha Srivatsa <anusha.srivatsa@intel.com> wrote:
> Finally, rename the header and source file from csr to dmc.
>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>  drivers/gpu/drm/i915/Makefile                             | 2 +-
>  drivers/gpu/drm/i915/display/intel_display.c              | 2 +-
>  drivers/gpu/drm/i915/display/intel_display_debugfs.c      | 2 +-
>  drivers/gpu/drm/i915/display/intel_display_power.c        | 2 +-
>  drivers/gpu/drm/i915/display/{intel_csr.c => intel_dmc.c} | 2 +-
>  drivers/gpu/drm/i915/display/{intel_csr.h => intel_dmc.h} | 6 +++---
>  drivers/gpu/drm/i915/i915_drv.c                           | 2 +-
>  drivers/gpu/drm/i915/i915_gpu_error.c                     | 2 +-
>  8 files changed, 10 insertions(+), 10 deletions(-)
>  rename drivers/gpu/drm/i915/display/{intel_csr.c => intel_dmc.c} (99%)
>  rename drivers/gpu/drm/i915/display/{intel_csr.h => intel_dmc.h} (88%)
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index d0d936d9137b..f1099b6bfed5 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -201,7 +201,7 @@ i915-y += \
>  	display/intel_combo_phy.o \
>  	display/intel_connector.o \
>  	display/intel_crtc.o \
> -	display/intel_csr.o \
> +	display/intel_dmc.o \

Nitpick, please keep the file lists and #include lists sorted.

BR,
Jani.

>  	display/intel_cursor.o \
>  	display/intel_display.o \
>  	display/intel_display_power.o \
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 4efb5d28712c..b4db770d7c74 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -79,7 +79,7 @@
>  #include "intel_cdclk.h"
>  #include "intel_color.h"
>  #include "intel_crtc.h"
> -#include "intel_csr.h"
> +#include "intel_dmc.h"
>  #include "intel_de.h"
>  #include "intel_display_types.h"
>  #include "intel_dp_link_training.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index 5ed8996eacb4..0537a1f6bfbb 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -7,7 +7,7 @@
>  #include <drm/drm_fourcc.h>
>  
>  #include "i915_debugfs.h"
> -#include "intel_csr.h"
> +#include "intel_dmc.h"
>  #include "intel_display_debugfs.h"
>  #include "intel_display_power.h"
>  #include "intel_de.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 72f6e1ea711a..1acacba2735f 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -9,7 +9,7 @@
>  #include "i915_irq.h"
>  #include "intel_cdclk.h"
>  #include "intel_combo_phy.h"
> -#include "intel_csr.h"
> +#include "intel_dmc.h"
>  #include "intel_display_power.h"
>  #include "intel_de.h"
>  #include "intel_display_types.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_csr.c b/drivers/gpu/drm/i915/display/intel_dmc.c
> similarity index 99%
> rename from drivers/gpu/drm/i915/display/intel_csr.c
> rename to drivers/gpu/drm/i915/display/intel_dmc.c
> index 2d8b6f2fed7f..7e438e4a6f2b 100644
> --- a/drivers/gpu/drm/i915/display/intel_csr.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -26,7 +26,7 @@
>  
>  #include "i915_drv.h"
>  #include "i915_reg.h"
> -#include "intel_csr.h"
> +#include "intel_dmc.h"
>  #include "intel_de.h"
>  
>  /**
> diff --git a/drivers/gpu/drm/i915/display/intel_csr.h b/drivers/gpu/drm/i915/display/intel_dmc.h
> similarity index 88%
> rename from drivers/gpu/drm/i915/display/intel_csr.h
> rename to drivers/gpu/drm/i915/display/intel_dmc.h
> index fc4960b91686..57dd99da0ced 100644
> --- a/drivers/gpu/drm/i915/display/intel_csr.h
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.h
> @@ -3,8 +3,8 @@
>   * Copyright © 2019 Intel Corporation
>   */
>  
> -#ifndef __INTEL_CSR_H__
> -#define __INTEL_CSR_H__
> +#ifndef __INTEL_DMC_H__
> +#define __INTEL_DMC_H__
>  
>  struct drm_i915_private;
>  
> @@ -18,4 +18,4 @@ void intel_dmc_ucode_fini(struct drm_i915_private *i915);
>  void intel_dmc_ucode_suspend(struct drm_i915_private *i915);
>  void intel_dmc_ucode_resume(struct drm_i915_private *i915);
>  
> -#endif /* __INTEL_CSR_H__ */
> +#endif /* __INTEL_DMC_H__ */
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index f2a9583dfecc..2f06bb7b3ed2 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -49,7 +49,7 @@
>  #include "display/intel_acpi.h"
>  #include "display/intel_bw.h"
>  #include "display/intel_cdclk.h"
> -#include "display/intel_csr.h"
> +#include "display/intel_dmc.h"
>  #include "display/intel_display_types.h"
>  #include "display/intel_dp.h"
>  #include "display/intel_fbdev.h"
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index 0af5abc48093..df8dd22655ab 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -36,7 +36,7 @@
>  
>  #include <drm/drm_print.h>
>  
> -#include "display/intel_csr.h"
> +#include "display/intel_dmc.h"
>  #include "display/intel_overlay.h"
>  
>  #include "gem/i915_gem_context.h"
Anusha Srivatsa May 12, 2021, 4:41 p.m. UTC | #2
> -----Original Message-----
> From: Jani Nikula <jani.nikula@linux.intel.com>
> Sent: Wednesday, May 12, 2021 6:38 AM
> To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
> gfx@lists.freedesktop.org
> Cc: Srivatsa, Anusha <anusha.srivatsa@intel.com>
> Subject: Re: [PATCH 5/5] drm/i915/dmc: s/intel_csr.c/intel_dmc.c and
> s/intel_csr.h/intel_dmc.h
> 
> On Tue, 11 May 2021, Anusha Srivatsa <anusha.srivatsa@intel.com> wrote:
> > Finally, rename the header and source file from csr to dmc.
> >
> > Cc: Jani Nikula <jani.nikula@linux.intel.com>
> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > ---
> >  drivers/gpu/drm/i915/Makefile                             | 2 +-
> >  drivers/gpu/drm/i915/display/intel_display.c              | 2 +-
> >  drivers/gpu/drm/i915/display/intel_display_debugfs.c      | 2 +-
> >  drivers/gpu/drm/i915/display/intel_display_power.c        | 2 +-
> >  drivers/gpu/drm/i915/display/{intel_csr.c => intel_dmc.c} | 2 +-
> > drivers/gpu/drm/i915/display/{intel_csr.h => intel_dmc.h} | 6 +++---
> >  drivers/gpu/drm/i915/i915_drv.c                           | 2 +-
> >  drivers/gpu/drm/i915/i915_gpu_error.c                     | 2 +-
> >  8 files changed, 10 insertions(+), 10 deletions(-)  rename
> > drivers/gpu/drm/i915/display/{intel_csr.c => intel_dmc.c} (99%)
> > rename drivers/gpu/drm/i915/display/{intel_csr.h => intel_dmc.h} (88%)
> >
> > diff --git a/drivers/gpu/drm/i915/Makefile
> > b/drivers/gpu/drm/i915/Makefile index d0d936d9137b..f1099b6bfed5
> > 100644
> > --- a/drivers/gpu/drm/i915/Makefile
> > +++ b/drivers/gpu/drm/i915/Makefile
> > @@ -201,7 +201,7 @@ i915-y += \
> >  	display/intel_combo_phy.o \
> >  	display/intel_connector.o \
> >  	display/intel_crtc.o \
> > -	display/intel_csr.o \
> > +	display/intel_dmc.o \
> 
> Nitpick, please keep the file lists and #include lists sorted.

Sure.
Any feedback on the rest of the series?

Anusha
> BR,
> Jani.
> 
> >  	display/intel_cursor.o \
> >  	display/intel_display.o \
> >  	display/intel_display_power.o \
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> > b/drivers/gpu/drm/i915/display/intel_display.c
> > index 4efb5d28712c..b4db770d7c74 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -79,7 +79,7 @@
> >  #include "intel_cdclk.h"
> >  #include "intel_color.h"
> >  #include "intel_crtc.h"
> > -#include "intel_csr.h"
> > +#include "intel_dmc.h"
> >  #include "intel_de.h"
> >  #include "intel_display_types.h"
> >  #include "intel_dp_link_training.h"
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > index 5ed8996eacb4..0537a1f6bfbb 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > @@ -7,7 +7,7 @@
> >  #include <drm/drm_fourcc.h>
> >
> >  #include "i915_debugfs.h"
> > -#include "intel_csr.h"
> > +#include "intel_dmc.h"
> >  #include "intel_display_debugfs.h"
> >  #include "intel_display_power.h"
> >  #include "intel_de.h"
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c
> > b/drivers/gpu/drm/i915/display/intel_display_power.c
> > index 72f6e1ea711a..1acacba2735f 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> > @@ -9,7 +9,7 @@
> >  #include "i915_irq.h"
> >  #include "intel_cdclk.h"
> >  #include "intel_combo_phy.h"
> > -#include "intel_csr.h"
> > +#include "intel_dmc.h"
> >  #include "intel_display_power.h"
> >  #include "intel_de.h"
> >  #include "intel_display_types.h"
> > diff --git a/drivers/gpu/drm/i915/display/intel_csr.c
> > b/drivers/gpu/drm/i915/display/intel_dmc.c
> > similarity index 99%
> > rename from drivers/gpu/drm/i915/display/intel_csr.c
> > rename to drivers/gpu/drm/i915/display/intel_dmc.c
> > index 2d8b6f2fed7f..7e438e4a6f2b 100644
> > --- a/drivers/gpu/drm/i915/display/intel_csr.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> > @@ -26,7 +26,7 @@
> >
> >  #include "i915_drv.h"
> >  #include "i915_reg.h"
> > -#include "intel_csr.h"
> > +#include "intel_dmc.h"
> >  #include "intel_de.h"
> >
> >  /**
> > diff --git a/drivers/gpu/drm/i915/display/intel_csr.h
> > b/drivers/gpu/drm/i915/display/intel_dmc.h
> > similarity index 88%
> > rename from drivers/gpu/drm/i915/display/intel_csr.h
> > rename to drivers/gpu/drm/i915/display/intel_dmc.h
> > index fc4960b91686..57dd99da0ced 100644
> > --- a/drivers/gpu/drm/i915/display/intel_csr.h
> > +++ b/drivers/gpu/drm/i915/display/intel_dmc.h
> > @@ -3,8 +3,8 @@
> >   * Copyright © 2019 Intel Corporation
> >   */
> >
> > -#ifndef __INTEL_CSR_H__
> > -#define __INTEL_CSR_H__
> > +#ifndef __INTEL_DMC_H__
> > +#define __INTEL_DMC_H__
> >
> >  struct drm_i915_private;
> >
> > @@ -18,4 +18,4 @@ void intel_dmc_ucode_fini(struct drm_i915_private
> > *i915);  void intel_dmc_ucode_suspend(struct drm_i915_private *i915);
> > void intel_dmc_ucode_resume(struct drm_i915_private *i915);
> >
> > -#endif /* __INTEL_CSR_H__ */
> > +#endif /* __INTEL_DMC_H__ */
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c
> > b/drivers/gpu/drm/i915/i915_drv.c index f2a9583dfecc..2f06bb7b3ed2
> > 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -49,7 +49,7 @@
> >  #include "display/intel_acpi.h"
> >  #include "display/intel_bw.h"
> >  #include "display/intel_cdclk.h"
> > -#include "display/intel_csr.h"
> > +#include "display/intel_dmc.h"
> >  #include "display/intel_display_types.h"
> >  #include "display/intel_dp.h"
> >  #include "display/intel_fbdev.h"
> > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c
> > b/drivers/gpu/drm/i915/i915_gpu_error.c
> > index 0af5abc48093..df8dd22655ab 100644
> > --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> > @@ -36,7 +36,7 @@
> >
> >  #include <drm/drm_print.h>
> >
> > -#include "display/intel_csr.h"
> > +#include "display/intel_dmc.h"
> >  #include "display/intel_overlay.h"
> >
> >  #include "gem/i915_gem_context.h"
> 
> --
> Jani Nikula, Intel Open Source Graphics Center
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index d0d936d9137b..f1099b6bfed5 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -201,7 +201,7 @@  i915-y += \
 	display/intel_combo_phy.o \
 	display/intel_connector.o \
 	display/intel_crtc.o \
-	display/intel_csr.o \
+	display/intel_dmc.o \
 	display/intel_cursor.o \
 	display/intel_display.o \
 	display/intel_display_power.o \
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 4efb5d28712c..b4db770d7c74 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -79,7 +79,7 @@ 
 #include "intel_cdclk.h"
 #include "intel_color.h"
 #include "intel_crtc.h"
-#include "intel_csr.h"
+#include "intel_dmc.h"
 #include "intel_de.h"
 #include "intel_display_types.h"
 #include "intel_dp_link_training.h"
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 5ed8996eacb4..0537a1f6bfbb 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -7,7 +7,7 @@ 
 #include <drm/drm_fourcc.h>
 
 #include "i915_debugfs.h"
-#include "intel_csr.h"
+#include "intel_dmc.h"
 #include "intel_display_debugfs.h"
 #include "intel_display_power.h"
 #include "intel_de.h"
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
index 72f6e1ea711a..1acacba2735f 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power.c
@@ -9,7 +9,7 @@ 
 #include "i915_irq.h"
 #include "intel_cdclk.h"
 #include "intel_combo_phy.h"
-#include "intel_csr.h"
+#include "intel_dmc.h"
 #include "intel_display_power.h"
 #include "intel_de.h"
 #include "intel_display_types.h"
diff --git a/drivers/gpu/drm/i915/display/intel_csr.c b/drivers/gpu/drm/i915/display/intel_dmc.c
similarity index 99%
rename from drivers/gpu/drm/i915/display/intel_csr.c
rename to drivers/gpu/drm/i915/display/intel_dmc.c
index 2d8b6f2fed7f..7e438e4a6f2b 100644
--- a/drivers/gpu/drm/i915/display/intel_csr.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -26,7 +26,7 @@ 
 
 #include "i915_drv.h"
 #include "i915_reg.h"
-#include "intel_csr.h"
+#include "intel_dmc.h"
 #include "intel_de.h"
 
 /**
diff --git a/drivers/gpu/drm/i915/display/intel_csr.h b/drivers/gpu/drm/i915/display/intel_dmc.h
similarity index 88%
rename from drivers/gpu/drm/i915/display/intel_csr.h
rename to drivers/gpu/drm/i915/display/intel_dmc.h
index fc4960b91686..57dd99da0ced 100644
--- a/drivers/gpu/drm/i915/display/intel_csr.h
+++ b/drivers/gpu/drm/i915/display/intel_dmc.h
@@ -3,8 +3,8 @@ 
  * Copyright © 2019 Intel Corporation
  */
 
-#ifndef __INTEL_CSR_H__
-#define __INTEL_CSR_H__
+#ifndef __INTEL_DMC_H__
+#define __INTEL_DMC_H__
 
 struct drm_i915_private;
 
@@ -18,4 +18,4 @@  void intel_dmc_ucode_fini(struct drm_i915_private *i915);
 void intel_dmc_ucode_suspend(struct drm_i915_private *i915);
 void intel_dmc_ucode_resume(struct drm_i915_private *i915);
 
-#endif /* __INTEL_CSR_H__ */
+#endif /* __INTEL_DMC_H__ */
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f2a9583dfecc..2f06bb7b3ed2 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -49,7 +49,7 @@ 
 #include "display/intel_acpi.h"
 #include "display/intel_bw.h"
 #include "display/intel_cdclk.h"
-#include "display/intel_csr.h"
+#include "display/intel_dmc.h"
 #include "display/intel_display_types.h"
 #include "display/intel_dp.h"
 #include "display/intel_fbdev.h"
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 0af5abc48093..df8dd22655ab 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -36,7 +36,7 @@ 
 
 #include <drm/drm_print.h>
 
-#include "display/intel_csr.h"
+#include "display/intel_dmc.h"
 #include "display/intel_overlay.h"
 
 #include "gem/i915_gem_context.h"