On Mon, Feb 13, 2023 at 10:00:02PM +0200, Jani Nikula wrote:
> The file was never really about pm types, and now it's even more
> obvious. Move under display as intel_wm_types.h.
>
> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display_core.h | 2 +-
> drivers/gpu/drm/i915/display/intel_display_types.h | 2 +-
> .../drm/i915/{intel_pm_types.h => display/intel_wm_types.h} | 6 +++---
> drivers/gpu/drm/i915/display/skl_watermark.h | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
> rename drivers/gpu/drm/i915/{intel_pm_types.h => display/intel_wm_types.h} (93%)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
> index 52614fff0d76..b870f7f47f2b 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_core.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_core.h
> @@ -25,7 +25,7 @@
> #include "intel_global_state.h"
> #include "intel_gmbus.h"
> #include "intel_opregion.h"
> -#include "intel_pm_types.h"
> +#include "intel_wm_types.h"
>
> struct drm_i915_private;
> struct drm_property;
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 6e94be7c3e7f..748b0cd411fa 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -53,7 +53,7 @@
> #include "intel_display_limits.h"
> #include "intel_display_power.h"
> #include "intel_dpll_mgr.h"
> -#include "intel_pm_types.h"
> +#include "intel_wm_types.h"
>
> struct drm_printer;
> struct __intel_global_objs_state;
> diff --git a/drivers/gpu/drm/i915/intel_pm_types.h b/drivers/gpu/drm/i915/display/intel_wm_types.h
> similarity index 93%
> rename from drivers/gpu/drm/i915/intel_pm_types.h
> rename to drivers/gpu/drm/i915/display/intel_wm_types.h
> index 93152537b420..bac2b6fdc5d0 100644
> --- a/drivers/gpu/drm/i915/intel_pm_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_wm_types.h
> @@ -3,8 +3,8 @@
> * Copyright © 2021 Intel Corporation
> */
>
> -#ifndef __INTEL_PM_TYPES_H__
> -#define __INTEL_PM_TYPES_H__
> +#ifndef __INTEL_WM_TYPES_H__
> +#define __INTEL_WM_TYPES_H__
>
> #include <linux/types.h>
>
> @@ -73,4 +73,4 @@ static inline bool skl_ddb_entry_equal(const struct skl_ddb_entry *e1,
> return false;
> }
>
> -#endif /* __INTEL_PM_TYPES_H__ */
> +#endif /* __INTEL_WM_TYPES_H__ */
> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.h b/drivers/gpu/drm/i915/display/skl_watermark.h
> index f03fd991b189..f91a3d4ddc07 100644
> --- a/drivers/gpu/drm/i915/display/skl_watermark.h
> +++ b/drivers/gpu/drm/i915/display/skl_watermark.h
> @@ -10,7 +10,7 @@
>
> #include "intel_display_limits.h"
> #include "intel_global_state.h"
> -#include "intel_pm_types.h"
> +#include "intel_wm_types.h"
>
> struct drm_i915_private;
> struct intel_atomic_state;
> --
> 2.34.1
--
Ville Syrjälä
Intel
