All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Airlie <airlied@gmail.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 13/13] drm/i915: move is_ccs_modifier to an inline
Date: Fri, 18 Dec 2020 16:04:20 +1000	[thread overview]
Message-ID: <20201218060420.3203-14-airlied@gmail.com> (raw)
In-Reply-To: <20201218060420.3203-1-airlied@gmail.com>

From: Dave Airlie <airlied@redhat.com>

There is no need for this to be out of line.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/i915/display/intel_display.c       | 8 --------
 drivers/gpu/drm/i915/display/intel_display.h       | 1 -
 drivers/gpu/drm/i915/display/intel_display_types.h | 8 ++++++++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 47d7c6198377..a27a961c835f 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -1791,14 +1791,6 @@ intel_get_format_info(const struct drm_mode_fb_cmd2 *cmd)
 	}
 }
 
-bool is_ccs_modifier(u64 modifier)
-{
-	return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
-	       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
-	       modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
-	       modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
-}
-
 static int gen12_ccs_aux_stride(struct drm_framebuffer *fb, int ccs_plane)
 {
 	return DIV_ROUND_UP(fb->pitches[skl_ccs_to_main_plane(fb, ccs_plane)],
diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 7f021d0f9b13..9efdee9c95b5 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -508,7 +508,6 @@ void intel_link_compute_m_n(u16 bpp, int nlanes,
 			    int pixel_clock, int link_clock,
 			    struct intel_link_m_n *m_n,
 			    bool constant_n, bool fec_enable);
-bool is_ccs_modifier(u64 modifier);
 void lpt_disable_clkout_dp(struct drm_i915_private *dev_priv);
 u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,
 			      u32 pixel_format, u64 modifier);
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 262c372cec79..11c8e7b9e619 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -1834,6 +1834,14 @@ static inline u32 intel_fdi_link_freq(struct drm_i915_private *dev_priv,
 		return dev_priv->fdi_pll_freq;
 }
 
+static inline bool is_ccs_modifier(u64 modifier)
+{
+	return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
+	       modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
+	       modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
+	       modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
+}
+
 static inline bool is_ccs_plane(const struct drm_framebuffer *fb, int plane)
 {
 	if (!is_ccs_modifier(fb->modifier))
-- 
2.27.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2020-12-18  6:04 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-18  6:04 [Intel-gfx] [RFC v5] refactor intel display a bit more Dave Airlie
2020-12-18  6:04 ` [Intel-gfx] [PATCH 01/13] drm/i915/display: move needs_modeset to an inline in header Dave Airlie
2020-12-18  6:04 ` [Intel-gfx] [PATCH 02/13] drm/i915/display: move to_intel_frontbuffer to header Dave Airlie
2020-12-18  6:04 ` [Intel-gfx] [PATCH 03/13] drm/i915/display: fix misused comma Dave Airlie
2020-12-18  6:04 ` [Intel-gfx] [PATCH 04/13] drm/i915: refactor cursor code out of i915_display.c Dave Airlie
2020-12-18  6:04 ` [Intel-gfx] [PATCH 05/13] drm/i915: refactor i915 plane code into separate file Dave Airlie
2020-12-18 14:55   ` Ville Syrjälä
2020-12-18  6:04 ` [Intel-gfx] [PATCH 06/13] drm/i915: refactor some crtc code out of intel display. (v2) Dave Airlie
2020-12-18 14:56   ` Ville Syrjälä
2020-12-18  6:04 ` [Intel-gfx] [PATCH 07/13] drm/i915: refactor pll code out into intel_dpll.c Dave Airlie
2020-12-18  6:04 ` [Intel-gfx] [PATCH 08/13] drm/i915: split fdi code out from intel_display.c Dave Airlie
2020-12-18 14:58   ` Ville Syrjälä
2020-12-18  6:04 ` [Intel-gfx] [PATCH 09/13] drm/i915: migrate hsw fdi code to new file Dave Airlie
2020-12-18 15:13   ` Ville Syrjälä
2020-12-18  6:04 ` [Intel-gfx] [PATCH 10/13] drm/i915: migrate skl planes code new file (v2) Dave Airlie
2020-12-18 15:13   ` Ville Syrjälä
2020-12-18  6:04 ` [Intel-gfx] [PATCH 11/13] drm/i915: move pipe update code into crtc Dave Airlie
2020-12-18  6:04 ` [Intel-gfx] [PATCH 12/13] drm/i915: split fb scalable checks into g4x and skl versions Dave Airlie
2020-12-18  6:04 ` Dave Airlie [this message]
2020-12-18  7:22 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [01/13] drm/i915/display: move needs_modeset to an inline in header 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=20201218060420.3203-14-airlied@gmail.com \
    --to=airlied@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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.