From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v2 7/7] drm/i915: rename intel_pm_types.h -> display/intel_wm_types.h
Date: Mon, 13 Feb 2023 22:56:14 +0200 [thread overview]
Message-ID: <Y+qj7ibPlTQ6wjZA@intel.com> (raw)
In-Reply-To: <bf599011039d7b2fb6f0522b44113d2d2ed0b44e.1676317696.git.jani.nikula@intel.com>
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@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> 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
next prev parent reply other threads:[~2023-02-13 20:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 19:59 [Intel-gfx] [PATCH v2 0/7] drm/i915/wm: legacy watermark code shuffling Jani Nikula
2023-02-13 19:59 ` [Intel-gfx] [PATCH v2 1/7] drm/i915: move memory frequency detection to intel_dram.c Jani Nikula
2023-02-13 20:37 ` Ville Syrjälä
2023-02-13 19:59 ` [Intel-gfx] [PATCH v2 2/7] drm/i915/wm: move remaining watermark code out of intel_pm.c Jani Nikula
2023-02-13 20:41 ` Ville Syrjälä
2023-02-13 19:59 ` [Intel-gfx] [PATCH v2 3/7] drm/i915/wm: move functions to call watermark hooks to intel_wm.[ch] Jani Nikula
2023-02-13 20:42 ` Ville Syrjälä
2023-02-13 19:59 ` [Intel-gfx] [PATCH v2 4/7] drm/i915/wm: add .get_hw_state to watermark funcs Jani Nikula
2023-02-13 20:49 ` Ville Syrjälä
2023-02-15 11:12 ` Jani Nikula
2023-02-13 20:00 ` [Intel-gfx] [PATCH v2 5/7] drm/i915/wm: move watermark sanitization to intel_wm.[ch] Jani Nikula
2023-02-13 20:53 ` Ville Syrjälä
2023-02-15 11:21 ` Jani Nikula
2023-02-15 12:12 ` Ville Syrjälä
2023-02-15 14:20 ` Jani Nikula
2023-02-13 20:00 ` [Intel-gfx] [PATCH v2 6/7] drm/i915/wm: move watermark debugfs to intel_wm.c Jani Nikula
2023-02-13 20:55 ` Ville Syrjälä
2023-02-13 20:00 ` [Intel-gfx] [PATCH v2 7/7] drm/i915: rename intel_pm_types.h -> display/intel_wm_types.h Jani Nikula
2023-02-13 20:56 ` Ville Syrjälä [this message]
2023-02-13 20:37 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/wm: legacy watermark code shuffling (rev2) Patchwork
2023-02-13 20:57 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-02-13 23:57 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y+qj7ibPlTQ6wjZA@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.